feat: remote ftp support \wo caching

client.py

@@ -130,8 +130,11 @@ def update_button_positions(event=None):
 
 if __name__ == "__main__":
 
+    progressbar = customtkinter.CTkProgressBar(master=app)
     # define data backend #
-    db = data_backend.LocalFS(None, None, "./install/", remote_root_dir="example_software_root")
+    #db = data_backend.LocalFS(None, None, "./install/", remote_root_dir="example_software_root")
+    db = data_backend.FTP(None, None, "./install/", server="ftp://192.168.1.132:2121",
+                            remote_root_dir="/", progress_bar=progressbar, tkinter_root=app)
 
     load_main()
 

data_backend.py

@@ -18,8 +18,8 @@ class DataBackend:
         self.remote_root_dir = remote_root_dir
         self.server = server
         self.install_dir = install_dir
-
+        self.progress_bar=progress_bar
-        self.pro
+        self.root = tkinter_root
 
     def get(self, path, return_content=False):
         '''Return the contents of this path'''
@@ -91,9 +91,29 @@ class FTP(DataBackend):
     def _connect(self):
 
         if self.server.startswith("ftp://"):
-            ftp = ftplib.FTP(self.server)
+            tls = False
         elif self.server.startswith("ftps://"):
-            ftp = ftplib.FTP_TLS(self.server)
+            tls = True
+        else:
+            raise ValueError("FTP Server must start with ftp:// or ftps://")
+
+        # build connection parameters #
+        server = self.server.split("://")[1]
+        port = None
+        try:
+            port = int(server.split(":")[-1])
+            server = server.split(":")[0]
+        except (IndexError, ValueError):
+            server = self.server
+        
+        #print("Connectiong to:", server, "on port:", port)
+
+        # connect #
+        if not tls:
+            ftp = ftplib.FTP()
+        else:
+            ftp = ftplib.FTP_TLS()
+        ftp.connect(server, port=port)
 
         if self.user:
             ftp.login(self.user, self.password)
@@ -105,33 +125,49 @@ class FTP(DataBackend):
 
     def get(self, path, cache_dir=None, return_content=False):
 
+        # 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!")
+
         # 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)
+            #print(self.remote_root_dir, path, fullpath)
+        fullpath = fullpath.replace("\\", "/")
         
         ftp = self._connect()
+        ftp.sendcmd('TYPE I')
 
         # load the file on remote #
         total_size = ftp.size(fullpath)
         local_file = os.path.join(cache_dir, os.path.basename(path))
         self.progress_bar["maximum"] = total_size
 
-        with open(local_file, 'wb') as local_file, tqdm(
+        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 progress_bar:
+        ) as cmd_progress_bar:
             
             # Define a callback function to update the progress bar #
             def callback(data):
-                local_file.write(data)
+                local_file_open.write(data)
                 self.root.update_idletasks() # Update the GUI
-                self.progress_bar.step(len(data))
+                self.progress_bar.set(self.progress_bar.get() + len(data))
+                cmd_progress_bar.update(len(data))
 
             # run with callback #
             ftp.retrbinary('RETR ' + fullpath, callback)
+        
+        if return_content:
+            with open(local_file, encoding="utf-8") as fr:
+                return fr.read()
 
         return local_file
     
@@ -141,20 +177,25 @@ 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)
+        fullpath = fullpath.replace("\\", "/")
+        print(fullpath)
 
-        if not os.path.isdir(fullpath):
+        # if not os.path.isdir(fullpath):
-            return []
+        #     return []
 
         ftp = self._connect()
         try:
             paths = ftp.nlst(fullpath)
             if not fullpaths:
                 return paths
-            return [ os.path.join(path, filename) for filename in paths ]
+            return [ os.path.join(path, filename).replace("\\", "/") for filename in paths ]
         except ftplib.error_perm as e:
-            if str(e) == "550 No files found":
+            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
     
@@ -164,10 +205,13 @@ class FTP(DataBackend):
 
         root_elements = self.list(self.remote_root_dir)
         for s in root_elements:
+            print(s)
             files = self.list(s, fullpaths=True)
+            print(files)
             for f in files:
                 if f.endswith("meta.yaml"):
-                    local_meta_file = self.get(meta_file)
+                    meta_file_content = self.get(f, cache_dir="cache", return_content=True)
-                    local_meta_file_list.append(local_meta_file)
+                    print(meta_file_content)
+                    local_meta_file_list.append(f)
         
         return [ software.Software(meta_file, self) for meta_file in local_meta_file_list ]

software.py

@@ -12,6 +12,7 @@ class Software:
         self.meta_file = meta_file
         self.directory = os.path.dirname(meta_file)
         self.backend = backend
+        # print(self.directory)
         self.cache_dir = os.path.join("cache", self.directory)
         self._load_from_yaml()
 
@@ -59,7 +60,12 @@ class Software:
         print("Installing:", self.title, self.directory)
 
         path = os.path.join(self.directory, "main_dir")
-        remote_file = self.backend.list(path, fullpaths=True)[0]
+        
+        try:
+            remote_file = self.backend.list(path, fullpaths=True)[0]
+        except IndexError:
+            print("No main_dir:", path)
+            raise AssertionError("No main_dir for this software")
         local_file = self.backend.get(remote_file, self.cache_dir)
 
         # execute or unpack #