diff --git a/fileops.py b/fileops.py index dc5cb66e..70fd79b0 100644 --- a/fileops.py +++ b/fileops.py @@ -59,14 +59,23 @@ def getdirpath(dir, title): #==================================================================# def getstoryfiles(): list = [] - for file in listdir(getcwd()+"/stories"): + for file in listdir(path.dirname(path.realpath(__file__))+"/stories"): if file.endswith(".json"): ob = {} ob["name"] = file.replace(".json", "") - f = open(getcwd()+"/stories/"+file, "r") - js = json.load(f) + f = open(path.dirname(path.realpath(__file__))+"/stories/"+file, "r") + try: + js = json.load(f) + except: + print("Browser loading error: Story file is malformed or not a JSON file.") + f.close() + continue f.close() - ob["actions"] = len(js["actions"]) + try: + ob["actions"] = len(js["actions"]) + except TypeError: + print("Browser loading error: Story file has incorrect format.") + continue list.append(ob) return list @@ -74,4 +83,4 @@ def getstoryfiles(): # Returns True if json file exists with requested save name #==================================================================# def saveexists(name): - return path.exists(getcwd()+"/stories/"+name+".json") \ No newline at end of file + return path.exists(path.dirname(path.realpath(__file__))+"/stories/"+name+".json")