diff --git a/mirva/__init__.py b/mirva/__init__.py index 1b2a501..e969690 100644 --- a/mirva/__init__.py +++ b/mirva/__init__.py @@ -1,4 +1,4 @@ -__version__ = "20210920.1" +__version__ = "20220124.0" def get_version(): diff --git a/mirva/mirva.py b/mirva/mirva.py index dd5fb88..6e1fc94 100755 --- a/mirva/mirva.py +++ b/mirva/mirva.py @@ -15,6 +15,7 @@ class Mirva: os.path.dirname(os.path.abspath(__file__)), "resources" ) self.resource_dir = ".mirva" + self.medium_dir = os.path.join(self.resource_dir, "med") self.config_file = os.path.join(self.resource_dir, "config.cfg") self.config_backup = os.path.join(self.resource_dir, "config.cfg.bkp") self.image_match = re.compile(".*\.jpg$|.*\.jpeg$|.*\.png$|.*\.gif$|.*\.tif$", re.I) @@ -256,12 +257,12 @@ function create_button(direction, to) {{ return """
""".format( - image=image, title=title, content=content + image=image, title=title, content=content, med_dir=self.medium_dir ) @@ -313,7 +314,7 @@ function create_button(direction, to) {{ def write_mediums(self): try: - os.makedirs(".med") + os.makedirs(self.medium_dir) except Exception: pass @@ -327,7 +328,7 @@ function create_button(direction, to) {{ for f in self.file_list: if self.video_match.match(f): continue - outfile = os.path.join(".med", "{}.jpg".format(f)) + outfile = os.path.join(self.medium_dir, "{}.jpg".format(f)) if force: try: os.remove(outfile) @@ -336,8 +337,8 @@ function create_button(direction, to) {{ if not os.path.exists(outfile): if link: - - os.symlink("../{}".format(f), outfile) + # TODO: Get absolute path to f? + os.symlink("../../{}".format(f), outfile) continue convargs = [