fix: update todo infowidget theme & zip extraction

.github/workflows/release.yaml

@@ -0,0 +1,43 @@
+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 client.py
+
+      - name: Copy helper scripts
+        run: |
+          cp .\dist\run.bat .\dist\client\
+          cp .\dist\run.ps1 .\dist\client\
+          cp .\windows_run_as_admin.ps1 .\dist\client\
+
+      - 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 }}"
+

.github/workflows/server.yaml

@@ -0,0 +1,37 @@
+name: ci
+
+on:
+  push:
+    branches:
+      - "master"
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    environment:
+        name: prod
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v3
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      -
+        name: Login to Docker Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ secrets.REGISTRY }}
+          username: ${{ secrets.REGISTRY_USER }}
+          password: ${{ secrets.REGISTRY_PASS }}
+      -
+        name: Build and push async-icinga image
+        uses: docker/build-push-action@v3
+        with:
+          context: server
+          platforms: linux/amd64
+          push: true
+          tags: "${{ secrets.REGISTRY }}/atlantishq/gamevault-server:latest"

check_release.py

@@ -0,0 +1,31 @@
+import requests
+import os
+
+REPO = "FAUSheppy/homelab_gamevault"
+API_URL = f"https://api.github.com/repos/{REPO}/releases/latest"
+VERSION_FILE = ".gamevault_version"
+
+def get_latest_release():
+    response = requests.get(API_URL)
+    response.raise_for_status()
+    data = response.json()
+    version = data['tag_name']
+    zip_url = data['zipball_url']
+    return version, zip_url
+
+
+def read_local_version():
+    if not os.path.exists(VERSION_FILE):
+        return None
+    with open(VERSION_FILE, 'r') as f:
+        return f.read().strip()
+
+def update_updater():
+    pass # TODO
+    # download updater
+    # replace updater
+
+def execute_updater(new_version):
+    # TODO
+    # os.system(["updater.exe", new_version])
+    pass

client.py

@@ -11,6 +11,8 @@ import imagetools
 import webbrowser
 import statekeeper
 import infowidget
+import requests
+import tkinter
 
 customtkinter.set_appearance_mode("dark")
 customtkinter.set_default_color_theme("blue")
@@ -34,6 +36,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 +191,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 +246,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 +298,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,11 +316,14 @@ 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__":
 
+    # run updater #
+
     pgw = pgwrapper.ProgressBarWrapper()
     pgw.new(app)
 
@@ -337,6 +345,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):
@@ -349,10 +359,11 @@ if __name__ == "__main__":
         elif backend_type == "HTTP/HTTPS":
             server = config_loaded["Server/Path:"]
             remote_root_dir = None
-            if not server.startswith("http://") or "https://":
+            if not any(server.startswith(s) for s in ["http://", "https://"]):
                 server = "http://" + server
-            if not ":" in server.split("://")[1]:
-                server = server + ":5000"
+            #if not ":" in server.split("://")[1]:
+            #    server = server + ":5000"
+            print(server)
         elif backend_type == "Local Filesystem":
             remote_root_dir = config_loaded["Server/Path:"]
             server = None
@@ -364,7 +375,9 @@ 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(user, password, 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)
@@ -378,5 +391,9 @@ if __name__ == "__main__":
     app.update()
 
     # fill and run app #
-    load_main() # TODO add button to reopen config # TODO add button to purge cache/purge cache window # TODO show game size on remote
+    try:
+        load_main() # TODO add button to reopen config # TODO add button to purge cache/purge cache window # TODO show game size on remote
+    except requests.exceptions.ConnectionError as e:
+        app.withdraw()
+        tkinter.messagebox.showerror("There was a connection problem", str(e))
     app.mainloop()

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,16 +16,18 @@ 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
+        self.auth = (self.user, self.password)
         self.remote_root_dir = remote_root_dir
         self.server = server
         self.install_dir = install_dir
         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'''
@@ -91,6 +93,7 @@ class LocalFS(DataBackend):
                 meta_info_list.append(software.Software(meta_file, self, self.progress_bar_wrapper))
 
         return list(filter(lambda x: not x.invalid, meta_info_list))
+
 class HTTP(DataBackend):
 
     paths_listed = {}
@@ -99,20 +102,8 @@ class HTTP(DataBackend):
     def _get_url(self):
         #print(self.server + HTTP.REMOTE_PATH)
         return self.server + HTTP.REMOTE_PATH
-
-    def get(self, path, cache_dir="", return_content=False, wait=False):
-
-        print("Getting", path, "cache dir", cache_dir, "return content:", return_content)
-
-        if cache_dir is None:
-            print("Setting cache dir from backend default", "cur:", cache_dir, "new (default):", self.cache_dir)
-            cache_dir = self.cache_dir
-
-        # check the load cache dir #
-        if cache_dir:
-            self._create_cache_dir(cache_dir)
-        elif not cache_dir and not return_content:
-            AssertionError("Need to set either cache_dir or return_content!")
+ 
+    def get_local_target(self, path):
 
         # prepend root dir if not given #
         fullpath = path
@@ -120,7 +111,36 @@ class HTTP(DataBackend):
             fullpath = os.path.join(self.remote_root_dir, path)
 
         fullpath = fullpath.replace("\\", "/")
-        local_file = os.path.join(cache_dir, fullpath)
+        local_file = os.path.join(self.cache_dir, fullpath)
+        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)
+
+        if cache_dir is None:
+            print("Setting cache dir from backend default", "cur:", cache_dir, "new (default):", self.cache_dir)
+            cache_dir = self.cache_dir
+
+        # fix cache path reuse #
+        if path.startswith(cache_dir):
+            path = path[len(cache_dir):]
+            print("Fixed path to not duble include cache dir, path:", path)
+
+        # check the load cache dir #
+        if cache_dir:
+            self._create_cache_dir(cache_dir)
+        elif not cache_dir and not return_content:
+            AssertionError("Need to set either cache_dir or return_content!")
+
+        local_file = self.get_local_target(path)
         local_dir = os.path.dirname(local_file)
 
         # sanity check and create directory #
@@ -129,29 +149,57 @@ class HTTP(DataBackend):
         else:
             os.makedirs(local_dir, exist_ok=True)
 
-        print("Requiring:", fullpath)
+        print("Requiring:", path)
 
         if not os.path.isfile(local_file) or os.stat(local_file).st_size == 0:
 
             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. #
-                r = requests.get(self._get_url(), params={ "path" : path, "as_string": True })
+                # THIS IS THE OLD WAY
+                # r = requests.get(self._get_url(), params={ "path" : path, "as_string": True })
 
-                # cache the download imediatelly #
-                with open(local_file, encoding="utf-8", mode="w") as f:
-                    f.write(r.text)
+                # # cache the download imediatelly #
+                # with open(local_file, encoding="utf-8", mode="w") as f:
+                #     f.write(r.text)
+
+                # this is with streaming
+                chunk_size = 1024 * 1024  * 5 # 5MB
+                r = requests.get(self._get_url(), params={"path": path, "as_string": True}, stream=True, auth=(self.user, self.password))
+                r.raise_for_status()
+
+                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:
+                            
+                            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", fullpath, ":",  r.text)
+                    print("Content for", path, ":",  r.text)
                     return r.text
                 else:
                     return local_file
 
             else:
                 print("Async Requested for:", local_file)
-                statekeeper.add_to_download_queue(self._get_url(), path)
+                statekeeper.add_to_download_queue(self._get_url(), path, auth=(self.user, self.password))
                 return local_file
 
         elif return_content:
@@ -174,7 +222,7 @@ class HTTP(DataBackend):
             paths = self.paths_listed[fullpath]
         else:
 
-            r = requests.get(self._get_url(), params={ "path" : path })
+            r = requests.get(self._get_url(), params={ "path" : path }, auth=(self.user, self.password))
             r.raise_for_status()
             #print(r, r.status_code, r.content)
             paths = r.json()["contents"]
@@ -219,4 +267,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,18 +4,32 @@ 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'
 
     path = Column(String, primary_key=True)
+    local_path = Column(String)
+    url = Column(String)
     size = Column(Integer)
+    count = Column(Integer) # extraction only
     type = Column(String)
     finished = Column(Boolean)
 
+    def __eq__(self, other):
+        return self.path == other.path
+    
+    def __hash__(self):
+        return hash(self.path)
+
 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,69 +8,125 @@
 # update list and widget
 
 # update list and widget
-import tkinter as tk
+import customtkinter as ctk
 from tkinter import ttk
 import threading
 import random
 import time
 import string
+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):
-        while self.running:
+    def start_tracking_progress_bars(self):
 
-            frame = tk.Frame(self.frame)
-            frame.pack(fill=tk.X, pady=2)
+        self.already_tracked = set()
+        self.check_for_new_progress_bars()
+
+    def check_for_new_progress_bars(self):
+
+        downloads = set(statekeeper.get_download())
+        new = downloads - self.already_tracked
+        self.already_tracked |= downloads
+
+        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.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)
 
-            random_letter = random.choice(string.ascii_uppercase)
-            label = tk.Label(frame, text=random_letter)
-            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)
+            frame.pack(fill=ctk.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()
+            print("Starting tracker for", element.path)
+            threading.Thread(target=self.fill_progress, args=(progress, element.path, frame, delete_button), daemon=True).start()
 
-            time.sleep(30)  # 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..")
 
-    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})
+            try:
+                percent_filled = statekeeper.get_percent_filled(path, self.data_backend.auth)
+            except OSError as e:
+                fail_count += 1
+                if fail_count > 6:
+                    raise e
+                else:
+                    time.sleep(1)
+                    continue
 
-        self.progress_bars.append((progress, frame, duration, delete_button))
+            print("Percent filled:", percent_filled, path)
+            if percent_filled >= 99.9:
+                self.root.after(0, progress.configure, { "value" : 100 })
+                print("Finished", path)
+                break
+            else:
+                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.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):
@@ -81,10 +137,10 @@ 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
-        self.root.destroy()
+        self.root.destroy()

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,6 @@ customtkinter
 tqdm
 Jinja2
 pyyaml
-pywin32==<version>; platform_system=="Windows"
+pywin32==306; platform_system=="Windows"
+requests
+sqlalchemy

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,28 +84,39 @@ 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)
 
+        # beginn progress tracking #
         with zipfile.ZipFile(cache_src, 'r') as zip_ref:
 
+            statekeeper.log_begin_download(local_path=cache_src, path=cache_src, url=None, type="extraction", start_size=len(zip_ref.infolist()))
             total_count = zip_ref.infolist()
             count = 0
             for member in tqdm.tqdm(total_count, desc='Extracting '):
                 try:
                     zip_ref.extract(member, software_path)
                     count += 1
-                    #self.progress_bar_wrapper.get_pb().set(count/len(total_count))
-                    #self.progress_bar_wrapper.get_pb().update_idletasks()
-                    #self.progress_bar_wrapper.set_text(
-                    #                text="Extracting: {:.2f}%".format(count/len(total_count)*100))
-                except zipfile.error as e:
-                    pass # TODO ???
-            #zip_ref.extractall(software_path)
 
-        #self.progress_bar_wrapper.set_text(text="Loading..")
-        #self.progress_bar_wrapper.update()
+                    # update progress #
+                    statekeeper.set_extraction_status(cache_src, count)
+
+
+                except zipfile.error as e:
+                    print(e)
+                    pass # TODO ???
+        
+        # finish extraction tracking #
+        statekeeper.log_end_download(cache_src, type="extraction")
 
     def install_async(self):
 
@@ -133,22 +146,26 @@ class Software:
             print("No main_dir:", path)
             raise AssertionError("No main_dir for this software")
         
-        statekeeper.log_begin_download(remote_file)
+        statekeeper.log_begin_download(remote_file, self.backend.get_local_target(remote_file), self.backend._get_url())
         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

@@ -5,10 +5,13 @@ import threading
 from db import db, Download
 from sqlalchemy import or_, and_
 
-def add_to_download_queue(url, path):
+def _bytes_to_mb(size):
+    return size / (1024*1024)
+
+def add_to_download_queue(url, path, auth):
     '''The download is added to the global queue and downloaded eventually'''
     #_download(url, path)
-    thread = threading.Thread(target=_download, args=(url, path))
+    thread = threading.Thread(target=_download, args=(url, path, auth))
     thread.start()
 
 def add_to_task_queue(task):
@@ -18,9 +21,9 @@ def add_to_task_queue(task):
     thread.start()
     #task()
 
-def _download(url, path):
+def _download(url, path, auth):
 
-    response = requests.get(url + "?path=" + path, stream=True)
+    response = requests.get(url + "?path=" + path, stream=True, auth=auth)
 
     # Check if the request was successful
     if response.status_code == 200:
@@ -38,31 +41,111 @@ def _download(url, path):
 
         raise AssertionError("Non-200 Response for:", url, path, response.status_code, response.text)
 
-def log_begin_download(path):
+def log_begin_download(path, local_path, url, type="download", start_size=-1):
 
+    if type == "extraction":
+        print("Extraction path:", path)
+    else:
+        print("Download path", 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:
+    path_exists = session.query(Download).filter(and_(Download.path==path, Download.finished==False, Download.type==type)).first()
+
+    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))
     else:
         print("Adding to download log:", path)
-        session.merge(Download(path=path, size=0, type="download", finished=False))
+        session.merge(Download(path=path, size=start_size, type=type, local_path=local_path, url=url, finished=False, count=1))
         session.commit()
 
     db.close_session()
 
-def log_end_download(path):
+def set_extraction_status(path, count):
 
     session = db.session()
-    path_exists = session.query(Download).filter(Download.path==path).first()
-    if not path_exists:
+    obj = session.query(Download).filter(and_(Download.path==path, Download.type=="extraction")).first()
+    if not obj:
+        print("ERROR: {} is not currently extraction, cannot set status.".format(path))
+    else:
+        obj.count = count
+        session.merge(obj)
+        session.commit()
+
+    db.close_session()
+
+def log_end_download(path, type="download"):
+
+    print("Downlod end logged", path)
+    session = db.session()
+    obj = session.query(Download).filter(and_(Download.path==path, Download.type==type)).first()
+    if not obj:
         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))
+        obj.finished = True
+        session.merge(obj)
         session.commit()
 
-    db.close_session()
+    db.close_session()
+
+def get_download_size(path, auth):
+
+    session = db.session()
+    obj = session.query(Download).filter(Download.path==path).first()
+
+    if not obj :
+        print("Warning: Download-Object does no longe exist in DB. Returning -1")
+        return -1
+    elif obj.size != -1:
+        session.close()
+        return obj.size
+
+    # query size #
+    r = requests.get(obj.url, params={"path": path, "info": 1}, auth=auth)
+    r.raise_for_status()
+    
+    size = r.json()["size"]
+    obj.size = _bytes_to_mb(size)
+    session.merge(obj)
+    session.commit()
+    session.close()
+
+    return size
+
+def get_percent_filled(path, auth):
+
+    session = db.session()
+    obj = session.query(Download).filter(Download.path==path, Download.finished==False).first()
+    
+    if not obj:
+        return 100
+
+    if obj.type == "extraction":
+        return obj.count / obj.size * 100
+
+    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, auth)
+    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):
+
+    session = db.session()
+    if path:
+        MIN_SIZE_PGBAR_LIMIT = 1024*1024*100 # 100mb
+        downloads = session.query(Download).filter(Download.size>MIN_SIZE_PGBAR_LIMIT, Download.finished==False).all()
+    else:
+        downloads = session.query(Download).filter(Download.finished==False).all()
+
+    session.close()
+    return downloads

todo.txt

@@ -0,0 +1,12 @@
+# important
+## downloaded file hash sum check
+## fix initial startup pictures not loading
+## implement flush download cache button
+## fix Call of duty installation chain
+## test on fresh windows
+## prepare bf2
+
+nice to have
+# implement full remove
+# player name templating (e.g. in regex or game file folder)
+# oauth login server

updater/requirements.txt

@@ -0,0 +1,2 @@
+tkinter
+requests

updater/updater.py

@@ -0,0 +1,51 @@
+import os
+import requests
+import zipfile
+import io
+import shutil
+import tkinter as tk
+
+
+CLIENT_DIR = os.path.join("client")
+INTERNAL_DIR = os.path.join(CLIENT_DIR, "_internal")
+
+def prompt_user(version):
+    root = tk.Tk()
+    root.withdraw()  # Hide main window
+    result = tk.messagebox.askyesno("Update Available", f"New version {version} available. Download and install?")
+    root.destroy()
+    return result
+
+def download_and_extract(zip_url):
+    print("Downloading...")
+    response = requests.get(zip_url)
+    response.raise_for_status()
+    with zipfile.ZipFile(io.BytesIO(response.content)) as z:
+        temp_dir = "_temp_extracted"
+        z.extractall(temp_dir)
+        top_folder = next(os.scandir(temp_dir)).path
+
+        # Replace _internal
+        source_internal = os.path.join(top_folder, "client", "_internal")
+        if os.path.exists(INTERNAL_DIR):
+            shutil.rmtree(INTERNAL_DIR)
+        shutil.copytree(source_internal, INTERNAL_DIR)
+
+        # Replace client.exe
+        source_exe = os.path.join(top_folder, "client", "client.exe")
+        target_exe = os.path.join(CLIENT_DIR, "client.exe")
+        shutil.copy2(source_exe, target_exe)
+
+        shutil.rmtree(temp_dir)
+    print("Update complete.")
+
+
+def main():
+
+
+    if prompt_user():
+        download_and_extract()
+    # TODO: run main file again
+
+if __name__ == '__main__':
+    main()