From fa42871685e3ec6536d46eabe2449f36fe8f1c59 Mon Sep 17 00:00:00 2001 From: kierankihn <114803508+kierankihn@users.noreply.github.com> Date: Fri, 22 Nov 2024 17:51:09 +0800 Subject: [PATCH 1/2] fix: fix logging error --- gui.py | 8 +++++--- renamer.py | 6 +++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/gui.py b/gui.py index cdebf07..6f597b3 100644 --- a/gui.py +++ b/gui.py @@ -20,7 +20,7 @@ def emit(self, record): self.text.insert(tk.END, msg + '\n') self.text.yview(tk.END) # Auto-scroll to the bottom - logging.basicConfig(format='%(asctime)s %(filename)s %(levelname)s - %(message)s', level=logging.INFO if verbose else logging.WARN, handlers = [TextHandler(log_text)]) + logging.basicConfig(format='%(asctime)s %(filename)s %(levelname)s - %(message)s', level=logging.DEBUG if verbose else logging.INFO, handlers = [TextHandler(log_text)]) def main_gui(): """ @@ -33,6 +33,8 @@ def browse_directory(): def start_renaming(): path = folder_path.get() format_str = format_entry.get() + use_tw_press = use_tw_press_var.get() + verbose = verbose_var.get() if not path: messagebox.showerror("Error", "Please select a directory.") return @@ -40,13 +42,13 @@ def start_renaming(): messagebox.showerror("Error", "Please enter a format.") return - setup_logging(verbose_var, log_text) + setup_logging(verbose, log_text) # Disable the start button to prevent multiple threads start_button.config(state=tk.DISABLED) # Start the renaming process in a separate thread - threading.Thread(target=lambda: rename_comics(path, format_str, use_tw_press_var, progress_var, progress_bar, enable_start_button)).start() + threading.Thread(target=lambda: rename_comics(path, format_str, use_tw_press, progress_var, progress_bar, enable_start_button)).start() def enable_start_button(): start_button.config(state=tk.NORMAL) diff --git a/renamer.py b/renamer.py index 006d271..b1a05ff 100644 --- a/renamer.py +++ b/renamer.py @@ -89,6 +89,8 @@ def rename_comics(path: str, format_str: str, use_tw_press : bool, progress_var: """ files = os.listdir(path) + logging.info(f'Start renaming {len(files)} files in {path} with format {format_str}') + for i, old_name in enumerate(files): try: new_name = get_comic_name(old_name, format_str, use_tw_press) @@ -100,7 +102,7 @@ def rename_comics(path: str, format_str: str, use_tw_press : bool, progress_var: os.makedirs(os.path.dirname(new_path)) os.rename(old_path, new_path) - logging.info(f'Renamed {old_name} into {new_name}') + logging.debug(f'Renamed {old_name} into {new_name}') else: logging.warning(f'Failed to rename {old_name} due to not found') except Exception as e: @@ -110,4 +112,6 @@ def rename_comics(path: str, format_str: str, use_tw_press : bool, progress_var: progress_var.set((i + 1) / len(files) * 100) progress_bar.update() + logging.info('Done') + callback() \ No newline at end of file From 9bddad390e40fc7c34c8e80f8ca777739db65313 Mon Sep 17 00:00:00 2001 From: kierankihn <114803508+kierankihn@users.noreply.github.com> Date: Fri, 22 Nov 2024 17:51:21 +0800 Subject: [PATCH 2/2] =?UTF-8?q?bump:=20version=201.3.0=20=E2=86=92=201.3.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 6 ++++++ pyproject.toml | 2 +- renamer.py | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f9a5980..5dfa940 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## v1.3.1 (2024-11-22) + +### Fix + +- fix logging error + ## v1.3.0 (2024-11-22) ### Feat diff --git a/pyproject.toml b/pyproject.toml index 6bbf62a..57c1971 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,5 +2,5 @@ name = "cz_conventional_commits" tag_format = "v$version" version_scheme = "semver" -version = "1.3.0" +version = "1.3.1" update_changelog_on_bump = true diff --git a/renamer.py b/renamer.py index b1a05ff..54cc62d 100644 --- a/renamer.py +++ b/renamer.py @@ -6,7 +6,7 @@ import tkinter as tk from tkinter import ttk -__VERSION__ = '1.3.0' +__VERSION__ = '1.3.1' def get_tw_press(path: str) -> Optional[List]: """