Fixed issue with seperate download path for sftp, ftp & local

Changes:
- fixed issue when updating with the activated option of a seperate download path
- removed leftover debug output

README.md

@@ -103,7 +103,7 @@ Execute the `installer.bat` file to automaticcally install the needed packages f
 > This is a normal behaviour from the windows defender because this is a unknown `.bat` file.  
 > To run the `installer.bat` anyway, click `More Info` and then `Run anyway` when the message pops up.  
 
-##### Manually
+#### Manually
 Execute this command in the `\plugGET` folder:  
 ```python
 py -m pip install -r requirements.txt

src/handlers/handle_ftp.py

@@ -29,8 +29,12 @@ def ftp_showPlugins(ftp):
 
 def ftp_upload_file(ftp, itemPath):
     configValues = configurationValues()
+    if configValues.sftp_seperateDownloadPath is True:
+        uploadFolderPath = configValues.sftp_pathToSeperateDownloadPath
+    else:
+        uploadFolderPath = configValues.sftp_folderPath
     try:
-        ftp.cwd(configValues.sftp_folderPath)
+        ftp.cwd(uploadFolderPath)
         itemPath = os.path.relpath(itemPath, 'TempSFTPFolder/')
         itemPath = str(itemPath)
         currentDirectory = os.getcwd()
@@ -46,7 +50,6 @@ def ftp_upload_file(ftp, itemPath):
 
 def ftp_upload_server_jar(ftp, itemPath):
     try:
-        print(f"itempath: {itemPath}")
         ftp.cwd('.')
         itemPath = os.path.relpath(itemPath, 'TempSFTPFolder/')
         itemPath = str(itemPath)

src/handlers/handle_sftp.py

@@ -37,8 +37,12 @@ def sftp_showPlugins(sftp):
 
 def sftp_upload_file(sftp, itemPath):
     configValues = configurationValues()
+    if configValues.sftp_seperateDownloadPath is True:
+        uploadFolderPath = configValues.sftp_pathToSeperateDownloadPath
+    else:
+        uploadFolderPath = configValues.sftp_folderPath
     try:
-        sftp.chdir(configValues.sftp_folderPath)
+        sftp.chdir(uploadFolderPath)
         sftp.put(itemPath)
 
     except FileNotFoundError:

src/plugin/plugin_downloader.py

@@ -78,19 +78,17 @@ def searchPackage(ressourceName):
         ressourceSelected = ressourceSelected - 1
         ressourceId = packageName[ressourceSelected]["id"]
         if not configValues.localPluginFolder:
-            try:
             if configValues.sftp_seperateDownloadPath is True:
-                    getSpecificPackage(ressourceId, configValues.sftp_pathToSeperateDownloadPath)
+                pluginDownloadPath = configValues.sftp_pathToSeperateDownloadPath
             else:
-                    getSpecificPackage(ressourceId, configValues.sftp_folderPath)
+                pluginDownloadPath = configValues.sftp_folderPath
-            except HTTPError as err:
-                print(oColors.brightRed +  f"Error: {err.code} - {err.reason}" + oColors.standardWhite)
         else:
-            try:
             if configValues.seperateDownloadPath is True:
-                    getSpecificPackage(ressourceId, configValues.pathToPluginFolder)
+                pluginDownloadPath = configValues.pathToSeperateDownloadPath
             else:
-                    getSpecificPackage(ressourceId, configValues.pathToSeperateDownloadPath)
+                pluginDownloadPath = configValues.pathToPluginFolder
+        try:
+            getSpecificPackage(ressourceId, pluginDownloadPath)
         except HTTPError as err:
             print(oColors.brightRed +  f"Error: {err.code} - {err.reason}" + oColors.standardWhite)
 

src/plugin/plugin_updatechecker.py

@@ -86,13 +86,12 @@ def compareVersions(plugin_latest_version, pluginVersion):
 def eggCrackingJar(localJarFileName, searchMode):
     configValues = configurationValues()
     if not configValues.localPluginFolder:
-        if configValues.sftp_useSftp:
         tempPluginFolderPath = createTempPluginFolder()
+        if configValues.sftp_useSftp:
             sftp = createSFTPConnection()
             pathToPluginJar = Path(f"{tempPluginFolderPath}/{localJarFileName}")
             sftp_downloadFile(sftp, pathToPluginJar, localJarFileName)
         else:
-            tempPluginFolderPath = createTempPluginFolder()
             ftp = createFTPConnection()
             pathToPluginJar = Path(f"{tempPluginFolderPath}/{localJarFileName}")
             ftp_downloadFile(ftp, pathToPluginJar, localJarFileName)
@@ -155,11 +154,7 @@ def checkInstalledPackage(inputSelectedObject="all", inputOptionalParam=None):
     try:
         for plugin in track(pluginList, description="Checking for updates" ,transient=True, complete_style="bright_yellow"):
             if not configValues.localPluginFolder:
-                if configValues.sftp_seperateDownloadPath is True:
-                    pluginFile = f"{configValues.sftp_pathToSeperateDownloadPath}/{plugin}"
-                else:
                 pluginFile = f"{configValues.sftp_folderPath}/{plugin}"
-
                 if configValues.sftp_useSftp:
                     pluginAttributes = sftp_validateFileAttributes(connection, pluginFile)
                     if pluginAttributes == False:
@@ -290,11 +285,7 @@ def updateInstalledPackage(inputSelectedObject='all'):
         for pluginArray in track(INSTALLEDPLUGINLIST, description="Updating" ,transient=True, complete_style="bright_magenta", ):
             plugin = INSTALLEDPLUGINLIST[i][0]
             if not configValues.localPluginFolder:
-                if configValues.sftp_seperateDownloadPath is True:
-                    pluginFile = f"{configValues.sftp_pathToSeperateDownloadPath}/{plugin}"
-                else:
                 pluginFile = f"{configValues.sftp_folderPath}/{plugin}"
-
                 if configValues.sftp_useSftp:
                     pluginAttributes = sftp_validateFileAttributes(connection, pluginFile)
                     if pluginAttributes == False:
@@ -339,17 +330,17 @@ def updateInstalledPackage(inputSelectedObject='all'):
                     print(f"{fileVersion}".ljust(13), end='')
                     print(f"{latestVersion}".ljust(13))
                     if not configValues.localPluginFolder:
-                        if configValues.sftp_useSftp:
                         if configValues.sftp_seperateDownloadPath is True:
                             pluginPath = configValues.sftp_pathToSeperateDownloadPath
                         else:
                             pluginPath = configValues.sftp_folderPath
                         pluginPath = f"{pluginPath}/{plugin}"
-                            sftp = createSFTPConnection()
                         indexNumberUpdated += 1
                         pluginsUpdated += 1
+                        if configValues.sftp_useSftp:
+                            sftp = createSFTPConnection()
                             try:
-                                getSpecificPackage(pluginId, configValues.sftp_folderPath)
+                                getSpecificPackage(pluginId, pluginPath)
                                 if configValues.sftp_seperateDownloadPath is False:
                                     sftp.remove(pluginPath)
                             except HTTPError as err:
@@ -357,17 +348,11 @@ def updateInstalledPackage(inputSelectedObject='all'):
                                 pluginsUpdated -= 1
                             except FileNotFoundError:
                                 print(oColors.brightRed +  f"FileNotFoundError: Old plugin file coulnd't be deleted" + oColors.standardWhite)
+
                         else:
-                            if configValues.sftp_seperateDownloadPath is True:
-                                pluginPath = configValues.sftp_pathToSeperateDownloadPath
-                            else:
-                                pluginPath = configValues.sftp_folderPath
-                            pluginPath = f"{pluginPath}/{plugin}"
                             ftp = createFTPConnection()
-                            indexNumberUpdated += 1
-                            pluginsUpdated += 1
                             try:
-                                getSpecificPackage(pluginId, configValues.sftp_folderPath)
+                                getSpecificPackage(pluginId, pluginPath)
                                 if configValues.sftp_seperateDownloadPath is False:
                                     ftp.delete(pluginPath)
                             except HTTPError as err:
@@ -380,12 +365,11 @@ def updateInstalledPackage(inputSelectedObject='all'):
                         if configValues.seperateDownloadPath is True:
                             pluginPath = configValues.pathToSeperateDownloadPath
                         else:
-                            pluginPath = pluginFolderPath
+                            pluginPath = configValues.pathToPluginFolder
-                        pluginPath = Path(f"{pluginPath}/{plugin}")
                         indexNumberUpdated += 1
                         pluginsUpdated += 1
                         try:
-                            getSpecificPackage(pluginId, pluginFolderPath)
+                            getSpecificPackage(pluginId, pluginPath)
                             if configValues.seperateDownloadPath is False:
                                 os.remove(pluginPath)
                         except HTTPError as err: