fix: set correct jobname

feat: extraction tracking

.github/workflows/server.yaml

@@ -28,7 +28,7 @@ jobs:
           username: ${{ secrets.REGISTRY_USER }}
           password: ${{ secrets.REGISTRY_PASS }}
       -
-        name: Build and push async-icinga image
+        name: Build and push gamevault server
         uses: docker/build-push-action@v3
         with:
           context: server

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")
@@ -389,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")

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)
 

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

@@ -41,27 +41,45 @@ def _download(url, path, auth):
 
         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:
@@ -100,8 +118,16 @@ 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()

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