Merge pull request #5 from CDRV/dev

Main merge for 1.0.4 release

Globals.py

@@ -8,4 +8,4 @@
 
 config_man = ConfigManager()
 
-version_string = '1.0.3'
+version_string = '1.0.4'

libs/servers/WatchServer.py

@@ -108,13 +108,13 @@ def sync_files(self, check_internet: bool = True):
                 files.extend(folder_files)
                 full_files.extend([os.path.join(dp, file) for file in folder_files])
                 file_folder = dp.replace(base_folder, '')
-                file_folders.extend("/" + self.server_base_folder + "/" + file_folder.replace(os.sep, '/')
+                file_folders.extend(self.server_base_folder + "/" + file_folder.replace(os.sep, '/')
                                     for _ in folder_files)
 
         # Filter duplicates
         # full_files = list(set(full_files))
 
-        if files:
+        if full_files:
             logging.info('About to sync files...')
 
             if self.sftp_transfer:

libs/uploaders/SFTPUploader.py

@@ -38,7 +38,8 @@ def sftp_send(sftp_config: dict, files_directory_on_server: [str], files_to_tran
                                    cnopts=cnopts) as s:
                 for file_server_location, file_to_transfer in zip(files_directory_on_server, files_to_transfer):
                     if not (s.isdir(file_server_location)):
-                        s.mkdir(file_server_location)
+                        s.makedirs(file_server_location)
+                        # s.mkdir(file_server_location)
                     with s.cd(file_server_location):
                         file_name = os.path.basename(file_to_transfer)
                         # Query file size from server and compare to local file size