feat: implement configuration for http backend

..currently all callbacks are executed non-async for testing
..they may be bugs with async downloads not correctly being waited for
..there may be problems with binding changing variables correctly

.gitignore

@@ -6,7 +6,12 @@ cache/
 install/
 *.json
 install-dir/
-
 *.spec
 *.exe
 dist/
+%APPDATA%/
+example_software_root/
+
+# windows dir on linux ä
+**\\install-dir/
+server/data/

README.md

@@ -1,8 +1,18 @@
 # Example Game
 You can download the GNU GPL Licensed game "FreeDink" from [here](https://nextcloud.atlantishq.de/s/9T62K9WjpEt3AQ7) and put it into `example_software_root/FreeDink/main_dir" to test it out.
 
-# TODO
-- check local cache before loading from remote
-- better image resizing, prevent stretching etc.
-- async load from remote, currently the who GUI blocks during the loading process
-- unpacking progress
+# Linux
+
+    sudo mkdir -pm755 /etc/apt/keyrings
+    sudo wget -O /etc/apt/keyrings/winehq-archive.key https://dl.winehq.org/wine-builds/winehq.key
+    chmod a+r /etc/apt/keyrings/*
+    sudo wget -NP /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/debian/dists/bullseye/winehq-bullseye.sources\n
+    sudo apt update
+    sudo dpkg --add-architecture i386 \n
+    sudo apt install --install-recommends winehq-staging
+    sudo apt install libgl1:i386 nvidia-driver-libs:i386
+    sudo apt install python3 python3-pip python3-tk
+
+    # non sudo in project #
+    python -m pip install -r requirements.txt
+    python client.py

client.py

@@ -8,6 +8,8 @@ import json
 import os
 import cache_utils
 import imagetools
+import webbrowser
+import statekeeper
 
 customtkinter.set_appearance_mode("dark")
 customtkinter.set_default_color_theme("blue")
@@ -17,10 +19,13 @@ app = customtkinter.CTk()
 app.geometry("1490x700")
 last_geometry = app.winfo_geometry()
 
+scrollable_frame = customtkinter.CTkScrollableFrame(app, width=app.winfo_width(), height=app.winfo_height())
+
 buttons = []
 details_elements = []
 
 non_disabled_entry_color = None
+all_metadata = None
 
 db = None # app data-backend (i.e. LocalFS or FTP)
 
@@ -66,6 +71,14 @@ def dropdown_changed(dropdown_var, user_entry, password_entry, server_path_entry
         user_entry.configure(fg_color="#CCCCCC")
         server_path_entry.delete(0, customtkinter.END)
         server_path_entry.insert(0, "C:/path/to/game/mount/")
+    elif dropdown_var == "FTP/FTPS":
+        user_entry.configure(state=customtkinter.NORMAL)
+        password_entry.configure(state=customtkinter.NORMAL)
+        if non_disabled_entry_color: # else first run and nothing to do
+            password_entry.configure(fg_color=non_disabled_entry_color)
+            user_entry.configure(fg_color=non_disabled_entry_color)
+        server_path_entry.delete(0, customtkinter.END)
+        server_path_entry.insert(0, "ftp://server:port/path or ftps://server:port/path")
     else:
         user_entry.configure(state=customtkinter.NORMAL)
         password_entry.configure(state=customtkinter.NORMAL)
@@ -73,7 +86,7 @@ def dropdown_changed(dropdown_var, user_entry, password_entry, server_path_entry
             password_entry.configure(fg_color=non_disabled_entry_color)
             user_entry.configure(fg_color=non_disabled_entry_color)
         server_path_entry.delete(0, customtkinter.END)
-        server_path_entry.insert(0, "ftp://server/path::port or ftps://server/path:port")
+
 
     install_dir_entry.delete(0, customtkinter.END)
     install_dir_entry.insert(0, "./install-dir")
@@ -112,10 +125,10 @@ def get_config_inputs():
     install_dir_entry.grid(row=4, column=1, padx=10, pady=5, sticky="ew", columnspan=2)
 
     # Dropdown
-    dropdown_var = customtkinter.StringVar(value="Local Filesystem")
+    dropdown_var = customtkinter.StringVar(value="HTTP/HTTPS")
     dropdown_label = customtkinter.CTkLabel(input_window, text="Select option:")
     dropdown_label.grid(row=0, column=0, sticky="w", padx=10, pady=5)
-    dropdown = customtkinter.CTkOptionMenu(input_window, variable=dropdown_var, values=["FTP/FTPS", "Local Filesystem"],
+    dropdown = customtkinter.CTkOptionMenu(input_window, variable=dropdown_var, values=["HTTP/HTTPS", "FTP/FTPS", "Local Filesystem"],
         command=lambda dropdown_var=dropdown_var, user_entry=user_entry, password_entry=password_entry,
                         server_path_entry=server_path_entry, install_dir_entry=install_dir_entry:
                         dropdown_changed(dropdown_var, user_entry, password_entry, server_path_entry, install_dir_entry))
@@ -124,13 +137,14 @@ def get_config_inputs():
     dropdown_changed(dropdown_var, user_entry, password_entry, server_path_entry, install_dir_entry)
     dropdown.grid(row=0, column=1, padx=10, pady=5)
 
+    # Button to abort & close #
+    abort_button = customtkinter.CTkButton(input_window, text="Abort", command=lambda: input_window.quit(), fg_color="red")
+    abort_button.grid(row=5, column=0, padx=10, pady=20)
+
     # Button to save & close #
     save_button = customtkinter.CTkButton(input_window, text="Save & Close", command=lambda: close_input_window(input_window))
-    save_button.grid(row=5, column=0, padx=10, pady=20)
+    save_button.grid(row=5, column=2, padx=10, pady=20)
 
-    # Button to abort & close #
-    abort_button = customtkinter.CTkButton(input_window, text="Abort", command=lambda: input_window.quit())
-    abort_button.grid(row=5, column=2, padx=10, pady=20)
 
     input_window.update()
     input_window.mainloop()
@@ -165,18 +179,38 @@ def switch_to_game_details(software):
 def load_main():
     '''Load the main page overview'''
 
+    global all_metadata
+
     app.title("Lan Vault: Overview")
 
+    # 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)
+    # place scrollable frame
+    scrollable_frame.grid(row=1, column=0, sticky="nsew", columnspan=2)
+
+
     # create tiles from meta files #
     cache_dir_size = 0
-    for software in db.find_all_metadata():
-        create_main_window_tile(software)
+    if not all_metadata:
+        all_metadata = db.find_all_metadata()
+
+    for software in all_metadata:
+
+        print("Software:", software)
+        create_main_window_tile(software, scrollable_frame)
 
         # retrieve cache dir from any software #
         if not cache_dir_size:
             cache_dir_size = cache_utils.get_cache_size()
             label = customtkinter.CTkLabel(app, text="Cache Size: {:.2f} GB".format(cache_dir_size))
+            GITHUB_URL = "https://github.com/FAUSheppy/homelab_gamevault"
+            github = customtkinter.CTkButton(app, text="Star on Github",
+                            command=lambda: webbrowser.open_new(GITHUB_URL))
             label.grid(row=0, column=0)
+            github.grid(row=0, column=1)
 
     # set update listener & update positions #
     update_button_positions()
@@ -186,7 +220,7 @@ def destroy_main():
     '''Destroy all elements in the main view'''
 
     global buttons
-
+    scrollable_frame.grid_remove()
     app.unbind("<Configure>")
     for b in buttons:
         b.destroy()
@@ -202,27 +236,40 @@ def load_details(app, software):
     app.title("Lan Vault: {}".format(software.title))
     details_elements = client_details.create_details_page(app, software, switch_to_main)
 
-def create_main_window_tile(software):
+def create_main_window_tile(software, parent):
     '''Create the main window tile'''
 
-    if software.get_thumbnail():
-        try:
-            print("Loading thumbnail:",  software.get_thumbnail())
-            img = PIL.Image.open(software.get_thumbnail())
-            img = imagetools.smart_resize(img, 200, 300)
-        except PIL.UnidentifiedImageError:
-            print("Failed to load thumbnail:", software.get_thumbnail())
-            img = PIL.Image.new('RGB', (200, 300))
-    else:
-        img = PIL.Image.new('RGB', (200, 300))
-
-    img = PIL.ImageTk.PhotoImage(img)
-    button = customtkinter.CTkButton(app, image=img,
+    img = PIL.Image.new('RGB', (200, 300))
+    imgTk = PIL.ImageTk.PhotoImage(img)
+    button = customtkinter.CTkButton(parent, image=imgTk,
                                         width=200, height=300,
                                         command=lambda: switch_to_game_details(software),
                                         border_width=0, corner_radius=0, border_spacing=0,
                                         text=software.title,
                                         fg_color="transparent", compound="top", anchor="s")
+
+
+    def callback_update_thumbnail():
+
+        # TODO: bind button & software into this callback
+
+        try:
+            target_file = software.get_thumbnail()
+            if not target_file:
+                return
+            print("Loading thumbnail (async):",  target_file)
+            img = PIL.Image.open(target_file)
+            img = imagetools.smart_resize(img, 200, 300)
+        except PIL.UnidentifiedImageError:
+            print("Failed to load thumbnail:", target_file)
+            img = PIL.Image.new('RGB', (200, 300))
+        
+        button.configure(image=PIL.ImageTk.PhotoImage(img))
+
+    # register the update task for the image #
+    statekeeper.add_to_task_queue(callback_update_thumbnail)
+
+    # cache button and return #
     buttons.append(button)
     return button
 
@@ -230,13 +277,13 @@ def update_button_positions(event=None):
     '''Sets the tile positions initially and on resize'''
 
     global last_geometry
-
     # check vs old location #
     new_geometry = app.winfo_geometry()
     if last_geometry[0] == new_geometry[0] and last_geometry[1] == new_geometry[1]:
         return
     else:
         last_geometry = new_geometry
+        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
@@ -272,7 +319,6 @@ if __name__ == "__main__":
 
     if not os.path.isfile(CONFIG_FILE):
         get_config_inputs()
-        print("wtf")
 
     # load config #
     with open(CONFIG_FILE) as f:
@@ -293,6 +339,13 @@ if __name__ == "__main__":
         if backend_type == "FTP/FTPS":
             remote_root_dir = "/" + config_loaded["Server/Path:"].split("://")[1].split("/", 1)[1]
             server = config_loaded["Server/Path:"][:-len(remote_root_dir)]
+        elif backend_type == "HTTP/HTTPS":
+            server = config_loaded["Server/Path:"]
+            remote_root_dir = None
+            if not server.startswith("http://") or "https://":
+                server = "http://" + server
+            if not ":" in server.split("://")[1]:
+                server = server + ":5000"
         elif backend_type == "Local Filesystem":
             remote_root_dir = config_loaded["Server/Path:"]
             server = None
@@ -303,7 +356,9 @@ if __name__ == "__main__":
         print(user, password, install_dir, remote_root_dir, server, config_loaded["Server/Path:"])
 
         # add db backend #
-        if backend_type == "FTP/FTPS":
+        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)
+        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)
         elif backend_type == "Local Filesystem":

client_details.py

@@ -2,7 +2,8 @@ import PIL
 import tkinter
 import customtkinter
 import imagetools
-
+import os
+import statekeeper
 
 def show_large_picture(app, path):
     '''Show a full-window version of the clicked picture'''
@@ -21,6 +22,7 @@ def show_large_picture(app, path):
     large_image = customtkinter.CTkButton(app, text="", image=img, width=x-2*30, height=y-2*30,
                     fg_color="transparent", hover_color="black", corner_radius=0, border_width=0, border_spacing=0,
                     command=lambda: large_image.destroy())
+
     large_image.place(x=30, y=30)
 
 def create_details_page(app, software, backswitch_function):
@@ -38,17 +40,26 @@ def create_details_page(app, software, backswitch_function):
 
     img = PIL.ImageTk.PhotoImage(img)
 
-    # navbar & progress bar #
+    # navbar #
     navbar = customtkinter.CTkFrame(app, fg_color="transparent")
     navbar.grid(column=0, row=0, padx=10, pady=5, sticky="ew")
-    back_button = customtkinter.CTkButton(navbar, text="Back", 
-                                          command=backswitch_function)
+
+    # back button
+    back_button = customtkinter.CTkButton(navbar, text="Back", command=backswitch_function)
     back_button.pack(anchor="nw", side="left")
+
+    # progress bar #
     progress_bar = software.progress_bar_wrapper.new(navbar)
     progress_bar.pack(anchor="nw", side="left", padx=20, pady=5)
+
+    # progress bar text #
+    progress_text = software.progress_bar_wrapper.new_text(navbar)
+    progress_text.pack(anchor="nw", side="left", padx=20, pady=5)
+
     elements.append(navbar)
     elements.append(back_button)
     elements.append(progress_bar)
+    elements.append(progress_text)
 
     # thumbnail image #
     thumbnail_image = customtkinter.CTkButton(app, text="", image=img, width=500, height=700,
@@ -118,7 +129,7 @@ def create_details_page(app, software, backswitch_function):
         remove_text = "Remove Manually"
     else:
         install_text = "Install"
-        remove_text = "Remove"
+        remove_text = "Remove (not implemented)" # FIXME: change text once implemented
 
     install_button = customtkinter.CTkButton(button_frame, text=install_text,
                         command=lambda: software.install())
@@ -131,6 +142,9 @@ def create_details_page(app, software, backswitch_function):
         remove_button.configure(state=tkinter.DISABLED)
         remove_button.configure(fg_color="gray")
 
+    # FIXME: disable remove button until implemented
+    remove_button.configure(state=tkinter.DISABLED)
+
     remove_button.pack(padx=10, pady=15, anchor="sw", side="left")
 
 
@@ -138,9 +152,13 @@ def create_details_page(app, software, backswitch_function):
     run_button = customtkinter.CTkButton(button_frame, text="Run",
                     command=lambda: software.run())
     run_button.pack(padx=10, pady=15, anchor="sw", side="left")
+    software.run_button = run_button
 
     # install button #
-    if not software.run_exe:
+    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) 
+            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")
 
@@ -154,21 +172,28 @@ def create_details_page(app, software, backswitch_function):
     # add other pictures #
     if software.pictures:
 
-        picture_frame = customtkinter.CTkScrollableFrame(info_frame, height=200, width=300, orientation="horizontal", fg_color="transparent")
-        picture_frame.grid(column=0, row=7, sticky="we")
+        def callback_add_pictures():
 
-        i = 0
-        for path in software.pictures[1:]:
-            img = PIL.Image.open(path)
-            img = imagetools.smart_resize(img, 180, 180)
-            img = PIL.ImageTk.PhotoImage(img)
-            extra_pic_button = customtkinter.CTkButton(picture_frame, text="", image=img, command=lambda path=path: show_large_picture(app, path),
-                                     hover_color="black", corner_radius=0,)
-            extra_pic_button.configure(fg_color="transparent")
-            extra_pic_button.grid(pady=10, row=0, column=i)
-            elements.append(extra_pic_button)
-            i += 1
+            picture_frame = customtkinter.CTkScrollableFrame(info_frame, height=200, width=300, orientation="horizontal", fg_color="transparent")
+            picture_frame.grid(column=0, row=7, sticky="we")
 
-        elements.append(picture_frame)
+            i = 0
+            print("Software pictures in callback:", software.pictures[1:])
+            for path in software.pictures[1:]:
+
+                print("Doing picture:", path)
+                img = PIL.Image.open(software.backend.get(path))
+                img = imagetools.smart_resize(img, 180, 180)
+                img = PIL.ImageTk.PhotoImage(img)
+                extra_pic_button = customtkinter.CTkButton(picture_frame, text="", image=img, command=lambda path=path: show_large_picture(app, path),
+                                        hover_color="black", corner_radius=0,)
+                extra_pic_button.configure(fg_color="transparent")
+                extra_pic_button.grid(pady=10, row=0, column=i)
+                elements.append(extra_pic_button)
+                i += 1
+            
+            elements.append(picture_frame)
+
+        statekeeper.add_to_task_queue(callback_add_pictures)
 
     return elements

data_backend.py

@@ -6,19 +6,9 @@ import ftplib
 import tqdm
 import ssl
 import concurrent.futures
+import statekeeper
+import requests
 
-class SESSION_REUSE_FTP_TLS(ftplib.FTP_TLS):
-    """Explicit FTPS, with shared TLS session"""
-
-    def ntransfercmd(self, cmd, rest=None):
-
-        conn, size = ftplib.FTP.ntransfercmd(self, cmd, rest)
-        if self._prot_p:
-            conn = self.context.wrap_socket(
-                conn,
-                server_hostname=self.host,
-                session=self.sock.session)  # this is the fix
-        return conn, size
 
 class DataBackend:
 
@@ -36,7 +26,6 @@ class DataBackend:
         self.progress_bar_wrapper = progress_bar_wrapper
         self.root = tkinter_root
         self.cache_dir = "./cache/"
-        self.ftp = None # ftp connection object
 
     def get(self, path, return_content=False):
         '''Return the contents of this path'''
@@ -102,70 +91,22 @@ 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 FTP(DataBackend):
+class HTTP(DataBackend):
 
     paths_listed = {}
+    REMOTE_PATH = "/get-path"
 
-    def _connect(self, individual_connection=False):
+    def _get_url(self):
+        #print(self.server + HTTP.REMOTE_PATH)
+        return self.server + HTTP.REMOTE_PATH
 
-        if self.ftp and not individual_connection:
-            try:
-                self.ftp.voidcmd("NOOP")
-                return self.ftp
-            except ssl.SSLError:
-                pass # reconnect
+    def get(self, path, cache_dir="", return_content=False, wait=False):
 
-        if self.server.startswith("ftp://"):
-            tls = False
-        elif self.server.startswith("ftps://"):
-            tls = True
-        else:
-            raise ValueError("FTP Server must start with ftp:// or ftps://")
+        print("Getting", path, "cache dir", cache_dir, "return content:", return_content)
 
-        # build connection parameters #
-        server = self.server.split("://")[1]
-        port = None
-        try:
-            server = server.split(":")[0]
-        except (IndexError, ValueError):
-            port = 0
-
-        # try extract server #
-        try:
-            server = server.split(":")[0]
-        except (IndexError, ValueError):
-            server = self.server
-
-        print("Connecting to:", server, "on port:", port, "ssl =", tls)
-
-        # connect #
-        if not tls:
-            ftp = ftplib.FTP()
-        else:
-            ftp = SESSION_REUSE_FTP_TLS()
-            ftp.ssl_version = ssl.PROTOCOL_TLSv1_2
-
-        ftp.connect(server, port=port or 0)
-
-        if self.user:
-            ftp.login(self.user, self.password)
-        else:
-            ftp.login()
-
-        # open a secure session for tls #
-        if tls:
-            ftp.prot_p()
-
-        # cache dir is automatically set #
-        self.cache_dir = None
-
-        if not individual_connection:
-            self.ftp = ftp
-        return ftp
-
-
-    def get(self, path, cache_dir=None, return_content=False, new_connection=False):
+        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:
@@ -177,125 +118,107 @@ class FTP(DataBackend):
         fullpath = path
         if self.remote_root_dir and not path.startswith(self.remote_root_dir):
             fullpath = os.path.join(self.remote_root_dir, path)
-            #print(self.remote_root_dir, path, fullpath)
+
         fullpath = fullpath.replace("\\", "/")
-        local_file = os.path.join(cache_dir, os.path.basename(path))
+        local_file = os.path.join(cache_dir, fullpath)
+        local_dir = os.path.dirname(local_file)
 
-        # print("Cachedir:", cache_dir, os.path.basename(path), local_file)
+        # sanity check and create directory #
+        if not local_dir.startswith(cache_dir):
+            raise AssertionError("Local Dir does not start with cache dir:" + local_dir)
+        else:
+            os.makedirs(local_dir, exist_ok=True)
 
-        if not os.path.isfile(local_file):
-            ftp = self._connect(individual_connection=True)
-            ftp.sendcmd('TYPE I')
+        print("Requiring:", fullpath)
 
-            # load the file on remote #
-            if not new_connection:
-                total_size = ftp.size(fullpath)
-                print(total_size)
-                self.progress_bar_wrapper.get_pb()["maximum"] = total_size
+        if not os.path.isfile(local_file) or os.stat(local_file).st_size == 0:
 
-                print(local_file, "not in cache, retriving..")
-                with open(local_file, "w") as f:
-                    f.write(local_file)
-                with open(local_file, 'wb') as local_file_open, tqdm.tqdm(
-                    desc="Downloading",
-                    total=total_size,
-                    unit='B',
-                    unit_scale=True
-                ) as cmd_progress_bar:
+            if return_content or wait:
 
-                    # Define a callback function to update the progress bar #
-                    def callback(data):
-                        local_file_open.write(data)
-                        if new_connection: # return if parralell
-                            return
-                        self.root.update_idletasks() # Update the GUI
-                        self.progress_bar_wrapper.get_pb().set(
-                            self.progress_bar_wrapper.get_pb().get() + len(data)/total_size)
-                        cmd_progress_bar.update(len(data))
+                # 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 })
+                print("Request Content:", r.text)
+                # cache the download imediatelly #
+                with open(local_file, encoding="utf-8", mode="w") as f:
+                    f.write( r.text)
+
+                # return the content #
+                print("Content for", fullpath, ":",  r.text)
+
+                if return_content:
+                    return r.text
+                else:
+                    return local_file
 
-                    # run with callback #
-                    ftp.retrbinary('RETR ' + fullpath, callback)
             else:
-                with open(local_file, 'wb') as fp:
-                    ftp.retrbinary('RETR ' + fullpath, fp.write)
+                print("Async Requested for:", local_file)
+                statekeeper.add_to_download_queue(self._get_url(), path)
+                return local_file
 
-            if new_connection:
-                ftp.close()
-
-        if return_content:
+        elif return_content:
+            print("Returning Cached file:", local_file)
             with open(local_file, encoding="utf-8") as fr:
                 return fr.read()
+        else:
+            print("Already present:", local_file)
+            return local_file
 
-        return local_file
+    def list(self, path, fullpaths=False):
 
-    def list(self, path, fullpaths=False, new_connection=False):
-
-        # prepend root dir if not given #
         fullpath = path
         if self.remote_root_dir and not path.startswith(self.remote_root_dir):
             fullpath = os.path.join(self.remote_root_dir, path)
         fullpath = fullpath.replace("\\", "/")
-        #print(fullpath)
 
-        # if not os.path.isdir(fullpath):
-        #     return []
+        # retrieve session cached paths #
+        if fullpath in self.paths_listed:
+            paths = self.paths_listed[fullpath]
+        else:
 
-        try:
-            # retrieve session cached paths #
-            if fullpath in self.paths_listed:
-                paths = self.paths_listed[fullpath]
-                #print("Retrieved paths from cache:", fullpath, paths)
-            else:
-                ftp = self._connect(individual_connection=new_connection)
-                print("Listing previously unlisted path: {}".format(fullpath))
-                self.paths_listed.update({fullpath: []}) # in case dir does not exit
-                paths = ftp.nlst(fullpath)
-                self.paths_listed.update({fullpath: paths})
-
-                if new_connection: # close individual connections
-                    ftp.close()
+            r = requests.get(self._get_url(), params={ "path" : path })
+            r.raise_for_status()
+            #print(r, r.status_code, r.content)
+            paths = r.json()["contents"]
 
             if not fullpaths:
                 return paths
-
-            return [ os.path.join(path, filename).replace("\\", "/") for filename in paths ]
-
-        except ftplib.error_perm as e:
-            if "550 No files found" in str(e):
-                print("No files in this directory: {}".format(fullpath))
-                return []
-            elif "550 No such file or directory" in str(e):
-                print("File or dir does not exist: {}".format(fullpath))
-                return []
             else:
-                raise e
+                return [ os.path.join(path, filename).replace("\\", "/") for filename in paths ]
 
     def find_all_metadata(self):
 
         local_meta_file_list = []
 
         root_elements = self.list(self.remote_root_dir)
+        print("root elements:", root_elements)
         with concurrent.futures.ThreadPoolExecutor(max_workers=os.cpu_count()*5) as executor:
 
             software_dir_contents = list(executor.map(
-                    lambda s: self.list(s, fullpaths=True, new_connection=True), root_elements))
+                    lambda s: self.list(s, fullpaths=True), root_elements))
 
             # this caches the paths, done remove it #
             cache_list = [os.path.join(s, "registry_files") for s in root_elements ]
             cache_list += [os.path.join(s, "pictures") for s in root_elements ]
+
+            # THIS PRELOAD IMAGES-paths, DO NOT REMOVE IT #
             picture_contents_async_cache = list(executor.map(
-                    lambda s: self.list(s, fullpaths=True, new_connection=True), cache_list))
+                    lambda s: self.list(s, fullpaths=True), cache_list))
 
         for files in software_dir_contents:
-            #print(s)
-            #files = self.list(s, fullpaths=True)
-            print(files)
             for f in files:
                 if f.endswith("meta.yaml"):
-                    meta_file_content = self.get(f, cache_dir="cache", return_content=True)
-                    #print(meta_file_content)
                     local_meta_file_list.append(f)
 
+
+        print("local meta:", local_meta_file_list)
+        software_list = None
         with concurrent.futures.ThreadPoolExecutor(max_workers=os.cpu_count()*5) as executor:
             software_list = executor.map(lambda meta_file: software.Software(meta_file, self, self.progress_bar_wrapper), local_meta_file_list)
-            return list(filter(lambda x: not x.invalid, software_list))
+
+        # evaluate
+        software_list = list(software_list)
+        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))

localaction.py

@@ -1,6 +1,7 @@
 import subprocess
 import sys
 import os
+import json
 
 # windows imports #
 if os.name == "nt":
@@ -52,6 +53,15 @@ def resolve_lnk(lnk_file_path):
 def run_exe(path, synchronous=False):
     '''Launches a given software'''
 
+    if type(path) == str:
+        paths = [path]
+    else:
+        paths = path
+
+    # sanity check path is list #
+    if not type(path) == list:
+        raise AssertionError("ERROR: run_exe could not build a list of paths")
+
     if os.name != "nt":
         if ".lnk" in path:
             subprocess.Popen(["wine64", "start", path])
@@ -62,16 +72,18 @@ def run_exe(path, synchronous=False):
     if synchronous:
         raise NotImplementedError("SYNC not yet implemented")
 
-    if path.endswith(".lnk"):
-        path = resolve_lnk(path)
+    paths = [resolve_lnk(p) if p.endswith(".lnk") else p for p in paths]
 
-    print("Executing:", path)
+    print("Executing:", paths)
 
     try:
-        subprocess.Popen(path, cwd=os.path.dirname(path))
+        if paths[0].endswith(".reg"):
+            raise OSError("WinError 740")
+        subprocess.Popen(path, cwd=os.path.dirname(paths[0])) # TODO fix this BS
     except OSError as e:
         if "WinError 740" in str(e):
-            p = subprocess.Popen(["python", "adminrun.py", path],
+            p = subprocess.Popen(["powershell", "-ExecutionPolicy", "Bypass", "-File",
+                "windows_run_as_admin.ps1", json.dumps(paths)],
                 subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True)
             print(p.communicate())
         else:

pgwrapper.py

@@ -6,16 +6,42 @@ class ProgressBarWrapper:
     in the DataBackend and Software Objects'''
 
     def __init__(self):
+
         self.progress_bar = None
+        self.progress_text = None
+        self.tk_parent = None
+
+    def update(self):
+
+        if self.tk_parent:
+            self.tk_parent.update_idletasks()
 
     def new(self, tk_parent):
+
+        self.tk_parent = tk_parent
         self.progress_bar = customtkinter.CTkProgressBar(tk_parent, height=20, width=200)
         self.progress_bar["maximum"] = 10000
         self.progress_bar.set(0)
+
         return self.progress_bar
 
+    def new_text(self, tk_parent):
+
+        self.tk_parent = tk_parent
+        self.progress_text = customtkinter.CTkLabel(tk_parent, height=20, width=130, text="")
+        return self.progress_text
+    
     def get_pb(self):
+
         if self.progress_bar:
             return self.progress_bar
         else:
             raise AssertionError("No progress bar in this wrapper created")
+
+    def set_text(self, text):
+
+        if self.progress_text:
+            self.progress_text.configure(text=text)
+        else:
+            pass
+            #FIXME raise AssertionError("No progress text in this wrapper created")

requirements.txt

@@ -1,5 +1,5 @@
 pyuac
-Pillow
+Pillow>=10.0.3
 customtkinter
 tqdm
 Jinja2

server/Dockerfile

@@ -0,0 +1,17 @@
+FROM alpine
+
+RUN apk add --no-cache py3-pip
+
+WORKDIR /app
+
+RUN python3 -m pip install --no-cache-dir --break-system-packages waitress
+
+COPY req.txt .
+RUN python3 -m pip install --no-cache-dir --break-system-packages -r req.txt
+
+COPY ./ .
+
+EXPOSE 5000/tcp
+
+ENTRYPOINT ["waitress-serve"] 
+CMD ["--host", "0.0.0.0", "--port", "5000", "--call", "app:createApp"]

server/app.py

@@ -0,0 +1,5 @@
+import main as server
+def createApp(envivorment=None, start_response=None):
+    with server.app.app_context():
+        server.create_app()
+    return server.app

server/main.py

@@ -0,0 +1,69 @@
+from flask import Flask, request, jsonify, send_file, abort
+import os
+import sys
+
+from werkzeug.utils import secure_filename
+
+app = Flask(__name__)
+
+# Base directory constraint
+BASE_DIR = os.path.abspath("./data")
+
+@app.route('/get-path', methods=['GET'])
+def get_path():
+
+    # Get the "path" and "info" arguments from the URL
+    path = request.args.get('path')
+
+    # replace windows paths
+    path = path.replace("\\", "/")
+    if path.startswith("/"):
+        path = path[1:]
+
+    print("path", path, file=sys.stderr)
+
+    info = request.args.get('info')
+
+    if not path:
+        return jsonify({"error": "Missing 'path' parameter."}), 400
+
+    # Ensure the path is secure and resolve it within the BASE_DIR
+    #secure_path = secure_filename(path)
+    full_path = os.path.abspath(os.path.join(BASE_DIR, path))
+
+    if not full_path.startswith(BASE_DIR):
+        return jsonify({"error": "Access to the specified path is not allowed."}), 403
+
+    print(full_path, file=sys.stderr)
+
+    # Check if the path exists
+    if not os.path.exists(full_path):
+        print("missing file", file=sys.stderr)
+        return jsonify({"contents": list()})
+
+    # If the path is a directory, return a JSON list of its contents
+    if os.path.isdir(full_path):
+        contents = filter(lambda x: not x.startswith("."), os.listdir(full_path))
+        return jsonify({"contents": list(contents)})
+
+    # If the path is a file
+    if os.path.isfile(full_path):
+        if info == '1':
+            # Return the file size if 'info=1' is specified
+            file_size = os.path.getsize(full_path)
+            return jsonify({"size": file_size})
+        else:
+            # Return the file as a download
+            try:
+                return send_file(full_path, as_attachment=True)
+            except Exception as e:
+                return jsonify({"error": str(e)}), 500
+
+    # If the path is neither a file nor a directory, return an error
+    return jsonify({"error": "Invalid path type."}), 400
+
+def create_app():
+    pass
+
+if __name__ == '__main__':
+    app.run(debug=True)

server/req.txt

@@ -0,0 +1 @@
+flask

software.py

@@ -1,4 +1,5 @@
 import yaml
+import tkinter
 import os
 import localaction
 import zipfile
@@ -15,6 +16,7 @@ class Software:
         self.meta_file = meta_file
         self.directory = os.path.dirname(meta_file)
         self.backend = backend
+        self.run_button = None
         print("Software Directory:", self.directory)
 
         self.cache_dir = backend.cache_dir or os.path.join("cache", self.directory.lstrip("/").lstrip("\\"))
@@ -24,13 +26,19 @@ class Software:
             self.invalid = False
             self._load_from_yaml()
         except ValueError as e:
+            print(e)
+            raise e
             self.invalid = True
 
+        if not progress_bar_wrapper:
+            raise AssertionError()
+
         self.progress_bar_wrapper = progress_bar_wrapper
 
     def _load_from_yaml(self):
 
-        content = self.backend.get(self.meta_file, self.cache_dir, return_content=True, new_connection=True)
+        content = self.backend.get(self.meta_file, self.cache_dir, return_content=True)
+        # print("Meta-Content:", content)
 
         meta = yaml.safe_load(content)
         if not meta:
@@ -45,11 +53,17 @@ class Software:
         self.extra_files = meta.get("extra_files")
         self.run_exe = meta.get("run_exe")
         self.installer = meta.get("installer")
+        self.installer_no_admin = meta.get("installer_no_admin")
 
-        self.pictures = [ self.backend.get(pp, self.cache_dir, new_connection=True) for pp in
-                self.backend.list(os.path.join(self.directory, "pictures"), fullpaths=True, new_connection=True) ]
+        self.pictures = [ self.backend.get(pp, self.cache_dir) for pp in
+                self.backend.list(os.path.join(self.directory, "pictures"), fullpaths=True) ]
         
-        self.reg_files = self.backend.list(os.path.join(self.directory, "registry_files"), fullpaths=True, new_connection=True)
+        if any([x is None for x in self.pictures]):
+            raise AssertionError("None Entries in self.pictures: " + str(self.pictures))
+
+        self.reg_files = self.backend.list(os.path.join(self.directory, "registry_files"), fullpaths=True)
+
+        print("Finished Init for", self.title)
 
 
     def get_thumbnail(self):
@@ -78,13 +92,22 @@ class Software:
                     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()
+
+
     def install(self):
         '''Install this software from the backend'''
 
+        # things to execute #
+        admin_run_list = []
+
         print("Installing:", self.title, self.directory)
 
         # handle link-only software #
@@ -92,6 +115,8 @@ class Software:
             webbrowser.open(self.link_only)
             return
 
+        self.progress_bar_wrapper.set_text(text="Please wait..")
+        self.progress_bar_wrapper.tk_parent.update_idletasks()
         path = os.path.join(self.directory, "main_dir")
 
         try:
@@ -118,7 +143,8 @@ class Software:
                 print("Install dir Registry:", target_install_dir)
                 path = jinja_helper.render_path(path, target_install_dir, self.directory)
 
-            localaction.install_registry_file(path)
+            admin_run_list.append(path)
+            # localaction.install_registry_file(path)
 
         # install dependencies #
         if self.dependencies:
@@ -136,16 +162,29 @@ class Software:
 
 
             print("Running installer:", installer_path)
-            localaction.run_exe(installer_path)
+            if not self.installer_no_admin:
+                admin_run_list.append(installer_path)
+            else:
+                localaction.run_exe(installer_path)
+
+        if admin_run_list:
+            print("admin list", admin_run_list)
+            localaction.run_exe(admin_run_list)
 
         # install gamefiles #
         if self.extra_files:
             for src, dest in self.extra_files.items():
-                tmp = self.backend.get(os.path.join(self.directory, "extra_files", src), self.cache_dir)
+                tmp = self.backend.get(os.path.join(self.directory, "extra_files", src), self.cache_dir, wait=True)
                 dest_dir = os.path.expandvars(dest)
                 os.makedirs(dest_dir, exist_ok=True)
                 shutil.copy(tmp, dest_dir)
 
+        self.progress_bar_wrapper.set_text(text="")
+        if self.run_button:
+            self.run_button.configure(state=tkinter.NORMAL)
+            self.run_button.configure(fg_color="green")
+
+
     def run(self):
         '''Run the configured exe for this software'''
 

statekeeper.py

@@ -0,0 +1,36 @@
+import requests
+import os
+import threading
+
+def add_to_download_queue(url, path):
+    '''The download is added to the global queue and downloaded eventually'''
+    #_download(url, path)
+    thread = threading.Thread(target=_download, args=(url, path))
+    thread.start()
+
+def add_to_task_queue(task):
+    '''Add a callback to background execution queue'''
+    #print("Executing tasks", task)
+    thread = threading.Thread(target=task)
+    thread.start()
+    #task()
+
+def _download(url, path):
+
+    response = requests.get(url + "?path=" + path, stream=True)
+
+    # Check if the request was successful
+    if response.status_code == 200:
+
+        # Save the file locally
+        local_filename = os.path.join("./cache", path)
+
+        with open(local_filename, 'wb') as f:
+            for chunk in response.iter_content(chunk_size=8192):  # Download in chunks
+                f.write(chunk)
+
+        print(f"File downloaded successfully as {local_filename}")
+    
+    else:
+
+        raise AssertionError("Non-200 Response for:", url, path, response.status_code, response.text)

windows_run_as_admin.ps1

@@ -0,0 +1,65 @@
+param (
+    [string]$PathsJson
+)
+
+try {
+    $Paths = $PathsJson | ConvertFrom-Json -ErrorAction Stop
+} catch {
+    # If it fails, assume it's Base64-encoded and decode it
+    try {
+        $DecodedJson = [Text.Encoding]::UTF8.GetString([Convert]::FromBase64String($PathsJson))
+        $Paths = $DecodedJson | ConvertFrom-Json -ErrorAction Stop
+    } catch {
+        Write-Error "Failed to parse PathsJson as JSON or Base64-encoded JSON."
+        exit 1
+    }
+}
+
+Write-Host "Paths"
+Write-Host $PathsJson
+Write-Host $PWD
+
+# Check if running as administrator
+$CurrentUser = [System.Security.Principal.WindowsIdentity]::GetCurrent()
+$Principal = New-Object System.Security.Principal.WindowsPrincipal($CurrentUser)
+$IsAdmin = $Principal.IsInRole([System.Security.Principal.WindowsBuiltInRole]::Administrator)
+
+if (-not $IsAdmin) {
+    # Relaunch the script with elevated privileges
+    $EncodedJson = [Convert]::ToBase64String([Text.Encoding]::UTF8.GetBytes($PathsJson))
+    $TempFile = New-TemporaryFile
+    Start-Process powershell -ArgumentList "-ExecutionPolicy Bypass -Command `"Set-Location -Path '$PWD'; & '$PSCommandPath' '$EncodedJson' *> '$TempFile'`" " -Verb RunAs -Wait
+    
+    Start-Sleep 1
+    if (Test-Path $TempFile) {
+        # Output the captured output
+        Get-Content $TempFile | Write-Host
+        Remove-Item $TempFile
+    }else{
+        Write-Host "No output captured. Check if the script produces any output." 
+    }
+
+    exit
+}
+
+
+foreach($Path in $Paths){
+
+    Write-Host "Running: $Path"
+
+    # Run the process and capture output
+    try {
+
+        if ($Path -match '\.reg$') {
+            # Run regedit silently to merge the .reg file
+            $Process = Start-Process -FilePath "regedit.exe" -ArgumentList "/s `"$Path`"" -NoNewWindow -PassThru
+        } else {
+            # Run the file normally
+            $Process = Start-Process -FilePath $Path -NoNewWindow -PassThru
+        }
+        $Process.WaitForExit()
+
+    } catch {
+        Write-Host "Error running the process: $_"
+    }
+}