Switched to GFM Markdown flavour to allow rendering checkboxes

config.py

@@ -20,10 +20,17 @@
 HOMEPAGE_DEFAULT = "homepage.md"
 HOMEPAGE_TITLE_DEFAULT = "homepage"
 IMAGES_ROUTE_DEFAULT = "img"
+IMAGES_PROTECTED_ROUTE_DEFAULT = "img"
+IMAGES_UPLOAD_PREFIX_DEFAULT = ""
+IMAGES_FILE_UID = os.getuid()
+IMAGES_FILE_GID = os.getgid()
+IMAGES_FILE_MODE = '600'
+IMAGES_CLEANUP = False
 
 HIDE_FOLDER_IN_WIKI = []
 
 PLUGINS = []
+UNPROTECTED_ROUTES = []
 
 PROTECT_EDIT_BY_PASSWORD = 0
 PASSWORD_IN_SHA_256 = "0E9C700FAB2D5B03B0581D080E74A2D7428758FC82BD423824C6C11D6A7F155E" #pw: wikmd
@@ -87,6 +94,13 @@ def __init__(self):
         self.homepage = os.getenv("HOMEPAGE") or yaml_config["homepage"] or HOMEPAGE_DEFAULT
         self.homepage_title = os.getenv("HOMEPAGE_TITLE") or yaml_config["homepage_title"] or HOMEPAGE_TITLE_DEFAULT
         self.images_route = os.getenv("IMAGES_ROUTE") or yaml_config["images_route"] or IMAGES_ROUTE_DEFAULT
+        self.images_protected_route = os.getenv("IMAGES_PROTECTED_ROUTE") or yaml_config["images_protected_route"] or IMAGES_PROTECTED_ROUTE_DEFAULT
+        self.unprotected_routes = os.getenv("UNPROTECTED_ROUTES")or yaml_config["unprotected_routes"] or UNPROTECTED_ROUTES
+        self.images_upload_prefix = os.getenv("IMAGES_UPLOAD_PREFIX") or yaml_config["images_upload_prefix"] or IMAGES_UPLOAD_PREFIX_DEFAULT
+        self.images_file_uid = os.getenv("IMAGES_FILE_UID") or yaml_config["images_file_uid"] or IMAGES_FILE_UID
+        self.images_file_gid = os.getenv("IMAGES_FILE_GID") or yaml_config["images_file_gid"] or IMAGES_FILE_GID
+        self.images_file_mode = os.getenv("IMAGES_FILE_MODE") or yaml_config["images_file_mode"] or IMAGES_FILE_MODE
+        self.images_cleanup = os.getenv("IMAGES_CLEANUP") or yaml_config["images_cleanup"] or IMAGES_CLEANUP
 
         self.hide_folder_in_wiki = os.getenv("hide_folder_in_wiki")or yaml_config["hide_folder_in_wiki"] or HIDE_FOLDER_IN_WIKI
 

image_manager.py

@@ -26,7 +26,7 @@ def __init__(self, app, cfg):
         if not self.can_optimize and self.cfg.optimize_images in ["lossless", "lossy"]:
             self.logger.error("To use image optimization webp and gif2webp need to be installed and in the $PATH. They could not be found.")
 
-    def save_images(self, file):
+    def save_images(self, file, images_path):
         """
         Saves the image from the filepond upload.
         The image is renamed to the hash of the content, so the image is immutable.
@@ -50,52 +50,55 @@ def save_images(self, file):
         # Using base32 instead of urlsafe base64, because the Windows file system is case-insensitive
         img_digest = b32encode(hasher.digest()).decode("utf-8").lower()[:-4]
         hash_file_name = secure_filename(f"{original_file_name}-{img_digest}{img_extension}")
-        hash_file_path = os.path.join(self.images_path, hash_file_name)
+        hash_file_path = os.path.join(images_path, hash_file_name)
 
         # We can skip writing the file if it already exists. It is the same file, because it has the same hash
         if os.path.exists(hash_file_path):
             self.logger.info(f"Image already exists '{img_file.filename}' as '{hash_file_name}'")
         else:
             self.logger.info(f"Saving image >>> '{img_file.filename}' as '{hash_file_name}' ...")
             shutil.move(temp_file_path, hash_file_path)
+            os.chmod(hash_file_path, int(self.cfg.images_file_mode, base=8))
+            os.chown(hash_file_path, self.cfg.images_file_uid, self.cfg.images_file_gid)
 
         return hash_file_name
 
     def cleanup_images(self):
-        """Deletes images not used by any page"""
-        saved_images = set(os.listdir(self.images_path))
-        # Don't delete .gitignore
-        saved_images.discard(".gitignore")
-
-        # Matches [*](/img/*) it does not matter if images_route is "/img" or "img"
-        image_link_pattern = fr"\[(.*?)\]\(({os.path.join('/', self.cfg.images_route)}.+?)\)"
-        image_link_regex = re.compile(image_link_pattern)
-        used_images = set()
-        # Searching for Markdown files
-        for root, sub_dir, files in os.walk(self.cfg.wiki_directory):
-            if os.path.join(self.cfg.wiki_directory, '.git') in root:
-                # We don't want to search there
-                continue
-            if self.images_path in root:
-                # Nothing interesting there too
-                continue
-            for filename in files:
-                path = os.path.join(root, filename)
-                try:
-                    with open(path, "r", encoding="utf-8", errors="ignore") as f:
-                        content = f.read()
-                        matches = image_link_regex.findall(content)
-                        for _caption, image_path in matches:
-                            used_images.add(os.path.basename(image_path))
-                except:
-                    self.logger.info(f"ignoring {path}")
-
-        not_used_images = saved_images.difference(used_images)
-        for not_used_image in not_used_images:
-            self.delete_image(not_used_image)
-
-    def delete_image(self, image_name):
-        image_path = safe_join(self.images_path, image_name)
+        if self.cfg.images_cleanup:
+            """Deletes images not used by any page"""
+            saved_images = set(os.listdir(self.images_path))
+            # Don't delete .gitignore
+            saved_images.discard(".gitignore")
+
+            # Matches [*](/img/*) it does not matter if images_route is "/img" or "img"
+            image_link_pattern = fr"\[(.*?)\]\(({os.path.join('/', self.cfg.images_route)}.+?)\)"
+            image_link_regex = re.compile(image_link_pattern)
+            used_images = set()
+            # Searching for Markdown files
+            for root, sub_dir, files in os.walk(self.cfg.wiki_directory):
+                if os.path.join(self.cfg.wiki_directory, '.git') in root:
+                    # We don't want to search there
+                    continue
+                if self.images_path in root:
+                    # Nothing interesting there too
+                    continue
+                for filename in files:
+                    path = os.path.join(root, filename)
+                    try:
+                        with open(path, "r", encoding="utf-8", errors="ignore") as f:
+                            content = f.read()
+                            matches = image_link_regex.findall(content)
+                            for _caption, image_path in matches:
+                                used_images.add(os.path.basename(image_path))
+                    except:
+                        self.logger.info(f"ignoring {path}")
+
+            not_used_images = saved_images.difference(used_images)
+            for not_used_image in not_used_images:
+                self.delete_image(not_used_image)
+
+    def delete_image(self, image_name, images_path):
+        image_path = safe_join(images_path, image_name)
         self.logger.info(f"Deleting file >>> {image_path}")
         try:
             os.remove(image_path)