fix: pywin32 version in requirements

.github/workflows/release.yaml

@@ -0,0 +1,36 @@
+name: Build and Release EXE
+
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  build:
+    runs-on: windows-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.11'
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install pyinstaller
+          pip install -r requirements.txt
+
+      - name: Build EXE
+        run: pyinstaller -F client.py
+
+      - name: Archive EXE
+        run: Compress-Archive -Path dist\ -DestinationPath release.zip
+
+      - name: Release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: gh release create ${{ github.ref_name }} "release.zip" --generate-notes --title "release-${{ github.ref_name }}"

client.py

@@ -34,6 +34,7 @@ db = None # app data-backend (i.e. LocalFS or FTP)
 
 CONFIG_FILE = "gamevault_config.json"
 
+
 def close_input_window(input_window):
     '''Close the config window and save the settings'''
 
@@ -188,15 +189,17 @@ def load_main():
     app.title("Lan Vault: Overview")
 
     if not infowidget_window:
-        infowidget_window = infowidget.ProgressBarApp(app)
+        infowidget_window = infowidget.ProgressBarApp(app, data_backend=db)
+
+    infowidget_window.root.grid(row=1, column=0, sticky="n")
 
     # navbar should not expand when window is resized
     app.grid_rowconfigure(0, weight=0)
     # buttongrid (scrollable frame) should expand when window is resized
     app.grid_rowconfigure(1, weight=1)
-    app.grid_columnconfigure(0, weight=1)
+    app.grid_columnconfigure(1, weight=1)
     # place scrollable frame
-    scrollable_frame.grid(row=1, column=0, sticky="nsew", columnspan=2)
+    scrollable_frame.grid(row=1, column=1, sticky="nsew", columnspan=2)
 
 
     # create tiles from meta files #
@@ -241,7 +244,7 @@ def load_details(app, software):
     global details_elements
 
     app.title("Lan Vault: {}".format(software.title))
-    details_elements = client_details.create_details_page(app, software, switch_to_main)
+    details_elements = client_details.create_details_page(app, software, switch_to_main, infowidget_window)
 
 def create_main_window_tile(software, parent):
     '''Create the main window tile'''
@@ -293,7 +296,7 @@ def update_button_positions(event=None):
         scrollable_frame.configure(width=app.winfo_width(), height=app.winfo_height())
 
     # Calculate the number of columns based on the current width of the window #
-    num_columns = app.winfo_width() // 201  # Adjust 100 as needed for button width
+    num_columns = app.winfo_width() // 301  # Adjust 100 as needed for button width
 
     # window became too small #
     if num_columns == 0:
@@ -311,7 +314,8 @@ def update_button_positions(event=None):
             continue
         else:
             DOWNSHIFT = 1 # FIXME make real navbar
-            button.grid(row=(i // num_columns)+ DOWNSHIFT, column=i % num_columns, sticky="we")
+            RIGHTSHIFT = 1 # first column for loading stuff
+            button.grid(row=(i // num_columns)+ DOWNSHIFT, column=i % num_columns + RIGHTSHIFT, sticky="we")
 
 
 if __name__ == "__main__":
@@ -337,6 +341,8 @@ if __name__ == "__main__":
         password = config_loaded.get("Password:")
         install_dir = config_loaded["Install dir:"]
         backend_type = config_loaded["Select option:"]
+        hide_above_age = config_loaded.get("hide_above_age") or 100
+
 
         # fix abs path if not set #
         if os.path.abspath(install_dir):
@@ -364,7 +370,8 @@ if __name__ == "__main__":
 
         # add db backend #
         if backend_type == "HTTP/HTTPS":
-            db = data_backend.HTTP(None, None, install_dir, remote_root_dir="./", server=server, progress_bar_wrapper=pgw, tkinter_root=app)
+            db = data_backend.HTTP(None, None, install_dir, remote_root_dir="./", server=server, progress_bar_wrapper=pgw,
+                                    tkinter_root=app, hide_above_age=hide_above_age)
         elif backend_type == "FTP/FTPS":
             db = data_backend.FTP(user, password, install_dir, server=server,
                 remote_root_dir=remote_root_dir, progress_bar_wrapper=pgw, tkinter_root=app)

client_details.py

@@ -25,9 +25,11 @@ def show_large_picture(app, path):
 
     large_image.place(x=30, y=30)
 
-def create_details_page(app, software, backswitch_function):
+def create_details_page(app, software, backswitch_function, infowidget_window):
     '''Create the details page for a software and return its elements for later destruction'''
 
+    infowidget_window.root.grid(row=1, column=0, sticky="n")
+
     elements = []
 
     if software.get_thumbnail():
@@ -42,7 +44,7 @@ def create_details_page(app, software, backswitch_function):
 
     # navbar #
     navbar = customtkinter.CTkFrame(app, fg_color="transparent")
-    navbar.grid(column=0, row=0, padx=10, pady=5, sticky="ew")
+    navbar.grid(column=1, row=0, padx=10, pady=5, sticky="ew")
 
     # back button
     back_button = customtkinter.CTkButton(navbar, text="Back", command=backswitch_function)
@@ -65,7 +67,7 @@ def create_details_page(app, software, backswitch_function):
     thumbnail_image = customtkinter.CTkButton(app, text="", image=img, width=500, height=700,
                     fg_color="transparent", hover_color="black", corner_radius=0,
                     command=lambda path=path: show_large_picture(app, path))
-    thumbnail_image.grid(column=0, row=1, padx=10)
+    thumbnail_image.grid(column=1, row=1, padx=10)
     elements.append(thumbnail_image)
 
     # fonts #
@@ -74,7 +76,7 @@ def create_details_page(app, software, backswitch_function):
 
     # info box #
     info_frame = customtkinter.CTkFrame(app, width=500)
-    info_frame.grid(column=1, row=1, sticky="nswe", padx=10)
+    info_frame.grid(column=2, row=1, sticky="nswe", padx=10)
     elements.append(info_frame)
 
     # title #

data_backend.py

@@ -16,7 +16,7 @@ class DataBackend:
         os.makedirs(cache_dir, exist_ok=True)
 
     def __init__(self, user, password, install_dir, server=None, remote_root_dir=None,
-                    progress_bar_wrapper=None, tkinter_root=None):
+                    progress_bar_wrapper=None, tkinter_root=None, hide_above_age=100):
 
         self.user = user
         self.password = password
@@ -26,6 +26,7 @@ class DataBackend:
         self.progress_bar_wrapper = progress_bar_wrapper
         self.root = tkinter_root
         self.cache_dir = "./cache/"
+        self.hide_above_age = hide_above_age
 
     def get(self, path, return_content=False):
         '''Return the contents of this path'''
@@ -112,6 +113,12 @@ class HTTP(DataBackend):
         print("Local Target is", local_file)
         return local_file
     
+    def local_delete_cache_file(self, path, cache_dir=None):
+        '''Delete a local cache file'''
+
+        print("WARNING: removing:", self.get_local_target(path))
+        os.remove(self.get_local_target(path))
+
     def get(self, path, cache_dir=None, return_content=False, wait=False):
 
         print("Getting", path, "cache dir", cache_dir, "return content:", return_content)
@@ -146,6 +153,7 @@ class HTTP(DataBackend):
 
             if return_content or wait:
 
+                print("Sync Requested")
                 # the content is needed for the UI now and not cached, it's needs to be downloaded synchroniously #
                 # as there cannot be a meaningful UI-draw without it. #
                 # THIS IS THE OLD WAY
@@ -158,11 +166,28 @@ class HTTP(DataBackend):
                 # this is with streaming
                 chunk_size = 1024 * 1024  * 5 # 5MB
                 r = requests.get(self._get_url(), params={"path": path, "as_string": True}, stream=True)
+                r.raise_for_status()
 
-                with open(local_file, "wb") as f:
+                if path.endswith(".txt"):
+                    TYPE = "w"
+                else:
+                    TYPE = "wb"
+
+                with open(local_file, TYPE) as f:
+                    count = 0
                     for chunk in r.iter_content(chunk_size=chunk_size, decode_unicode=True):
+                        
+                        print(f"Doing chunk.. {chunk_size*count}")
                         if chunk:
-                            f.write(chunk)
+                            
+                            try:
+                                f.write(chunk)
+                            except TypeError as e:
+                                print("Cannot write:", chunk, "..to ", path, " because it is the wrong type.", e)
+                                raise e
+                            f.flush()
+
+                        count += 1
 
                 if return_content:                    
                     print("Content for", path, ":",  r.text)
@@ -240,4 +265,12 @@ class HTTP(DataBackend):
         print("Software List:", software_list)
         print("Invalid:", list(filter(lambda x: x.invalid, software_list)))
         print("Valid:", list(filter(lambda x: not x.invalid, software_list)))
-        return list(filter(lambda x: not x.invalid, software_list))
+
+        # filter valid #
+        results_valid = list(filter(lambda x: not x.invalid, software_list))
+
+        # filer age #
+        print("Age limit set to", self.hide_above_age, "games have", [x.age_limit for x in software_list])
+        results_with_age = list(filter(lambda x: x.age_limit <= self.hide_above_age, results_valid))
+
+        return results_with_age

db.py

@@ -4,6 +4,9 @@ from sqlalchemy.orm import sessionmaker, scoped_session
 
 Base = declarative_base()
 
+import logging
+logging.basicConfig()
+logging.getLogger('sqlalchemy').setLevel(logging.ERROR)
 class Download(Base):
 
     __tablename__ = 'files'
@@ -24,7 +27,8 @@ class Download(Base):
 class Database:
 
     def __init__(self, db_url="sqlite:///database.db"):
-        self.engine = create_engine(db_url, echo=True)
+
+        self.engine = create_engine(db_url, echo=False)
         self.session_factory = sessionmaker(bind=self.engine)
         self.Session = scoped_session(self.session_factory)  # Thread-safe sessions
 

infowidget.py

@@ -8,7 +8,7 @@
 # update list and widget
 
 # update list and widget
-import tkinter as tk
+import customtkinter as ctk
 from tkinter import ttk
 import threading
 import random
@@ -18,58 +18,70 @@ import statekeeper
 import os
 
 class ProgressBarApp:
-    def __init__(self, parent):
+    def __init__(self, parent, data_backend):
 
-        self.root = tk.Toplevel(parent)
-        self.root.title("Dynamic Progress Bars")
+        self.data_backend = data_backend
+        self.parent = parent
+        self.root = ctk.CTkFrame(parent)
+        #self.root.title("Dynamic Progress Bars")
 
-        self.delete_all_button = tk.Button(self.root, text="Delete All Finished", command=self.delete_all_finished, state=tk.DISABLED)
+        self.delete_all_button = ctk.CTkLabel(self.root, text="Downloads")
         self.delete_all_button.pack(pady=5)
 
-        self.frame = tk.Frame(self.root)
+        self.delete_all_button = ctk.CTkButton(self.root, text="Delete All Finished", command=self.delete_all_finished, state=ctk.DISABLED)
+        self.delete_all_button.pack(pady=5)
+
+        self.frame = ctk.CTkFrame(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()
+        self.root.after(0, self.start_tracking_progress_bars)
 
-    def add_progress_bars(self):
+    def start_tracking_progress_bars(self):
 
-        already_tracked = set()
-        while self.running:
+        self.already_tracked = set()
+        self.check_for_new_progress_bars()
 
-            downloads = set(statekeeper.get_download())
-            new = downloads - already_tracked
-            already_tracked |= set(downloads)
+    def check_for_new_progress_bars(self):
 
-            for element in new:
+        downloads = set(statekeeper.get_download())
+        new = downloads - self.already_tracked
+        self.already_tracked |= downloads
 
-                frame = tk.Frame(self.frame)
-                frame.pack(fill=tk.X, pady=2)
+        for element in new:
+            frame = ctk.CTkFrame(self.frame)
+            frame.pack(fill=ctk.X, pady=2)
 
-                progress = ttk.Progressbar(frame, length=200, mode='determinate')
-                progress.pack(side=tk.LEFT, padx=5)
+            progress = ttk.Progressbar(frame, length=200, mode='determinate')
+            progress.pack(side=ctk.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)
+            delete_button = ctk.CTkButton(frame, text="Delete", command=lambda f=frame: self.delete_progress(f), state=ctk.DISABLED)
+            delete_button.pack(side=ctk.LEFT, padx=5)
 
-                label = tk.Label(frame, text=os.path.basename(element.path))
-                label.pack(side=tk.LEFT, padx=5)
+            label = ctk.CTkLabel(frame, text=os.path.basename(element.path))
+            label.pack(side=ctk.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)
+            self.progress_bars.insert(0, (progress, frame, delete_button))  # Insert at the top
+            frame.pack(fill=ctk.X, pady=2, before=self.frame.winfo_children()[-1] if self.frame.winfo_children() else None)
 
-                print("Starting tracker for", element.path)
-                threading.Thread(target=self.fill_progress, args=(progress, element.path, frame, delete_button), daemon=True).start()
+            print("Starting tracker for", element.path)
+            threading.Thread(target=self.fill_progress, args=(progress, element.path, frame, delete_button), daemon=True).start()
 
-            time.sleep(2)  # Wait before adding a new progress bar
+        # Schedule the next check in 2 seconds
+        if self.running:
+            self.root.after(2000, self.check_for_new_progress_bars)
 
     def fill_progress(self, progress, path, frame, delete_button):
 
         fail_count = 0
+        same_size_count = 0
+        prev_precent = 0
         while True:
 
+            print("Checking download progress..")
+
             if not progress.winfo_exists():  # Check if progress bar still exists
                 return
 
@@ -84,21 +96,37 @@ class ProgressBarApp:
                     continue
 
             print("Percent filled:", percent_filled, path)
-            if not percent_filled or percent_filled >= 99.9:
-                self.root.after(0, progress.config, { "value" : 100 })
+            if percent_filled >= 99.9:
+                self.root.after(0, progress.configure, { "value" : 100 })
+                print("Finished", path)
                 break
             else:
-                self.root.after(0, progress.config, { "value" : percent_filled })                
+                self.root.after(0, progress.configure, { "value" : percent_filled })                
                 time.sleep(0.5)
 
+            # check for stuck downloads #
+            print("same size count", same_size_count)
+            if prev_precent == percent_filled:
+                same_size_count += 1
+            else:
+                same_size_count = 0
+            if same_size_count > 100:
+                self.root.after(0, delete_button.configure, {"state": ctk.NORMAL, "text": "Failed - Delete file manually!"})
+                self.progress_bars.append((progress, frame, path, delete_button))
+                self.update_delete_all_button()
+                statekeeper.log_end_download(path)
+                self.data_backend.local_delete_cache_file(path)
+                break
+            prev_precent = percent_filled
+
         # handle finished download #
-        self.root.after(0, delete_button.config, {"state": tk.NORMAL})
+        self.root.after(0, delete_button.configure, {"state": ctk.NORMAL})
         self.progress_bars.append((progress, frame, path, delete_button))
         self.update_delete_all_button()
 
     def delete_progress(self, frame):
         frame.destroy()
-        self.progress_bars = [(p, f, d, b) for p, f, d, b in self.progress_bars if f != frame]
+        self.progress_bars = [(p, f, d) for p, f, d in self.progress_bars if f != frame]
         self.update_delete_all_button()
 
     def delete_all_finished(self):
@@ -109,9 +137,9 @@ class ProgressBarApp:
 
     def update_delete_all_button(self):
         if self.progress_bars:
-            self.delete_all_button.config(state=tk.NORMAL)
+            self.delete_all_button.configure(state=ctk.NORMAL)
         else:
-            self.delete_all_button.config(state=tk.DISABLED)
+            self.delete_all_button.configure(state=ctk.DISABLED)
 
     def on_close(self):
         self.running = False

jinja_helper.py

@@ -11,6 +11,7 @@ def render_path(path, install_location, game_directory,):
     result_path = path[:-len(".j2")]
 
     # prepare template #
+    print("JINJA-> cwd: ", os.getcwd(), "path:", path)
     input_content = ""
     with open(path, encoding="utf-16") as f:
         input_content = f.read()

requirements.txt

@@ -4,4 +4,4 @@ customtkinter
 tqdm
 Jinja2
 pyyaml
-pywin32==<version>; platform_system=="Windows"
+pywin32==306; platform_system=="Windows"

software.py

@@ -12,6 +12,7 @@ import threading
 import sys
 import tkinter
 import statekeeper
+from tkinter import messagebox
 
 class Software:
 
@@ -58,6 +59,7 @@ class Software:
         self.run_exe = meta.get("run_exe")
         self.installer = meta.get("installer")
         self.installer_no_admin = meta.get("installer_no_admin")
+        self.age_limit = meta.get("age_limit") or 20
 
         self.pictures = [ self.backend.get(pp, self.cache_dir) for pp in
                 self.backend.list(os.path.join(self.directory, "pictures"), fullpaths=True) ]
@@ -82,8 +84,16 @@ class Software:
         '''Extract a cached, downloaded zip to the target location'''
 
         software_path = os.path.join(target, self.title)
+
         if os.path.isdir(software_path):
-            return # TODO better skip
+            overwrite = messagebox.askyesno(
+                "Overwrite Existing Directory",
+                f"The directory '{software_path}' already exists.\nDo you want to overwrite it?"
+            )
+            if not overwrite:
+                print("Skipping install as instructed by user...")
+                return
+
         os.makedirs(software_path, exist_ok=True)
 
         with zipfile.ZipFile(cache_src, 'r') as zip_ref:
@@ -99,6 +109,7 @@ class Software:
                     #self.progress_bar_wrapper.set_text(
                     #                text="Extracting: {:.2f}%".format(count/len(total_count)*100))
                 except zipfile.error as e:
+                    print(e)
                     pass # TODO ???
             #zip_ref.extractall(software_path)
 
@@ -137,18 +148,22 @@ class Software:
         local_file = self.backend.get(remote_file, self.cache_dir, wait=True)
         statekeeper.log_end_download(remote_file)
 
+        print("Deciding on installer...")
+
         # execute or unpack #
         if local_file.endswith(".exe"):
+            print("Target is an executable.. running as installer.")
             if os.name != "nt" and not os.path.isabs(local_file):
                 # need abs path for wine #
                 local_file = os.path.join(os.getcwd(), local_file)
             localaction.run_exe(local_file)
         elif local_file.endswith(".zip"):
+            print("Target is a zip.. unpacking first.")
             self._extract_to_target(local_file, self.backend.install_dir)
 
         # download & install registry files #
         for rf in self.reg_files:
-            path = self.backend.get(rf, cache_dir=self.cache_dir)
+            path = self.backend.get(rf, cache_dir=self.cache_dir, wait=True)
             if path.endswith(".j2"):
                 target_install_dir = os.path.join(self.backend.install_dir, self.title)
                 print("Install dir Registry:", target_install_dir)

statekeeper.py

@@ -44,9 +44,9 @@ def _download(url, path):
 def log_begin_download(path, local_path, url):
 
     session = db.session()
-    print("Current path", path)
+    print("Download path", path)
     path_exists = session.query(Download).filter(and_(Download.path==path, Download.finished==False)).first()
-    if path_exists:
+    if path_exists and False: # TODO FIX THIS
         print("DAFUG", path_exists)
         print("WTF", path_exists.path)
         raise AssertionError("ERROR: {} is already downloading.".format(path))
@@ -59,6 +59,7 @@ def log_begin_download(path, local_path, url):
 
 def log_end_download(path):
 
+    print("Downlod end logged", path)
     session = db.session()
     obj = session.query(Download).filter(Download.path==path).first()
     if not obj:
@@ -99,11 +100,16 @@ def get_percent_filled(path):
 
     session = db.session()
     obj = session.query(Download).filter(Download.path==path, Download.finished==False).first()
+    if not obj:
+        return 100 # means its finished
     size = _bytes_to_mb(os.stat(obj.local_path).st_size)
     total_size = get_download_size(obj.path)
     session.close()
+
     if total_size == 0:
         return 0
+    
+    print("Current filled:", size / total_size * 100)
     return size / total_size * 100
 
 def get_download(path=None):