Added FTP support

Changes: - added ftp support - added ftp to every function which had already sftp interaction - edited config - added handle_ftp.py fixed old configcheck() bugs - added sftp/ftp to eggcrackingjar mechanism - added new line input with enter
2024-04-29 16:12:30 +00:00 · 2021-03-30 23:55:04 +02:00
parent 2a7372dae1
commit 927767b0aa
11 changed files with 278 additions and 87 deletions
--- a/src/plugin/plugin_downloader.py
+++ b/src/plugin/plugin_downloader.py
@@ -7,7 +7,8 @@ from utils.consoleoutput import oColors
 from utils.web_request import doAPIRequest
 from utils.utilities import createTempPluginFolder, deleteTempPluginFolder, calculateFileSizeKb, calculateFileSizeMb
 from handlers.handle_config import configurationValues
-from handlers.handle_sftp import sftp_upload_file, sftp_cdPluginDir, createSFTPConnection
+from handlers.handle_sftp import sftp_upload_file, createSFTPConnection
+from handlers.handle_ftp import ftp_upload_file, ftp_cdPluginDir, createFTPConnection


 def handleRegexPackageName(packageNameFull):
@@ -110,8 +111,12 @@ def downloadSpecificVersion(ressourceId, downloadPath, versionID='latest'):
        filesizeData = calculateFileSizeKb(filesize)
        print("Downloaded " + (str(filesizeData)).rjust(9) + f" KB here {downloadPath}")
    if not configValues.localPluginFolder:
-        sftpSession = createSFTPConnection()
-        sftp_upload_file(sftpSession, downloadPath)
+        if configValues.sftp_useSftp:
+            sftpSession = createSFTPConnection()
+            sftp_upload_file(sftpSession, downloadPath)
+        else:
+            ftpSession = createFTPConnection()
+            ftp_upload_file(ftpSession, downloadPath)


 def getSpecificPackage(ressourceId, downloadPath, inputPackageVersion='latest'):
@@ -125,17 +130,14 @@ def getSpecificPackage(ressourceId, downloadPath, inputPackageVersion='latest'):
    versionId = getVersionID(ressourceId, inputPackageVersion)
    packageVersion = getVersionName(ressourceId, versionId)
    packageDownloadName = f"{packageNameNew}-{packageVersion}.jar"
+    if not configValues.localPluginFolder:
+        downloadPackagePath = f"{downloadPath}/{packageDownloadName}"
+    else:
    downloadPackagePath = Path(f"{downloadPath}/{packageDownloadName}")
-    if configValues.localPluginFolder:
-        if inputPackageVersion is None or inputPackageVersion == 'latest':
-            downloadSpecificVersion(ressourceId=ressourceId, downloadPath=downloadPackagePath)
-        else:
-            downloadSpecificVersion(ressourceId, downloadPackagePath, versionId)
+    if inputPackageVersion is None or inputPackageVersion == 'latest':
+        downloadSpecificVersion(ressourceId=ressourceId, downloadPath=downloadPackagePath)
+    else:
+        downloadSpecificVersion(ressourceId, downloadPackagePath, versionId)

    if not configValues.localPluginFolder:
-        if inputPackageVersion is None or inputPackageVersion == 'latest':
-            downloadSpecificVersion(ressourceId=ressourceId, downloadPath=downloadPackagePath)
-            deleteTempPluginFolder(downloadPath)
-        else:
-            downloadSpecificVersion(ressourceId, downloadPackagePath, versionId)
-            deleteTempPluginFolder(downloadPath)
+        deleteTempPluginFolder(downloadPath)
--- a/src/plugin/plugin_remover.py
+++ b/src/plugin/plugin_remover.py
@@ -5,6 +5,7 @@ from pathlib import Path
 from utils.consoleoutput import oColors
 from handlers.handle_config import configurationValues
 from handlers.handle_sftp import createSFTPConnection, sftp_listAll
+from handlers.handle_ftp import createFTPConnection, ftp_listAll
 from plugin.plugin_updatechecker import getFileName, getFileVersion, getInstalledPlugin, createPluginList


@@ -12,8 +13,12 @@ def removePlugin(pluginToRemove):
    configValues = configurationValues()
    createPluginList()
    if not configValues.localPluginFolder:
-        sftp = createSFTPConnection()
-        pluginList = sftp_listAll(sftp)
+        if not configValues.sftp_useSftp:
+            ftp = createFTPConnection()
+            pluginList = ftp_listAll(ftp)
+        else:
+            sftp = createSFTPConnection()
+            pluginList = sftp_listAll(sftp)
    else:
        pluginList = os.listdir(configValues.pathToPluginFolder)
    i = 0
@@ -32,8 +37,12 @@ def removePlugin(pluginToRemove):
                if not configValues.localPluginFolder:
                    pluginPath = configValues.sftp_folderPath
                    pluginPath = f"{pluginPath}/{plugin}"
-                    sftp = createSFTPConnection()
-                    sftp.remove(pluginPath)
+                    if not configValues.sftp_useSftp:
+                        ftp = createFTPConnection()
+                        ftp.delete(pluginPath)
+                    else:
+                        sftp = createSFTPConnection()
+                        sftp.remove(pluginPath)
                    print(f"Removed: {fileName}")
                    i += 1
                    break
--- a/src/plugin/plugin_updatechecker.py
+++ b/src/plugin/plugin_updatechecker.py
@@ -9,8 +9,10 @@ from rich.progress import track
 from utils.consoleoutput import oColors
 from utils.web_request import doAPIRequest
 from handlers.handle_config import configurationValues
-from handlers.handle_sftp import createSFTPConnection, sftp_listAll
+from handlers.handle_sftp import createSFTPConnection, sftp_listAll, sftp_downloadFile
+from handlers.handle_ftp import createFTPConnection, ftp_listAll, ftp_downloadFile
 from plugin.plugin_downloader import getSpecificPackage
+from utils.utilities import createTempPluginFolder, deleteTempPluginFolder


 def createPluginList():
@@ -66,10 +68,19 @@ def compareVersions(plugin_latest_version, pluginVersion):
 def eggCrackingJar(localJarFileName):
    configValues = configurationValues()
    if not configValues.localPluginFolder:
-        pluginPath = configValues.sftp_folderPath
+        if configValues.sftp_useSftp:
+            tempPluginFolderPath = createTempPluginFolder()
+            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)
    else:
        pluginPath = configValues.pathToPluginFolder
-    pathToPluginJar = Path(f"{pluginPath}/{localJarFileName}")
+        pathToPluginJar = Path(f"{pluginPath}/{localJarFileName}")
    pluginVersion = ''
    with ZipFile(pathToPluginJar, 'r') as pluginJar:
        try:
@@ -83,6 +94,8 @@ def eggCrackingJar(localJarFileName):

        except FileNotFoundError:
            pluginVersion = ''
+    if not configValues.localPluginFolder:
+        deleteTempPluginFolder(tempPluginFolderPath)
    return pluginVersion


@@ -90,8 +103,12 @@ def checkInstalledPackage(inputSelectedObject="all"):
    configValues = configurationValues()
    createPluginList()
    if not configValues.localPluginFolder:
-        sftp = createSFTPConnection()
-        pluginList = sftp_listAll(sftp)
+        if configValues.sftp_useSftp:
+            connection = createSFTPConnection()
+            pluginList = sftp_listAll(connection)
+        else:
+            connection = createFTPConnection()
+            pluginList = ftp_listAll(connection)
    else:
        pluginList = os.listdir(configValues.pathToPluginFolder)
    i = 0
@@ -164,8 +181,12 @@ def updateInstalledPackage(inputSelectedObject='all'):
    configValues = configurationValues()
    createPluginList()
    if not configValues.localPluginFolder:
-        sftp = createSFTPConnection()
-        pluginList = sftp_listAll(sftp)
+        if configValues.sftp_useSftp:
+            connection = createSFTPConnection()
+            pluginList = sftp_listAll(connection)
+        else:
+            connection = createFTPConnection()
+            pluginList = ftp_listAll(connection)
    else:
        pluginList = os.listdir(configValues.pathToPluginFolder)
    i = 0
@@ -198,7 +219,6 @@ def updateInstalledPackage(inputSelectedObject='all'):
                    print("  ", end='')
                    print(f"{fileName}".ljust(33), end='')
                    print(f"{fileVersion}".ljust(13), end='')
-                    #print("     ", end='')
                    print(f"{latestVersion}".ljust(13))

                    if not configValues.localPluginFolder:
@@ -248,27 +268,45 @@ def updateInstalledPackage(inputSelectedObject='all'):
                    print("  ", end='')
                    print(f"{fileName}".ljust(33), end='')
                    print(f"{fileVersion}".ljust(13), end='')
-                    #print("     ", end='')
                    print(f"{latestVersion}".ljust(13))

                    if not configValues.localPluginFolder:
-                        if configValues.sftp_seperateDownloadPath is True:
-                            pluginPath = configValues.sftp_pathToSeperateDownloadPath
+                        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
+                            try:
+                                getSpecificPackage(pluginId, configValues.sftp_folderPath)
+                                if configValues.sftp_seperateDownloadPath is False:
+                                    sftp.remove(pluginPath)
+                            except HTTPError as err:
+                                print(oColors.brightRed +  f"HTTPError: {err.code} - {err.reason}" + oColors.standardWhite)
+                                pluginsUpdated -= 1
+                            except FileNotFoundError:
+                                print(oColors.brightRed +  f"FileNotFoundError: Old plugin file coulnd't be deleted" + oColors.standardWhite)
                        else:
-                            pluginPath = configValues.sftp_folderPath
-                        pluginPath = f"{pluginPath}/{plugin}"
-                        sftp = createSFTPConnection()
-                        indexNumberUpdated += 1
-                        pluginsUpdated += 1
-                        try:
-                            getSpecificPackage(pluginId, configValues.sftp_folderPath)
-                            if configValues.sftp_seperateDownloadPath is False:
-                                sftp.remove(pluginPath)
-                        except HTTPError as err:
-                            print(oColors.brightRed +  f"Error: {err.code} - {err.reason}" + oColors.standardWhite)
-                            pluginsUpdated -= 1
-                        except FileNotFoundError:
-                            print(oColors.brightRed +  f"Error: Old plugin file coulnd't be deleted" + oColors.standardWhite)
+                            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)
+                                if configValues.sftp_seperateDownloadPath is False:
+                                    ftp.delete(pluginPath)
+                            except HTTPError as err:
+                                print(oColors.brightRed +  f"HTTPError: {err.code} - {err.reason}" + oColors.standardWhite)
+                                pluginsUpdated -= 1
+                            except FileNotFoundError:
+                                print(oColors.brightRed +  f"FileNotFoundError: Old plugin file coulnd't be deleted" + oColors.standardWhite)

                    else:
                        if configValues.seperateDownloadPath is True:
@@ -282,11 +320,11 @@ def updateInstalledPackage(inputSelectedObject='all'):
                            getSpecificPackage(pluginId, configValues.pathToPluginFolder)
                            if configValues.seperateDownloadPath is False:
                                os.remove(pluginPath)
-                        except HTTPError as err:
-                            print(oColors.brightRed +  f"Error: {err.code} - {err.reason}" + oColors.standardWhite)
-                            pluginsUpdated -= 1
+                        #except HTTPError as err:
+                        #    print(oColors.brightRed +  f"HTTPError: {err.code} - {err.reason}" + oColors.standardWhite)
+                        #    pluginsUpdated -= 1
                        except FileNotFoundError:
-                            print(oColors.brightRed +  f"Error: Old plugin file coulnd't be deleted" + oColors.standardWhite)
+                            print(oColors.brightRed +  f"FileNotFoundError: Old plugin file coulnd't be deleted" + oColors.standardWhite)

            i = i + 1
    except TypeError: