fix: set correct jobname

feat: extraction tracking

.github/workflows/release.yaml

@@ -25,7 +25,13 @@ jobs:
           pip install -r requirements.txt
 
       - name: Build EXE
-        run: pyinstaller -F client.py
+        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
@@ -33,4 +39,5 @@ jobs:
       - name: Release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: gh release create ${{ github.ref_name }} "release.zip" --generate-notes --title "release-${{ github.ref_name }}"
+        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 gamevault server
+        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")
@@ -320,6 +322,8 @@ def update_button_positions(event=None):
 
 if __name__ == "__main__":
 
+    # run updater #
+
     pgw = pgwrapper.ProgressBarWrapper()
     pgw.new(app)
 
@@ -355,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
@@ -370,7 +375,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,
+            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,
@@ -385,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

@@ -4,6 +4,7 @@ import customtkinter
 import imagetools
 import os
 import statekeeper
+import localaction
 
 def show_large_picture(app, path):
     '''Show a full-window version of the clicked picture'''
@@ -159,7 +160,8 @@ def create_details_page(app, software, backswitch_function, infowidget_window):
     # install button #
     print(software.run_exe)
     print(os.path.join(software.backend.install_dir, software.run_exe or ""))
-    if not software.run_exe or not (os.path.isfile(software.run_exe) 
+    if not software.run_exe or not (os.path.isfile(software.run_exe)
+            or localaction.check_substitute_path_exists(software.run_exe)
             or os.path.isfile(os.path.join(software.backend.install_dir, software.title, software.run_exe))):
         run_button.configure(state=tkinter.DISABLED)
         run_button.configure(fg_color="gray")

data_backend.py

@@ -20,6 +20,7 @@ class DataBackend:
 
         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
@@ -92,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 = {}
@@ -165,7 +167,7 @@ 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 = 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"):
@@ -197,7 +199,7 @@ class HTTP(DataBackend):
 
             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:
@@ -220,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"]
@@ -273,4 +275,4 @@ class HTTP(DataBackend):
         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
+        return results_with_age

db.py

@@ -15,6 +15,7 @@ class Download(Base):
     local_path = Column(String)
     url = Column(String)
     size = Column(Integer)
+    count = Column(Integer) # extraction only
     type = Column(String)
     finished = Column(Boolean)
 

infowidget.py

@@ -86,7 +86,7 @@ class ProgressBarApp:
                 return
 
             try:
-                percent_filled = statekeeper.get_percent_filled(path)
+                percent_filled = statekeeper.get_percent_filled(path, self.data_backend.auth)
             except OSError as e:
                 fail_count += 1
                 if fail_count > 6:
@@ -143,4 +143,4 @@ class ProgressBarApp:
 
     def on_close(self):
         self.running = False
-        self.root.destroy()
+        self.root.destroy()

localaction.py

@@ -2,6 +2,8 @@ import subprocess
 import sys
 import os
 import json
+import win32com.client
+import pythoncom
 
 # windows imports #
 if os.name == "nt":
@@ -43,6 +45,19 @@ def resolve_lnk(lnk_file_path):
     else:
         return lnk_file_path # not required on linux
 
+def substitute_win_paths(path):
+
+    pythoncom.CoInitialize()  
+    shell = win32com.client.Dispatch("WScript.Shell")
+    common_programs = shell.SpecialFolders("AllUsersPrograms")
+    path = path.replace("%ProgramData%", common_programs)
+    return path
+
+def check_substitute_path_exists(path):
+
+    if "%" in path:
+        return os.path.isfile(substitute_win_paths(path))
+
 def run_exe(path, synchronous=False):
     '''Launches a given software'''
 
@@ -65,13 +80,23 @@ def run_exe(path, synchronous=False):
     if synchronous:
         raise NotImplementedError("SYNC not yet implemented")
 
+    print("Raw paths:", paths)
+
+    # substitute program data #
+    paths = [ substitute_win_paths(p) for p in paths ]
+
+    # substituted paths #
+    print("Subs paths:", paths)
+
+    # resolve links #
     paths = [resolve_lnk(p) if p.endswith(".lnk") else p for p in paths]
 
-    print("Executing:", paths)
+    print("Executing prepared:", paths)
 
     try:
         if paths[0].endswith(".reg"):
             raise OSError("WinError 740")
+        path = paths[0].replace("\\\\", "\\")
         subprocess.Popen(path, cwd=os.path.dirname(paths[0])) # TODO fix this BS
     except OSError as e:
         if "WinError 740" in str(e):

software.py

@@ -96,25 +96,27 @@ class Software:
 
         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))
+
+                    # update progress #
+                    statekeeper.set_extraction_status(cache_src, count)
+
+
                 except zipfile.error as e:
                     print(e)
                     pass # TODO ???
-            #zip_ref.extractall(software_path)
-
-        #self.progress_bar_wrapper.set_text(text="Loading..")
-        #self.progress_bar_wrapper.update()
+        
+        # finish extraction tracking #
+        statekeeper.log_end_download(cache_src, type="extraction")
 
     def install_async(self):
 
@@ -182,8 +184,10 @@ class Software:
                     s.install()
 
         # run installer if set #
+        print("self.installer", self.installer)
         if self.installer:
             installer_path = os.path.join(self.backend.install_dir,  self.title, self.installer)
+            print("installer path in if", installer_path)
             if os.name != "nt" and not os.path.isabs(installer_path):
                 # need abs path for wine #
                 installer_path = os.path.join(os.getcwd(), installer_path)
@@ -226,6 +230,9 @@ class Software:
 
         if self.run_exe:
             if os.name == "nt" or not ".lnk" in self.run_exe:
-                localaction.run_exe(os.path.join(self.backend.install_dir, self.title, self.run_exe))
+                if self.run_exe.startswith("%") or self.run_exe[1] == ":":
+                    localaction.run_exe(self.run_exe)
+                else:
+                    localaction.run_exe(os.path.join(self.backend.install_dir, self.title, self.run_exe))
             else:
                 localaction.run_exe(self.run_exe)

statekeeper.py

@@ -8,10 +8,10 @@ from sqlalchemy import or_, and_
 def _bytes_to_mb(size):
     return size / (1024*1024)
 
-def add_to_download_queue(url, path):
+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):
@@ -21,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:
@@ -41,27 +41,45 @@ def _download(url, path):
 
         raise AssertionError("Non-200 Response for:", url, path, response.status_code, response.text)
 
-def log_begin_download(path, local_path, url):
+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("Download path", path)
-    path_exists = session.query(Download).filter(and_(Download.path==path, Download.finished==False)).first()
+    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=-1, type="download", local_path=local_path, url=url, 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()
+    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(Download.path==path).first()
+    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:
@@ -72,7 +90,7 @@ def log_end_download(path):
 
     db.close_session()
 
-def get_download_size(path):
+def get_download_size(path, auth):
 
     session = db.session()
     obj = session.query(Download).filter(Download.path==path).first()
@@ -85,7 +103,7 @@ def get_download_size(path):
         return obj.size
 
     # query size #
-    r = requests.get(obj.url, params={"path": path, "info": 1})
+    r = requests.get(obj.url, params={"path": path, "info": 1}, auth=auth)
     r.raise_for_status()
     
     size = r.json()["size"]
@@ -96,14 +114,22 @@ def get_download_size(path):
 
     return size
 
-def get_percent_filled(path):
+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)
+    total_size = get_download_size(obj.path, auth)
     session.close()
 
     if total_size == 0:
@@ -122,4 +148,4 @@ def get_download(path=None):
         downloads = session.query(Download).filter(Download.finished==False).all()
 
     session.close()
-    return downloads
+    return downloads

todo.txt

@@ -1,7 +1,5 @@
 # important
 ## downloaded file hash sum check
-## apply custom tkinter look to pg window & move pg window to better relativ start location so it's no longer blocking the back button by default
-## zip extraction progress
 ## fix initial startup pictures not loading
 ## implement flush download cache button
 ## fix Call of duty installation chain

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()