Bugfixing

update page fix
fix async functions

Author: FrenkyDema

src/gui/main_app.py

@@ -1,3 +1,4 @@
+import asyncio
 from customtkinter import *
 
 from .pages import update_page
@@ -15,6 +16,8 @@ class App(CTk):
     def __init__(self):
         super().__init__()
 
+        self.loop: asyncio.AbstractEventLoop = asyncio.get_event_loop()
+
         self.title(lib.APP_NAME)
         self.geometry(f"{App.WIDTH}x{App.HEIGHT}")
         # self.minsize(App.WIDTH, App.HEIGHT)
@@ -35,7 +38,7 @@ def __init__(self):
                                     )
         self.title_label.grid(row=0, column=0, pady=5, padx=10)
 
-        self.frame = update_page.UpdatePage(self, self)
+        self.frame = update_page.UpdatePage(self, self, self.loop)
         self.frame.grid(row=1, sticky="nswe", padx=20, pady=20)
 
     # def change_mode(self):
@@ -49,3 +52,4 @@ def on_closing(self):
 
     def start(self):
         self.mainloop()
+        self.loop.run_forever()

src/gui/pages/update_page.py

@@ -3,17 +3,32 @@
 import aiohttp
 import webbrowser
 from customtkinter import *
-import requests
-from PIL import Image, ImageTk, ImageSequence
+from PIL import Image, ImageSequence
 import os
 
 from ...libs import lib
 from ...libs.lib import CONFIG_FILE
 
 
+async def update_async(latest_release):
+    # Scarica l'aggiornamento dal repository su GitHub
+    async with aiohttp.ClientSession() as session:
+        async with session.get(latest_release['zipball_url']) as response:
+            with open('latest_release.zip', 'wb') as f:
+                f.write(await response.read())
+
+    # Aggiorna il file di configurazione locale con la nuova versione
+    lib.update_key_json(CONFIG_FILE, "version", latest_release['tag_name'])
+
+    # Avvia l'applicazione aggiornata
+    os.startfile('latest_release.zip')
+
+
 class UpdatePage(CTkFrame):
-    def __init__(self, master, app):
-        self.app = app
+    def __init__(self, master, app, loop: asyncio.AbstractEventLoop):
+        from ..main_app import App
+        self.loop = loop
+        self.app: App = app
         super().__init__(master)
 
         self.grid_rowconfigure((0, 1, 2, 3), weight=1)
@@ -22,7 +37,7 @@ def __init__(self, master, app):
         self.check_updates_button = CTkButton(
             self,
             text="Controlla aggiornamenti",
-            command=lambda: asyncio.ensure_future(self.check_for_updates())
+            command=self.check_for_updates_thread
         )
         self.check_updates_button.grid(row=0, column=0, padx=20, pady=10)
 
@@ -34,34 +49,43 @@ def __init__(self, master, app):
         self.version.grid(
             row=1, column=0, columnspan=2, padx=5,)
 
-        # Crea un'immagine GIF animata e ottieni il frame iniziale
         self.loading_gif = Image.open(lib.get_image_path('loading.gif'))
-        self.loading_gif_frames = [ImageTk.PhotoImage(
-            frame) for frame in ImageSequence.Iterator(self.loading_gif)]
+        self.loading_gif_frames = [
+            Image.frombytes(
+                self.loading_gif.mode, self.loading_gif.size, frame.tobytes())
+            for frame in ImageSequence.Iterator(self.loading_gif)
+        ]
+
+    def animate_loading_gif(self):
+        self.check_updates_button.configure(image=CTkImage(
+            light_image=self.loading_gif_frames[self.loading_gif_index],
+            size=(30, 30)
+        ))
+        self.loading_gif_index = (
+            self.loading_gif_index + 1) % len(self.loading_gif_frames)
+        self.loading_gif_animation_id = self.after(
+            100, self.animate_loading_gif)
 
     def update_button_state(self, state):
         if state == "loading":
-            self.check_updates_button.config(
+            self.check_updates_button.configure(
                 text="Caricamento in corso...", state="disabled")
-            self.loading_gif_index = 0
+            self.loading_gif_index = 1
             self.animate_loading_gif()
         elif state == "loaded":
-            self.check_updates_button.config(
+            self.check_updates_button.configure(
                 text="Controlla aggiornamenti", state="normal")
             self.after_cancel(self.loading_gif_animation_id)
 
-    def animate_loading_gif(self):
-        self.check_updates_button.config(
-            image=self.loading_gif_frames[self.loading_gif_index])
-        self.loading_gif_index = (
-            self.loading_gif_index + 1) % len(self.loading_gif_frames)
-        self.loading_gif_animation_id = self.after(
-            100, self.animate_loading_gif)
-
     async def open_github(self):
         url = f'https://api.github.com/repos/{lib.get_key_value_json(CONFIG_FILE, "repo_owner")}/{lib.get_key_value_json(CONFIG_FILE, "repo_name")}/releases/latest'
         webbrowser.open_new_tab(url)
 
+    def check_for_updates_thread(self):
+        print("check_for_updates_thread")
+        # self.loop.create_task(self.check_for_updates())
+        self.loop.run_until_complete(self.check_for_updates())
+
     async def check_for_updates(self):
         current_version = lib.get_key_value_json(CONFIG_FILE, "version")
 
@@ -82,28 +106,17 @@ async def check_for_updates(self):
                             self,
                             text="Aggiorna ora",
                             command=lambda: asyncio.ensure_future(
-                                self.update_async(latest_release))
+                                update_async(latest_release))
                         )
                         self.update_button.grid(
                             row=2, column=0, padx=20, pady=10)
 
                 else:
+                    
                     # Gestione dell'errore
                     messagebox.showerror(
                         "Error", "Nessun aggiornamento trovato.")
+                    self.update_button_state("loaded")
         # Riabilita il bottone di aggiornamento e nasconde l'icona animata
-        self.check_updates_button.config(state='normal')
-        self.check_updates_button.config(image='')
-
-    async def update_async(self, latest_release):
-        # Scarica l'aggiornamento dal repository su GitHub
-        async with aiohttp.ClientSession() as session:
-            async with session.get(latest_release['zipball_url']) as response:
-                with open('latest_release.zip', 'wb') as f:
-                    f.write(await response.read())
-
-        # Aggiorna il file di configurazione locale con la nuova versione
-        lib.update_key_json(CONFIG_FILE, "version", latest_release['tag_name'])
-
-        # Avvia l'applicazione aggiornata
-        os.startfile('latest_release.zip')
+        self.check_updates_button.configure(state='normal')
+        self.check_updates_button.configure(image='')

src/main.py

@@ -1,3 +1,4 @@
+import asyncio
 import os
 import sys
 import types