From a257440973a388cecdcf6ca58ecec09ef833ba32 Mon Sep 17 00:00:00 2001 From: Kapitan Date: Sun, 9 Mar 2025 13:05:47 +0100 Subject: [PATCH] Actually fix uploaded count --- kapitanbooru_uploader/ImageBrowser.py | 9 ++++++--- kapitanbooru_uploader/locales/en/LC_MESSAGES/messages.po | 2 +- kapitanbooru_uploader/locales/pl/LC_MESSAGES/messages.po | 2 +- pyproject.toml | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/kapitanbooru_uploader/ImageBrowser.py b/kapitanbooru_uploader/ImageBrowser.py index 3d838e0..83c951a 100644 --- a/kapitanbooru_uploader/ImageBrowser.py +++ b/kapitanbooru_uploader/ImageBrowser.py @@ -139,7 +139,7 @@ class ImageBrowser(tk.Tk): super().__init__() self.title("Kapitanbooru Uploader") self.geometry("900x600") - self.version = "0.4.2" + self.version = "0.4.3" self.settings = Settings() self.tags_repo = TagsRepo(self.settings) @@ -715,6 +715,8 @@ class ImageBrowser(tk.Tk): self.tagger_processed.add(md5) self.listbox.delete(0, tk.END) self.uploaded.clear() + self.upload_verified = 0 + self.uploaded_count = 0 for file in self.image_files: self.listbox.insert(tk.END, os.path.basename(file)) self.uploaded[file] = False @@ -1622,12 +1624,13 @@ class ImageBrowser(tk.Tk): cancel_event: threading.Event = None, secondary_progress_queue: queue.Queue = None, ): - files_count = len(self.image_files) + files_to_upload = [x for x in self.image_files if not self.uploaded[x]] + files_count = len(files_to_upload) if progress_queue: progress_queue.put(("mode", "determinate")) progress_queue.put(("max", 100)) file_idx = 0 - for file_path in self.image_files: + for file_path in files_to_upload: if progress_queue: progress_queue.put(("progress", file_idx * 100 / files_count)) progress_queue.put( diff --git a/kapitanbooru_uploader/locales/en/LC_MESSAGES/messages.po b/kapitanbooru_uploader/locales/en/LC_MESSAGES/messages.po index ef0dfa5..eb98dab 100644 --- a/kapitanbooru_uploader/locales/en/LC_MESSAGES/messages.po +++ b/kapitanbooru_uploader/locales/en/LC_MESSAGES/messages.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"Project-Id-Version: Kapitanbooru Uploader 0.4.2\n" +"Project-Id-Version: Kapitanbooru Uploader 0.4.3\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-03-02 00:39+0100\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/kapitanbooru_uploader/locales/pl/LC_MESSAGES/messages.po b/kapitanbooru_uploader/locales/pl/LC_MESSAGES/messages.po index d573123..25280d6 100644 --- a/kapitanbooru_uploader/locales/pl/LC_MESSAGES/messages.po +++ b/kapitanbooru_uploader/locales/pl/LC_MESSAGES/messages.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"Project-Id-Version: Kapitanbooru Uploader 0.4.2\n" +"Project-Id-Version: Kapitanbooru Uploader 0.4.3\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-03-02 00:39+0100\n" "Language: pl\n" diff --git a/pyproject.toml b/pyproject.toml index e8ce662..4b045d7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "kapitanbooru-uploader" -version = "0.4.2" +version = "0.4.3" description = "A GUI application for uploading images to KapitanBooru" authors = [ {name = "Michał Leśniak", email = "kapitan@mlesniak.pl"}