refactor: why is config a class?

??? girl what ¿¿¿

Author: avalonv

src/reCBZ/__main__.py

@@ -6,15 +6,15 @@
 from pathlib import Path
 
 import reCBZ
+import reCBZ.config as config
 from reCBZ import wrappers, util
-from reCBZ.config import Config
 from reCBZ.profiles import profiles_list
 
 
 def print_title() -> None:
-    align = int(Config.term_width() / 2) - 11
+    align = int(config.term_width() / 2) - 11
     if align > 21: align = 21
-    if align + 22 > Config.term_width() or align < 0:
+    if align + 22 > config.term_width() or align < 0:
         align = 0
     align = align * ' '
     title_multiline = (f"{align}┬─┐┌─┐┌─┐┌┐ ┌─┐ ┌─┐┬ ┬\n"
@@ -202,7 +202,7 @@ def main():
         help="disable downscaling with --size")
     images_group.add_argument( "--nowebp",
         default=None,
-        const=f'{Config.blacklisted_fmts} webp webpll',
+        const=f'{config.blacklisted_fmts} webp webpll',
         dest="blacklisted_fmts",
         action="store_const",
         help="exclude webp from --auto and --assist")
@@ -278,7 +278,7 @@ def main():
     if args.profile is not None:
         prof_name = args.profile.upper()
         try:
-            Config.set_profile(prof_name)
+            config.set_profile(prof_name)
         except ValueError:
             print(f'{reCBZ.CMDNAME}: profile: invalid option "{prof_name}"')
             exit(1)
@@ -288,20 +288,20 @@ def main():
         try:
             newsize = tuple(map(int,newsize.split('x')))
             assert len(newsize) == 2
-            Config.img_size = newsize
+            config.img_size = newsize
         except (ValueError, AssertionError):
             print(f'{reCBZ.CMDNAME}: size: invalid option "{args.size_str}"')
             exit(1)
 
     # this is probably not the most pythonic way to do this
     # I'm sorry guido-san...
     for key, val in args.__dict__.items():
-        if key in Config.__dict__.keys() and val is not None:
-            setattr(Config, key, val)
+        if key in config.__dict__.keys() and val is not None:
+            setattr(config, key, val)
 
     if args.show_config:
         private = re.compile('^[A-Z]|\\<classmethod|^_')
-        for key, val in Config.__dict__.items():
+        for key, val in config.__dict__.items():
             if not private.search(f'{key} = {val}'):
                 print(f"{key} = {val}")
 
@@ -346,7 +346,7 @@ def main():
         new = []
         for filename in paths:
             comment = zipfile.ZipFile(filename).comment
-            if not comment == str.encode(Config.ZIPCOMMENT):
+            if not comment == str.encode(config.ZIPCOMMENT):
                 new.append(filename)
         diff = len(paths) - len(new)
         if diff > 0:
@@ -358,7 +358,7 @@ def main():
 
     # everything passed. do stuff
     exit_code = 0
-    if reCBZ.SHOWTITLE and Config.loglevel >= 0: print_title()
+    if reCBZ.SHOWTITLE and config.loglevel >= 0: print_title()
     try:
         if args.mode == 'join':
             wrappers.join_archives(paths[0], paths[1:])

src/reCBZ/archive.py

@@ -11,7 +11,7 @@
 
 import reCBZ
 from reCBZ.formats import *
-from reCBZ.config import Config
+import reCBZ.config as config
 from reCBZ.util import mylog, map_workers, worker_sigint_CTRL_C, human_sort
 
 # TODO:
@@ -105,17 +105,16 @@ def __init__(self, filename:str):
             self.fp:Path = Path(filename)
         else:
             raise ValueError(f"{filename}: invalid path")
-        self.opt_ignore = Config.ignore_err
-        self._zip_compress = Config.compress_zip
-        self._fmt_blacklist = Config.blacklisted_fmts
-        self._fmt_samples = Config.samples_count
-        self._pages_format = Config.img_format
-        self._pages_quality = Config.img_quality
-        self._pages_size = Config.img_size
-        self._pages_bw = Config.grayscale
-        self._pages_noup = Config.no_upscale
-        self._pages_nodown = Config.no_downscale
-        self._pages_filter = Config.RESAMPLE_TYPE
+        self.opt_ignore = config.ignore_err
+        self._fmt_blacklist = config.blacklisted_fmts
+        self._fmt_samples = config.samples_count
+        self._pages_format = config.img_format
+        self._pages_quality = config.img_quality
+        self._pages_size = config.img_size
+        self._pages_bw = config.grayscale
+        self._pages_noup = config.no_upscale
+        self._pages_nodown = config.no_downscale
+        self._pages_filter = config.RESAMPLE_TYPE
         self._index:list = []
         self._chapter_lengths = []
         self._chapters = []
@@ -313,11 +312,11 @@ def _write_zip(self, savepath):
                     dest += f'{Archive.chapter_prefix}{i+1:0{lead_zeroes}d}/'
                 dest += f'{page.fp.relative_to(local_parent_dir)}'
                 dest = Path(dest)
-                if self._zip_compress:
+                if config.compress_zip:
                     new_zip.write(page.fp, dest, ZIP_DEFLATED, 9)
                 else:
                     new_zip.write(page.fp, dest, ZIP_STORED)
-        new_zip.comment = str.encode(Config.ZIPCOMMENT)
+        new_zip.comment = str.encode(config.ZIPCOMMENT)
         new_zip.close()
         return savepath
 

src/reCBZ/config.py

@@ -7,79 +7,78 @@
     import tomli as tomllib
 from PIL import Image
 
-from reCBZ.profiles import profiles_list
 import reCBZ
+from reCBZ.profiles import profiles_list
 
+# LANCZOS sacrifices performance for optimal upscale quality
+RESAMPLE_TYPE = Image.Resampling.LANCZOS
+ZIPCOMMENT:str = 'repacked with reCBZ'
 _cfg = tomllib.loads(resources.read_text("reCBZ", "defaults.toml"))
 
+overwrite:bool = _cfg["general"]["overwrite"]
+ignore_err:bool = _cfg["general"]["ignore"]
+force_write:bool = _cfg["general"]["force"]
+no_write:bool = _cfg["general"]["nowrite"]
+loglevel:int = _cfg["general"]["loglevel"]
+processes:int = _cfg["general"]["processes"]
+samples_count:int = _cfg["general"]["samplecount"]
+archive_format:str = _cfg["archive"]["archiveformat"]
+compress_zip:int = _cfg["archive"]["compresszip"]
+right_to_left:bool = _cfg["archive"]["righttoleft"]
+img_format:str = _cfg["image"]["imageformat"]
+img_quality:int = _cfg["image"]["quality"]
+img_size:tuple = _cfg["image"]["size"]
+no_upscale:bool = _cfg["image"]["noupscale"]
+no_downscale:bool = _cfg["image"]["nodownscale"]
+grayscale:bool = _cfg["image"]["grayscale"]
+blacklisted_fmts:str = _cfg["image"]["blacklistedfmts"]
+ebook_profile = None
 
-class Config():
-    # LANCZOS sacrifices performance for optimal upscale quality
-    RESAMPLE_TYPE = Image.Resampling.LANCZOS
-    ZIPCOMMENT:str = 'repacked with reCBZ'
 
-    overwrite:bool = _cfg["general"]["overwrite"]
-    ignore_err:bool = _cfg["general"]["ignore"]
-    force_write:bool = _cfg["general"]["force"]
-    no_write:bool = _cfg["general"]["nowrite"]
-    loglevel:int = _cfg["general"]["loglevel"]
-    processes:int = _cfg["general"]["processes"]
-    samples_count:int = _cfg["general"]["samplecount"]
-    archive_format:str = _cfg["archive"]["archiveformat"]
-    compress_zip:int = _cfg["archive"]["compresszip"]
-    right_to_left:bool = _cfg["archive"]["righttoleft"]
-    img_format:str = _cfg["image"]["imageformat"]
-    img_quality:int = _cfg["image"]["quality"]
-    img_size:tuple = _cfg["image"]["size"]
-    no_upscale:bool = _cfg["image"]["noupscale"]
-    no_downscale:bool = _cfg["image"]["nodownscale"]
-    grayscale:bool = _cfg["image"]["grayscale"]
-    blacklisted_fmts:str = _cfg["image"]["blacklistedfmts"]
-    ebook_profile = None
+def pcount() -> int:
+    default_value = 4
+    if processes > 0:
+        return processes
+    else:
+        logical_cores = os.cpu_count()
+        try:
+            assert logical_cores is not None
+            if logical_cores not in range(1,3):
+                logical_cores -= 1 # be kind
+            return logical_cores
+        except AssertionError:
+            return default_value
 
-    @classmethod
-    def pcount(cls) -> int:
-        default_value = 4
-        if cls.processes > 0:
-            return cls.processes
-        else:
-            logical_cores = os.cpu_count()
-            try:
-                assert logical_cores is not None
-                if logical_cores not in range(1,3):
-                    logical_cores -= 1 # be kind
-                return logical_cores
-            except AssertionError:
-                return default_value
 
-    @classmethod
-    def term_width(cls) -> int:
-        # limit output message width. ignored if verbose
-        try:
-            TERM_COLUMNS, TERM_LINES = os.get_terminal_size()
-            assert TERM_COLUMNS > 0 and TERM_LINES > 0
-            if TERM_COLUMNS > 120: max_width = 120
-            elif TERM_COLUMNS < 30: max_width = 30
-            else: max_width = TERM_COLUMNS - 2
-        except (AssertionError, OSError):
-            print("[!] Can't determine terminal size, defaulting to 78 cols")
-            max_width = 78
-        return max_width
+def term_width() -> int:
+    # limit output message width. ignored if verbose
+    try:
+        TERM_COLUMNS, TERM_LINES = os.get_terminal_size()
+        assert TERM_COLUMNS > 0 and TERM_LINES > 0
+        if TERM_COLUMNS > 120: max_width = 120
+        elif TERM_COLUMNS < 30: max_width = 30
+        else: max_width = TERM_COLUMNS - 2
+    except (AssertionError, OSError):
+        print("[!] Can't determine terminal size, defaulting to 78 cols")
+        max_width = 78
+    return max_width
+
+
+def set_profile(name) -> None:
+    global blacklisted_fmts, ebook_profile, archive_format, img_size, grayscale
+    dic = {prof.nickname:prof for prof in profiles_list}
+    try:
+        profile = dic[name]
+    except KeyError:
+        raise ValueError(f"Invalid profile '{name}'")
+    grayscale = profile.gray
+    img_size = profile.size
+    # if profile.prefer_epub:
+    archive_format = 'epub'
+    ebook_profile = profile
+    blacklisted_fmts += profile.blacklisted_fmts
 
-    @classmethod
-    def set_profile(cls, name) -> None:
-        dic = {prof.nickname:prof for prof in profiles_list}
-        try:
-            profile = dic[name]
-        except KeyError:
-            raise ValueError(f"Invalid profile '{name}'")
-        cls.grayscale = profile.gray
-        cls.img_size = profile.size
-        # if profile.prefer_epub:
-        cls.archive_format = 'epub'
-        cls.ebook_profile = profile
-        cls.blacklisted_fmts += profile.blacklisted_fmts
 
 preload_profile = _cfg["archive"]["ebookprofile"]
 if preload_profile != '':
-    Config.set_profile(preload_profile.upper())
+    set_profile(preload_profile.upper())

src/reCBZ/epub.py

@@ -22,7 +22,7 @@
 from ebooklib import epub
 
 from reCBZ.util import mylog
-from reCBZ.config import Config
+import reCBZ.config as config
 
 POP_COVER = True
 
@@ -54,11 +54,11 @@ def single_chapter_epub(name:str, pages:list) -> str:
     for page_i, page in enumerate(pages, start=1):
         static_dest = f'static/{page_i}{page.fmt.ext[0]}'
         mime_type = page.fmt.mime
-        if Config.ebook_profile is not None:
+        if config.ebook_profile is not None:
             if page.landscape:
-                height, width = Config.ebook_profile.size
+                height, width = config.ebook_profile.size
             else:
-                width, height = Config.ebook_profile.size
+                width, height = config.ebook_profile.size
         else:
             width, height = page.size
         size_str = f'width={width} height={height}'
@@ -95,18 +95,18 @@ def single_chapter_epub(name:str, pages:list) -> str:
     book.add_item(epub.EpubNav())
     book.spine = (page for page in spine)
 
-    if Config.right_to_left is True:
+    if config.right_to_left is True:
         book.set_direction('rtl')
         # formerly necessary. turns out it's not an issue if you don't set lr in
         # the first place
         # if 'Kindle' in str(Config.ebook_profile):
         #     book.add_metadata(None, 'meta', '', {'name': 'primary-writing-mode',
         #                                          'content': 'horizontal-rl'}),
 
-    if Config.ebook_profile is not None:
-        for tag in Config.ebook_profile.epub_properties:
+    if config.ebook_profile is not None:
+        for tag in config.ebook_profile.epub_properties:
             book.add_metadata(*tag)
-        source_fp = f'{name}{Config.ebook_profile.epub_ext}'
+        source_fp = f'{name}{config.ebook_profile.epub_ext}'
     else:
         source_fp = f'{name}.epub'
 
@@ -142,11 +142,11 @@ def multi_chapter_epub(name:str, chapters:list) -> str:
             chapter_name = f'Ch {chapter_i:0{lead_zeroes}d}'
             static_dest = f'static/{chapter_name}/{page_i}{page.fmt.ext[0]}'
             mime_type = page.fmt.mime
-            if Config.ebook_profile is not None:
+            if config.ebook_profile is not None:
                 if page.landscape:
-                    height, width = Config.ebook_profile.size
+                    height, width = config.ebook_profile.size
                 else:
-                    width, height = Config.ebook_profile.size
+                    width, height = config.ebook_profile.size
             else:
                 width, height = page.size
             size_str = f'width={width} height={height}'
@@ -174,13 +174,13 @@ def multi_chapter_epub(name:str, chapters:list) -> str:
     book.add_item(epub.EpubNav())
     book.spine = ['nav', *(page for page in spine)]
 
-    if Config.right_to_left is True:
+    if config.right_to_left is True:
         book.set_direction('rtl')
 
-    if Config.ebook_profile is not None:
-        for tag in Config.ebook_profile.epub_properties:
+    if config.ebook_profile is not None:
+        for tag in config.ebook_profile.epub_properties:
             book.add_metadata(*tag)
-        source_fp = f'{name}{Config.ebook_profile.epub_ext}'
+        source_fp = f'{name}{config.ebook_profile.epub_ext}'
     else:
         source_fp = f'{name}.epub'
 

src/reCBZ/formats.py

@@ -1,10 +1,10 @@
 from PIL import Image
-from reCBZ.config import Config
+import reCBZ.config as config
 
 
 class LossyFmt():
     lossless:bool = False
-    quality:int = Config.img_quality
+    quality:int = config.img_quality
 
 
 class LosslessFmt():