Fixed package detection

.version

@@ -1 +1 @@
-2.2.6
+2.2.7

builder.py

@@ -17,11 +17,13 @@ from modules.generate_html import list_folder, EXCLUDES
 
 # fmt: off
 # Constants
-if __package__ == None:
+if __package__ is None:
-    __package__ = ""
+    PACKAGE = ""
-SCRIPT_DIR = os.path.abspath(os.path.dirname(__file__).removesuffix(__package__))
+else:
-STATIC_FILES_DIR = os.path.join(os.path.abspath(SCRIPT_DIR), "files")
+    PACKAGE = __package__
-VERSION = open(os.path.join(SCRIPT_DIR, ".version"), "r", encoding="utf-8").read()
+SCRIPTDIR = os.path.abspath(os.path.dirname(__file__).removesuffix(PACKAGE))
+STATIC_FILES_DIR = os.path.join(os.path.abspath(SCRIPTDIR), "files")
+VERSION = open(os.path.join(SCRIPTDIR, ".version"), "r", encoding="utf-8").read()
 RAW_EXTENSIONS = [
     ".3fr", ".ari", ".arw", ".bay", ".braw", ".crw", ".cr2", ".cr3", ".cap", ".data", ".dcs", ".dcr",
     ".dng", ".drf", ".eip", ".erf", ".fff", ".gpr", ".iiq", ".k25", ".kdc", ".mdc", ".mef", ".mos",
@@ -94,7 +96,7 @@ def copy_static_files(_args: Args) -> None:
     if "url" in foldericon:
         shutil.copyfile(_args.theme_path, os.path.join(static_dir, "theme.css"))
         return
-    with open(os.path.join(SCRIPT_DIR, foldericon), "r", encoding="utf-8") as f:
+    with open(os.path.join(SCRIPTDIR, foldericon), "r", encoding="utf-8") as f:
         svg = f.read()
     if "svg.j2" in foldericon:
         colorscheme = extract_colorscheme(_args.theme_path)
@@ -160,9 +162,7 @@ def get_total_folders(folder: str, _args: Args, _total: int = 0) -> int:
     items = sorted(os.listdir(folder))
     for item in items:
         if item not in EXCLUDES and os.path.isdir(os.path.join(folder, item)) and not item.startswith("."):
-            if item not in _args.exclude_folders and not any(
+            if item not in _args.exclude_folders and not any(fnmatch.fnmatchcase(os.path.join(folder, item), exclude) for exclude in _args.exclude_folders):
-                fnmatch.fnmatchcase(os.path.join(folder, item), exclude) for exclude in _args.exclude_folders
-            ):
                 _total = get_total_folders(os.path.join(folder, item), _args, _total)
     return _total
 

modules/argumentparser.py

@@ -4,10 +4,12 @@ import os
 import argparse
 from rich_argparse import RichHelpFormatter, HelpPreviewAction
 
-
+if __package__ is None:
-if __package__ == None:
+    PACKAGE = ""
-    __package__ = ""
+else:
-DEFAULT_THEME_PATH = os.path.join(os.path.abspath(os.path.dirname(__file__).removesuffix(__package__)), "templates", "default.css")
+    PACKAGE = __package__
+SCRIPTDIR = os.path.abspath(os.path.dirname(__file__).removesuffix(PACKAGE))
+DEFAULT_THEME_PATH = os.path.join(SCRIPTDIR, "templates", "default.css")
 DEFAULT_AUTHOR = "Author"
 
 

modules/generate_html.py

@@ -13,8 +13,11 @@ import modules.cclicense as cclicense
 from modules.argumentparser import Args
 
 # Constants for file paths and exclusions
-if __package__ == None:
+if __package__ is None:
-    __package__ = ""
+    PACKAGE = ""
+else:
+    PACKAGE = __package__
+SCRIPTDIR = os.path.abspath(os.path.dirname(__file__).removesuffix(PACKAGE))
 FAVICON_PATH = ".static/favicon.ico"
 GLOBAL_CSS_PATH = ".static/global.css"
 EXCLUDES = ["index.html", "manifest.json", "robots.txt"]
@@ -23,7 +26,7 @@ EXCLUDES = ["index.html", "manifest.json", "robots.txt"]
 Image.MAX_IMAGE_PIXELS = 933120000
 
 # Initialize Jinja2 environment for template rendering
-env = Environment(loader=FileSystemLoader(os.path.join(os.path.abspath(os.path.dirname(__file__).removesuffix(__package__)), "templates")))
+env = Environment(loader=FileSystemLoader(os.path.join(SCRIPTDIR, "templates")))
 thumbnails: List[Tuple[str, str]] = []
 info: Dict[str, str] = {}
 pbardict: Dict[str, tqdm] = {}

modules/svg_handling.py

@@ -14,16 +14,19 @@ except ImportError:
     SVGSUPPORT = False
 
 from modules.argumentparser import Args
-from modules.css_color import css_color_to_hex, extract_theme_color, extract_colorscheme
+from modules.css_color import extract_theme_color, extract_colorscheme
 
 # Define constants for static files directory and icon sizes
-if __package__ == None:
+if __package__ is None:
-    __package__ = ""
+    PACKAGE = ""
-STATIC_FILES_DIR = os.path.join(os.path.abspath(os.path.dirname(__file__).removesuffix(__package__)), "files")
+else:
+    PACKAGE = __package__
+SCRIPTDIR = os.path.abspath(os.path.dirname(__file__).removesuffix(PACKAGE))
+STATIC_FILES_DIR = os.path.join(SCRIPTDIR, "files")
 ICON_SIZES = ["36x36", "48x48", "72x72", "96x96", "144x144", "192x192", "512x512"]
 
 # Initialize Jinja2 environment for template rendering
-env = Environment(loader=FileSystemLoader(os.path.join(os.path.abspath(os.path.dirname(__file__).removesuffix(__package__)), "templates")))
+env = Environment(loader=FileSystemLoader(os.path.join(SCRIPTDIR, "templates")))
 
 
 class Icon: