From 2cf1e83eb6def96a5ae81491567e449f5201da86 Mon Sep 17 00:00:00 2001 From: brostos <67740566+brostosjoined@users.noreply.github.com> Date: Fri, 7 Feb 2025 14:39:46 +0300 Subject: [PATCH 01/17] Added bomb spinner Thanks to @EraOSBeta --- plugin_manager.py | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/plugin_manager.py b/plugin_manager.py index 17ecb74..1910902 100644 --- a/plugin_manager.py +++ b/plugin_manager.py @@ -1674,6 +1674,7 @@ class PluginManagerWindow(bui.MainWindow): self.plugins_in_current_view = {} self.selected_alphabet_order = 'a_z' self.alphabet_order_selection_button = None + loop.create_task(self.draw_index()) @@ -1746,21 +1747,27 @@ class PluginManagerWindow(bui.MainWindow): parent=self._root_widget, position=(-5, loading_pos_y), size=(self._width, 25), - text="Loading", + text="", color=bui.app.ui_v1.title_color, scale=0.7, h_align="center", v_align="center", maxwidth=400, ) - self._dot_timer = babase.AppTimer(0.5, self._update_dots, repeat=True) + self._loading_spinner = bui.spinnerwidget( + parent=self._root_widget, + position=(self._width * 0.5, loading_pos_y), + style='bomb', + size=48, + ) + @contextlib.contextmanager def exception_handler(self): try: yield except urllib.error.URLError: - self._dot_timer = None + bui.spinnerwidget(edit=self._loading_spinner, visible=False) try: bui.textwidget( edit=self._plugin_manager_status_text, @@ -1773,21 +1780,13 @@ class PluginManagerWindow(bui.MainWindow): # User probably went back before a bui.Window could finish loading. pass except Exception as e: - self._dot_timer = None + bui.spinnerwidget(edit=self._loading_spinner, visible=False) try: bui.textwidget(edit=self._plugin_manager_status_text, text=str(e)) except: pass raise - def _update_dots(self): - try: - text = cast(str, bui.textwidget(query=self._plugin_manager_status_text)) - if text.endswith('....'): - text = text[0:len(text)-4] - bui.textwidget(edit=self._plugin_manager_status_text, text=(text + '.')) - except: - pass async def draw_index(self): self.draw_search_bar() @@ -1798,7 +1797,7 @@ class PluginManagerWindow(bui.MainWindow): with self.exception_handler(): await self.plugin_manager.setup_changelog() await self.plugin_manager.setup_index() - self._dot_timer = None + bui.spinnerwidget(edit=self._loading_spinner, visible=False) try: bui.textwidget(edit=self._plugin_manager_status_text, text="") except: @@ -2115,18 +2114,18 @@ class PluginManagerWindow(bui.MainWindow): async def refresh(self): self.cleanup() - try: - bui.textwidget(edit=self._plugin_manager_status_text, text="Refreshing") - except: - pass - if self._dot_timer is None: - self._dot_timer = babase.AppTimer(0.5, self._update_dots, repeat=True) + # try: + # bui.textwidget(edit=self._plugin_manager_status_text, text="Refreshing") + # except: + # pass + + bui.spinnerwidget(edit=self._loading_spinner, visible=True) with self.exception_handler(): await self.plugin_manager.refresh() await self.plugin_manager.setup_changelog() await self.plugin_manager.setup_index() - self._dot_timer = None + bui.spinnerwidget(edit=self._loading_spinner, visible=False) try: bui.textwidget(edit=self._plugin_manager_status_text, text="") except: From c879ffaaca90b4f0375edd065ec712ac5a525c41 Mon Sep 17 00:00:00 2001 From: brostosjoined <67740566+brostosjoined@users.noreply.github.com> Date: Fri, 7 Feb 2025 11:42:39 +0000 Subject: [PATCH 02/17] [ci] auto-format --- plugin_manager.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/plugin_manager.py b/plugin_manager.py index 1910902..fd6e209 100644 --- a/plugin_manager.py +++ b/plugin_manager.py @@ -1674,7 +1674,6 @@ class PluginManagerWindow(bui.MainWindow): self.plugins_in_current_view = {} self.selected_alphabet_order = 'a_z' self.alphabet_order_selection_button = None - loop.create_task(self.draw_index()) @@ -1760,7 +1759,6 @@ class PluginManagerWindow(bui.MainWindow): style='bomb', size=48, ) - @contextlib.contextmanager def exception_handler(self): @@ -1787,7 +1785,6 @@ class PluginManagerWindow(bui.MainWindow): pass raise - async def draw_index(self): self.draw_search_bar() self.draw_plugins_scroll_bar() From 241bb3063ed2750875e7230681434e005b2080ea Mon Sep 17 00:00:00 2001 From: brostos <67740566+brostosjoined@users.noreply.github.com> Date: Sun, 9 Feb 2025 14:05:55 +0300 Subject: [PATCH 03/17] Update index.json --- index.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/index.json b/index.json index e6a778c..696e39f 100644 --- a/index.json +++ b/index.json @@ -1,6 +1,7 @@ { "plugin_manager_url": "https://github.com/bombsquad-community/plugin-manager/{content_type}/{tag}/plugin_manager.py", "versions": { + "1.1.1":null "1.1.0": { "api_version": 9, "commit_sha": "004ee51", @@ -254,4 +255,4 @@ "https://github.com/bombsquad-community/plugin-manager/{content_type}/{tag}/plugins/maps.json" ], "external_source_url": "https://github.com/{repository}/{content_type}/{tag}/category.json" -} \ No newline at end of file +} From 9a501110816adcc090944d9a3c0a71e41533fe02 Mon Sep 17 00:00:00 2001 From: brostos <67740566+brostosjoined@users.noreply.github.com> Date: Sun, 9 Feb 2025 14:10:04 +0300 Subject: [PATCH 04/17] Update CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 880f215..27dfec3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ### 1.1.0 (23-01-2025) +- Added bomb spinner widget for loading animation. + +### 1.1.0 (23-01-2025) + - Updated to bombsquad api 9. ### 1.0.23 (13-01-2025) From 9697df909cb706e7c74f4bcce745ae212f2f52ad Mon Sep 17 00:00:00 2001 From: brostos <67740566+brostosjoined@users.noreply.github.com> Date: Sun, 9 Feb 2025 14:10:43 +0300 Subject: [PATCH 05/17] Update index.json --- index.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.json b/index.json index 696e39f..1d4fae5 100644 --- a/index.json +++ b/index.json @@ -1,7 +1,7 @@ { "plugin_manager_url": "https://github.com/bombsquad-community/plugin-manager/{content_type}/{tag}/plugin_manager.py", "versions": { - "1.1.1":null + "1.1.1":null, "1.1.0": { "api_version": 9, "commit_sha": "004ee51", From 36c7d8318a46aebba1c1cc9dedb27ba7e59ba1b2 Mon Sep 17 00:00:00 2001 From: brostosjoined <67740566+brostosjoined@users.noreply.github.com> Date: Sun, 9 Feb 2025 11:11:05 +0000 Subject: [PATCH 06/17] [ci] apply-version-metadata --- index.json | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/index.json b/index.json index 1d4fae5..f669e94 100644 --- a/index.json +++ b/index.json @@ -1,7 +1,12 @@ { "plugin_manager_url": "https://github.com/bombsquad-community/plugin-manager/{content_type}/{tag}/plugin_manager.py", "versions": { - "1.1.1":null, + "1.1.1": { + "api_version": 9, + "commit_sha": "9697df9", + "released_on": "09-02-2025", + "md5sum": "f4750704a753e725365c92c87f793ad5" + }, "1.1.0": { "api_version": 9, "commit_sha": "004ee51", @@ -255,4 +260,4 @@ "https://github.com/bombsquad-community/plugin-manager/{content_type}/{tag}/plugins/maps.json" ], "external_source_url": "https://github.com/{repository}/{content_type}/{tag}/category.json" -} +} \ No newline at end of file From 98109992d542616320594dc29b5c3848f6558097 Mon Sep 17 00:00:00 2001 From: brostos <67740566+brostosjoined@users.noreply.github.com> Date: Sun, 9 Feb 2025 14:12:49 +0300 Subject: [PATCH 07/17] Update date --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 27dfec3..3022e52 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ ## Plugin Manager (dd-mm-yyyy) -### 1.1.0 (23-01-2025) +### 1.1.0 (9-02-2025) - Added bomb spinner widget for loading animation. From b79fbf99b6e0ab56b285a24377ab8738b313582c Mon Sep 17 00:00:00 2001 From: brostos <67740566+brostosjoined@users.noreply.github.com> Date: Sun, 9 Feb 2025 14:13:54 +0300 Subject: [PATCH 08/17] Update index.json --- index.json | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/index.json b/index.json index f669e94..1d4fae5 100644 --- a/index.json +++ b/index.json @@ -1,12 +1,7 @@ { "plugin_manager_url": "https://github.com/bombsquad-community/plugin-manager/{content_type}/{tag}/plugin_manager.py", "versions": { - "1.1.1": { - "api_version": 9, - "commit_sha": "9697df9", - "released_on": "09-02-2025", - "md5sum": "f4750704a753e725365c92c87f793ad5" - }, + "1.1.1":null, "1.1.0": { "api_version": 9, "commit_sha": "004ee51", @@ -260,4 +255,4 @@ "https://github.com/bombsquad-community/plugin-manager/{content_type}/{tag}/plugins/maps.json" ], "external_source_url": "https://github.com/{repository}/{content_type}/{tag}/category.json" -} \ No newline at end of file +} From 122ee737e65f788646e12da0889a11408af63c5f Mon Sep 17 00:00:00 2001 From: brostosjoined <67740566+brostosjoined@users.noreply.github.com> Date: Sun, 9 Feb 2025 11:14:17 +0000 Subject: [PATCH 09/17] [ci] apply-version-metadata --- index.json | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/index.json b/index.json index 1d4fae5..4f1d177 100644 --- a/index.json +++ b/index.json @@ -1,7 +1,12 @@ { "plugin_manager_url": "https://github.com/bombsquad-community/plugin-manager/{content_type}/{tag}/plugin_manager.py", "versions": { - "1.1.1":null, + "1.1.1": { + "api_version": 9, + "commit_sha": "b79fbf9", + "released_on": "09-02-2025", + "md5sum": "f4750704a753e725365c92c87f793ad5" + }, "1.1.0": { "api_version": 9, "commit_sha": "004ee51", @@ -255,4 +260,4 @@ "https://github.com/bombsquad-community/plugin-manager/{content_type}/{tag}/plugins/maps.json" ], "external_source_url": "https://github.com/{repository}/{content_type}/{tag}/category.json" -} +} \ No newline at end of file From 75b9d3e2d89d42f2c3f73800a0ffe95b399060b4 Mon Sep 17 00:00:00 2001 From: brostos <67740566+brostosjoined@users.noreply.github.com> Date: Sun, 9 Feb 2025 16:00:16 +0300 Subject: [PATCH 10/17] 9 -> 09 to prevent regex errors --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3022e52..dcc9d7c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ ## Plugin Manager (dd-mm-yyyy) -### 1.1.0 (9-02-2025) +### 1.1.0 (09-02-2025) - Added bomb spinner widget for loading animation. From 0af3abb4ed9e1887086cc6ad07c43ccce6a99575 Mon Sep 17 00:00:00 2001 From: brostos <67740566+brostosjoined@users.noreply.github.com> Date: Sun, 9 Feb 2025 16:00:45 +0300 Subject: [PATCH 11/17] Update index.json --- index.json | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/index.json b/index.json index 4f1d177..1d4fae5 100644 --- a/index.json +++ b/index.json @@ -1,12 +1,7 @@ { "plugin_manager_url": "https://github.com/bombsquad-community/plugin-manager/{content_type}/{tag}/plugin_manager.py", "versions": { - "1.1.1": { - "api_version": 9, - "commit_sha": "b79fbf9", - "released_on": "09-02-2025", - "md5sum": "f4750704a753e725365c92c87f793ad5" - }, + "1.1.1":null, "1.1.0": { "api_version": 9, "commit_sha": "004ee51", @@ -260,4 +255,4 @@ "https://github.com/bombsquad-community/plugin-manager/{content_type}/{tag}/plugins/maps.json" ], "external_source_url": "https://github.com/{repository}/{content_type}/{tag}/category.json" -} \ No newline at end of file +} From d2b603faaa29d17f820db58dc5d5e3ee15b27751 Mon Sep 17 00:00:00 2001 From: brostosjoined <67740566+brostosjoined@users.noreply.github.com> Date: Sun, 9 Feb 2025 13:01:11 +0000 Subject: [PATCH 12/17] [ci] apply-version-metadata --- index.json | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/index.json b/index.json index 1d4fae5..c79bc15 100644 --- a/index.json +++ b/index.json @@ -1,7 +1,12 @@ { "plugin_manager_url": "https://github.com/bombsquad-community/plugin-manager/{content_type}/{tag}/plugin_manager.py", "versions": { - "1.1.1":null, + "1.1.1": { + "api_version": 9, + "commit_sha": "0af3abb", + "released_on": "09-02-2025", + "md5sum": "f4750704a753e725365c92c87f793ad5" + }, "1.1.0": { "api_version": 9, "commit_sha": "004ee51", @@ -255,4 +260,4 @@ "https://github.com/bombsquad-community/plugin-manager/{content_type}/{tag}/plugins/maps.json" ], "external_source_url": "https://github.com/{repository}/{content_type}/{tag}/category.json" -} +} \ No newline at end of file From e8d05d96781db0a69468cef412359d26a7aa87f0 Mon Sep 17 00:00:00 2001 From: brostos <67740566+brostosjoined@users.noreply.github.com> Date: Sun, 9 Feb 2025 16:42:30 +0300 Subject: [PATCH 13/17] Update version in changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dcc9d7c..2c3dd71 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ ## Plugin Manager (dd-mm-yyyy) -### 1.1.0 (09-02-2025) +### 1.1.1 (09-02-2025) - Added bomb spinner widget for loading animation. From 9a6d649bc9da7e0008a42f8c43a034165f424a06 Mon Sep 17 00:00:00 2001 From: brostos <67740566+brostosjoined@users.noreply.github.com> Date: Sun, 9 Feb 2025 16:42:56 +0300 Subject: [PATCH 14/17] Update index.json --- index.json | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/index.json b/index.json index c79bc15..c8c7db7 100644 --- a/index.json +++ b/index.json @@ -1,12 +1,7 @@ { "plugin_manager_url": "https://github.com/bombsquad-community/plugin-manager/{content_type}/{tag}/plugin_manager.py", "versions": { - "1.1.1": { - "api_version": 9, - "commit_sha": "0af3abb", - "released_on": "09-02-2025", - "md5sum": "f4750704a753e725365c92c87f793ad5" - }, + "1.1.1": null, "1.1.0": { "api_version": 9, "commit_sha": "004ee51", @@ -260,4 +255,4 @@ "https://github.com/bombsquad-community/plugin-manager/{content_type}/{tag}/plugins/maps.json" ], "external_source_url": "https://github.com/{repository}/{content_type}/{tag}/category.json" -} \ No newline at end of file +} From 5104aac584f7d9c51de6042b3b4cf9564ba4eb74 Mon Sep 17 00:00:00 2001 From: brostosjoined <67740566+brostosjoined@users.noreply.github.com> Date: Sun, 9 Feb 2025 13:43:15 +0000 Subject: [PATCH 15/17] [ci] apply-version-metadata --- index.json | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/index.json b/index.json index c8c7db7..612465d 100644 --- a/index.json +++ b/index.json @@ -1,7 +1,12 @@ { "plugin_manager_url": "https://github.com/bombsquad-community/plugin-manager/{content_type}/{tag}/plugin_manager.py", "versions": { - "1.1.1": null, + "1.1.1": { + "api_version": 9, + "commit_sha": "9a6d649", + "released_on": "09-02-2025", + "md5sum": "f4750704a753e725365c92c87f793ad5" + }, "1.1.0": { "api_version": 9, "commit_sha": "004ee51", @@ -255,4 +260,4 @@ "https://github.com/bombsquad-community/plugin-manager/{content_type}/{tag}/plugins/maps.json" ], "external_source_url": "https://github.com/{repository}/{content_type}/{tag}/category.json" -} +} \ No newline at end of file From 93106f2e72e54187320fd06a88a8655f68b54a67 Mon Sep 17 00:00:00 2001 From: Loup-Garou911XD Date: Sun, 9 Feb 2025 19:17:19 +0530 Subject: [PATCH 16/17] CI fix --- index.json | 7 +------ plugin_manager.py | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/index.json b/index.json index 612465d..f68d833 100644 --- a/index.json +++ b/index.json @@ -1,12 +1,7 @@ { "plugin_manager_url": "https://github.com/bombsquad-community/plugin-manager/{content_type}/{tag}/plugin_manager.py", "versions": { - "1.1.1": { - "api_version": 9, - "commit_sha": "9a6d649", - "released_on": "09-02-2025", - "md5sum": "f4750704a753e725365c92c87f793ad5" - }, + "1.1.1": null, "1.1.0": { "api_version": 9, "commit_sha": "004ee51", diff --git a/plugin_manager.py b/plugin_manager.py index fd6e209..2095dfe 100644 --- a/plugin_manager.py +++ b/plugin_manager.py @@ -29,7 +29,7 @@ from datetime import datetime # Modules used for overriding AllSettingsWindow import logging -PLUGIN_MANAGER_VERSION = "1.1.0" +PLUGIN_MANAGER_VERSION = "1.1.1" REPOSITORY_URL = "https://github.com/bombsquad-community/plugin-manager" # Current tag can be changed to "staging" or any other branch in # plugin manager repo for testing purpose. From 892c9c89ee32cb46c7e8a153d408157a74d495d1 Mon Sep 17 00:00:00 2001 From: Loup-Garou911XD <90267658+Loup-Garou911XD@users.noreply.github.com> Date: Sun, 9 Feb 2025 13:47:48 +0000 Subject: [PATCH 17/17] [ci] apply-version-metadata --- index.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/index.json b/index.json index f68d833..53956e5 100644 --- a/index.json +++ b/index.json @@ -1,7 +1,12 @@ { "plugin_manager_url": "https://github.com/bombsquad-community/plugin-manager/{content_type}/{tag}/plugin_manager.py", "versions": { - "1.1.1": null, + "1.1.1": { + "api_version": 9, + "commit_sha": "93106f2", + "released_on": "09-02-2025", + "md5sum": "0e5ec54582032a11c044d10cff3d0aa1" + }, "1.1.0": { "api_version": 9, "commit_sha": "004ee51",