diff --git a/untitled/__init__.py b/untitled/__init__.py index ad906f3..ed50fd9 100644 --- a/untitled/__init__.py +++ b/untitled/__init__.py @@ -1 +1,4 @@ # hi! +from pathlib import Path + +PACKAGE_ROOT = Path(__file__).parent diff --git a/untitled/generation.py b/untitled/generation.py index 695c09a..2090f8b 100644 --- a/untitled/generation.py +++ b/untitled/generation.py @@ -1,7 +1,7 @@ import random from collections import defaultdict -from untitled import content, rules +from untitled import PACKAGE_ROOT, content, rules def generate_trait_sentence(traits): @@ -71,7 +71,7 @@ def generate_name(): def _load_raw_names(): names = [] - with open("untitled/assets/cat_names.txt") as f: + with open(PACKAGE_ROOT / "assets" / "cat_names.txt") as f: for name in f.readlines(): names.append(name.strip()) return names diff --git a/untitled/persistence.py b/untitled/persistence.py index 6bc1762..1bfbda2 100644 --- a/untitled/persistence.py +++ b/untitled/persistence.py @@ -1,19 +1,19 @@ import json -import os +from pathlib import Path -from untitled import model +from untitled import PACKAGE_ROOT, model -SAVE_FOLDER = os.path.join("untitled", "saves") +SAVE_FOLDER = PACKAGE_ROOT / "saves" def save(save: model.Save, folder=None): folder = folder or SAVE_FOLDER file_name = save.cat.name + ".kitten" - save_file = os.path.join(folder, file_name) + save_file = Path(folder) / file_name data = save.to_dict() - os.makedirs(folder, exist_ok=True) + Path.mkdir(folder, exist_ok=True) with open(save_file, "w") as f: json.dump(data, f) @@ -22,7 +22,7 @@ def save(save: model.Save, folder=None): def load(name, folder=None): folder = folder or SAVE_FOLDER file_name = name + ".kitten" - save_file = os.path.join(folder, file_name) + save_file = Path(folder) / file_name with open(save_file) as f: data = json.load(f)