Update 0.4.6

Update 0.4.6

.github/workflows/Run_Tests.yml

@@ -5,7 +5,7 @@ name: Python tests
 
 on:
   - push
-  - pull_request
+#  - pull_request
 
 jobs:
   build:

.gitignore

@@ -9,8 +9,8 @@ undo.json
 /.idea/vcs.xml
 /ZIPPER_2_COVER_SETTER_UI.ui
 /junk_stuff/
-/MangaManager/CoverManagerLib/.pytest_cache/
-/MangaManager/MetadataManagerLib/.pytest_cache/
+/MangaManager/src/CoverManagerLib/.pytest_cache/
+/MangaManager/src/MetadataManagerLib/.pytest_cache/
 /MangaManager/tests/.pytest_cache/
 /MangaManager/tests/Sample CBZ Chapter 23.cbz
 /MangaManager/tests/Sample CBZ Chapter 24.cbz

MangaManager/MangaManager.pyw

@@ -11,12 +11,12 @@ import tkinter as tk
 from logging.handlers import RotatingFileHandler
 from pathlib import Path
 
-from CommonLib import WebpConverter
-from CommonLib.HelperFunctions import create_settings
-from ConvertersLib.epub2cbz import epub2cbz
-from CoverManagerLib import CoverManager
-from MetadataManagerLib import MetadataManager
-from VolumeManager import VolumeManager
+from src.CommonLib import SettingsWindow, WebpConverter
+from src.CommonLib.HelperFunctions import create_settings
+from src.ConvertersLib.epub2cbz import epub2cbz
+from src.CoverManagerLib import CoverManager
+from src.MetadataManagerLib import MetadataManager
+from src.VolumeManager import VolumeManager
 
 
 # <Arguments parser>
@@ -26,6 +26,9 @@ class ToolS(enum.Enum):
     VOLUME = 3
     EPUB2CBZ = 4
     WEBP = 5
+    SETTINGS = 6
+
+
 parser = argparse.ArgumentParser()
 parser.add_argument(
     '-d', '--debug',
@@ -77,7 +80,6 @@ parser.add_argument(
     '-p', '--path',
     type=is_dir_path, dest="active_dir_path")
 
-
 # </Arguments parser>
 
 
@@ -102,9 +104,9 @@ logging.basicConfig(level=logging.DEBUG,
 logger.debug('DEBUG LEVEL - MAIN MODULE')
 logger.info('INFO LEVEL - MAIN MODULE')
 
-
 images_path = pathlib.Path(PROJECT_PATH, "Icons")
-tools = [CoverManager, MetadataManager, VolumeManager, epub2cbz, WebpConverter]
+
+tools = [CoverManager, MetadataManager, VolumeManager, epub2cbz, WebpConverter, SettingsWindow]
 
 
 def load_settings():
@@ -145,6 +147,7 @@ class MangaManager:
     def __init__(self, master: tk.Tk):
         self.master = master
         self.settings = load_settings()
+        self.setting_window: tk.Toplevel = None
 
     def start_ui(self):
         # build ui
@@ -183,9 +186,21 @@ class MangaManager:
         self.frame_1.pack(anchor='center', expand='true', fill='both', side='top')
         self.frame_1.grid_anchor('center')
 
+        self.settings_button = tk.Button(self.master, text="Open Settings", width=40, height=5, highlightcolor="black",
+                                         highlightthickness=3,
+                                         command=self.open_settings)
+        self.settings_button.pack(anchor="s", pady="0 20")
+
         # Main widget
         self.mainwindow = self.master
 
+    def open_settings(self):
+        if self.setting_window is not None:
+            self.setting_window.destroy()
+            # self.setting_window.update()
+        self.setting_window = SettingsWindow.App(self.mainwindow, self.settings, settings_path=SETTING_PATH)
+        self.setting_window.start_ui()
+
     def execute(self, tool: ToolS):
         root2 = tk.Toplevel(self.mainwindow)
         if platform.system() == "Linux":

MangaManager/MangaManager.spec

@@ -0,0 +1,44 @@
+# -*- mode: python ; coding: utf-8 -*-
+
+
+block_cipher = None
+
+
+a = Analysis(
+    ['MangaManager.pyw'],
+    pathex=[],
+    binaries=[],
+    datas=[('Icons','Icons')],
+    hiddenimports=[],
+    hookspath=[],
+    hooksconfig={},
+    runtime_hooks=[],
+    excludes=[],
+    win_no_prefer_redirects=False,
+    win_private_assemblies=False,
+    cipher=block_cipher,
+    noarchive=False,
+)
+pyz = PYZ(a.pure, a.zipped_data, cipher=block_cipher)
+
+exe = EXE(
+    pyz,
+    a.scripts,
+    a.binaries,
+    a.zipfiles,
+    a.datas,
+    [],
+    name='MangaManager',
+    debug=False,
+    bootloader_ignore_signals=False,
+    strip=False,
+    upx=True,
+    upx_exclude=[],
+    runtime_tmpdir=None,
+    console=False,
+    disable_windowed_traceback=False,
+    argv_emulation=False,
+    target_arch=None,
+    codesign_identity=None,
+    entitlements_file=None,
+)

MangaManager/CommonLib/ProgressBarWidget.py → MangaManager/src/CommonLib/ProgressBarWidget.py

@@ -3,8 +3,8 @@
 import tkinter as tk
 from tkinter import ttk
 
-from CommonLib.HelperFunctions import get_elapsed_time
-from CommonLib.HelperFunctions import get_estimated_time
+from src.CommonLib.HelperFunctions import get_elapsed_time
+from src.CommonLib.HelperFunctions import get_estimated_time
 
 logger = logging.getLogger(__name__)
 

MangaManager/src/CommonLib/SettingsWindow.py

@@ -0,0 +1,46 @@
+import json
+import tkinter as tk
+from tkinter.filedialog import askdirectory
+
+
+class App(tk.Toplevel):
+    def __init__(self, master: tk.Tk, settings, settings_path):
+        super().__init__(master=master)
+        self.settings_json = settings
+        self.setting_path = settings_path
+
+    def start_ui(self):
+        self.title = "Test_title"
+        # self.configure(width=80,height=90)
+        latest_row = 0
+        self.frame_1 = tk.Frame(self)
+        self.settings_list = {}
+        for i, setting in enumerate(self.settings_json):
+            self.settings_list[str(setting)] = {}
+            self.settings_list[str(setting)]["var"] = tk.StringVar(master=self.frame_1, name=setting,
+                                                                   value=self.settings_json.get(setting))
+            self.settings_list[str(setting)]["label"] = tk.Label(master=self.frame_1,
+                                                                 text=setting.replace("_", " ").title())
+            self.settings_list[str(setting)]["entry"] = tk.Entry(master=self.frame_1,
+                                                                 textvariable=self.settings_list[str(setting)]["var"],
+                                                                 width=90)
+            self.settings_list[str(setting)]["button"] = tk.Button(master=self.frame_1, text="Browse",
+                                                                   command=lambda m=setting: self.set_field(m))
+
+            self.settings_list[str(setting)]["label"].grid(row=i, column=0)
+            self.settings_list[str(setting)]["entry"].grid(row=i, column=1)
+            self.settings_list[str(setting)]["button"].grid(row=i, column=2)
+            latest_row += 1
+        self.save_btn = tk.Button(master=self.frame_1, text="Save", command=self.save)
+        self.save_btn.grid(row=latest_row, column=0, columnspan=2)
+
+        self.frame_1.pack(anchor="center", padx=60, pady=60)
+
+    def save(self):
+        for setting in self.settings_json:
+            self.settings_json[setting] = self.settings_list[setting]["var"].get()
+        with open(self.setting_path, 'w') as settings_json:
+            json.dump(self.settings_json, settings_json, indent=4)
+
+    def set_field(self, e):
+        self.settings_list[e]["var"].set(askdirectory(parent=self.frame_1))