whitespaces: infowidget fixes

.gitignore

@@ -15,3 +15,4 @@ example_software_root/
 # windows dir on linux ä
 **\\install-dir/
 server/data/
+database.db

client.py

@@ -10,6 +10,7 @@ import cache_utils
 import imagetools
 import webbrowser
 import statekeeper
+import infowidget
 
 customtkinter.set_appearance_mode("dark")
 customtkinter.set_default_color_theme("blue")
@@ -27,6 +28,8 @@ details_elements = []
 non_disabled_entry_color = None
 all_metadata = None
 
+infowidget_window = None
+
 db = None # app data-backend (i.e. LocalFS or FTP)
 
 CONFIG_FILE = "gamevault_config.json"
@@ -180,9 +183,13 @@ def load_main():
     '''Load the main page overview'''
 
     global all_metadata
+    global infowidget_window
 
     app.title("Lan Vault: Overview")
 
+    if not infowidget_window:
+        infowidget_window = infowidget.ProgressBarApp(app)
+
     # navbar should not expand when window is resized
     app.grid_rowconfigure(0, weight=0)
     # buttongrid (scrollable frame) should expand when window is resized

db.py

@@ -0,0 +1,34 @@
+from sqlalchemy import Column, String, Integer, Boolean, create_engine
+from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.orm import sessionmaker, scoped_session
+
+Base = declarative_base()
+
+class Download(Base):
+
+    __tablename__ = 'files'
+
+    path = Column(String, primary_key=True)
+    size = Column(Integer)
+    type = Column(String)
+    finished = Column(Boolean)
+
+class Database:
+    def __init__(self, db_url="sqlite:///database.db"):
+        self.engine = create_engine(db_url, echo=True)
+        self.session_factory = sessionmaker(bind=self.engine)
+        self.Session = scoped_session(self.session_factory)  # Thread-safe sessions
+
+        # Automatically create tables
+        Base.metadata.create_all(self.engine)
+
+    def session(self):
+        """Returns a new session (or an existing one if in the same thread)."""
+        return self.Session()
+
+    def close_session(self):
+        """Closes the current session."""
+        self.Session.remove()
+
+# Singleton instance of Database
+db = Database()

infowidget.py

@@ -16,50 +16,55 @@ import time
 import string
 
 class ProgressBarApp:
-    def __init__(self, root):
-        self.root = root
+    def __init__(self, parent):
+
+        self.root = tk.Toplevel(parent)
         self.root.title("Dynamic Progress Bars")
-        
-        self.delete_all_button = tk.Button(root, text="Delete All Finished", command=self.delete_all_finished, state=tk.DISABLED)
+
+        self.delete_all_button = tk.Button(self.root, text="Delete All Finished", command=self.delete_all_finished, state=tk.DISABLED)
         self.delete_all_button.pack(pady=5)
-        
-        self.frame = tk.Frame(root)
+
+        self.frame = tk.Frame(self.root)
         self.frame.pack(pady=10)
-        
+
         self.progress_bars = []  # Store tuples of (progressbar, frame, duration, delete_button)
-        
+
         self.running = True
         threading.Thread(target=self.add_progress_bars, daemon=True).start()
 
     def add_progress_bars(self):
         while self.running:
-            time.sleep(3)  # Wait before adding a new progress bar
-            
+
             frame = tk.Frame(self.frame)
             frame.pack(fill=tk.X, pady=2)
-            
+
             progress = ttk.Progressbar(frame, length=200, mode='determinate')
             progress.pack(side=tk.LEFT, padx=5)
-            
+
             delete_button = tk.Button(frame, text="Delete", command=lambda f=frame: self.delete_progress(f), state=tk.DISABLED)
             delete_button.pack(side=tk.LEFT, padx=5)
-            
+
             random_letter = random.choice(string.ascii_uppercase)
             label = tk.Label(frame, text=random_letter)
             label.pack(side=tk.LEFT, padx=5)
-            
+
+            self.progress_bars.insert(0, (progress, frame, delete_button))  # Insert at the top
+            frame.pack(fill=tk.X, pady=2, before=self.frame.winfo_children()[-1] if self.frame.winfo_children() else None)
+
             duration = random.randint(1, 10)  # Random fill time
             threading.Thread(target=self.fill_progress, args=(progress, duration, frame, delete_button), daemon=True).start()
 
+            time.sleep(30)  # Wait before adding a new progress bar
+
     def fill_progress(self, progress, duration, frame, delete_button):
         for i in range(101):  # Fill progress bar over 'duration' seconds
             time.sleep(duration / 100)
             if not progress.winfo_exists():  # Check if progress bar still exists
                 return
             self.root.after(0, progress.config, {"value": i})
-        
+
         self.root.after(0, delete_button.config, {"state": tk.NORMAL})
-        
+
         self.progress_bars.append((progress, frame, duration, delete_button))
         self.update_delete_all_button()
 
@@ -73,7 +78,7 @@ class ProgressBarApp:
             frame.destroy()
         self.progress_bars.clear()
         self.update_delete_all_button()
-    
+
     def update_delete_all_button(self):
         if self.progress_bars:
             self.delete_all_button.config(state=tk.NORMAL)
@@ -82,10 +87,4 @@ class ProgressBarApp:
 
     def on_close(self):
         self.running = False
-        self.root.destroy()
-
-if __name__ == "__main__":
-    root = tk.Tk()
-    app = ProgressBarApp(root)
-    root.protocol("WM_DELETE_WINDOW", app.on_close)
-    root.mainloop()
+        self.root.destroy()

software.py

@@ -11,6 +11,7 @@ import jinja_helper
 import threading
 import sys
 import tkinter
+import statekeeper
 
 class Software:
 
@@ -131,7 +132,10 @@ class Software:
         except IndexError:
             print("No main_dir:", path)
             raise AssertionError("No main_dir for this software")
+        
+        statekeeper.log_begin_download(remote_file)
         local_file = self.backend.get(remote_file, self.cache_dir, wait=True)
+        statekeeper.log_end_download(remote_file)
 
         # execute or unpack #
         if local_file.endswith(".exe"):

statekeeper.py

@@ -1,6 +1,9 @@
 import requests
 import os
+import sqlalchemy
 import threading
+from db import db, Download
+from sqlalchemy import or_, and_
 
 def add_to_download_queue(url, path):
     '''The download is added to the global queue and downloaded eventually'''
@@ -33,4 +36,33 @@ def _download(url, path):
     
     else:
 
-        raise AssertionError("Non-200 Response for:", url, path, response.status_code, response.text)
+        raise AssertionError("Non-200 Response for:", url, path, response.status_code, response.text)
+
+def log_begin_download(path):
+
+    session = db.session()
+    print("Current path", path)
+    path_exists = session.query(Download).filter(and_(Download.path==path, Download.finished==False)).first()
+    if path_exists:
+        print("DAFUG", path_exists)
+        print("WTF", path_exists.path)
+        raise AssertionError("ERROR: {} is already downloading.".format(path))
+    else:
+        print("Adding to download log:", path)
+        session.merge(Download(path=path, size=0, type="download", finished=False))
+        session.commit()
+
+    db.close_session()
+
+def log_end_download(path):
+
+    session = db.session()
+    path_exists = session.query(Download).filter(Download.path==path).first()
+    if not path_exists:
+        raise AssertionError("ERROR: {} is not downloading/cannot remove.".format(path))
+    else:
+        print("Removing from download log:", path)
+        session.merge(Download(path=path, size=0, type="download", finished=True))
+        session.commit()
+
+    db.close_session()