Mirrored_Repos/pluGET
1
0
Fork 0
mirror of https://github.com/Neocky/pluGET.git synced 2024-04-29 16:12:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added conformation for updateing and fixed serverjar issues

Browse Source 
Changes:
- updated paper checker to 1.17
- added conformation when updating plugins
- added error handling
- added changlog as optional param for the check command
- fixed problems with paper updated
- updated help
- removed debug output
- removed unnecesary commnents
This commit is contained in:
Neocky 2021-06-20 00:36:36 +02:00
parent 456a0e185a
commit 2a416bbbc2
4 changed files with 61 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/handlers/handle_input.py
View File

@ -61,7 +61,7 @@ def handleInput(inputCommand, inputSelectedObject, inputParams):
if inputSelectedObject == 'serverjar': if inputSelectedObject == 'serverjar':
checkInstalledServerjar() checkInstalledServerjar()
else: else:
checkInstalledPackage(inputSelectedObject) checkInstalledPackage(inputSelectedObject, inputParams)
break break
if inputCommand == 'search': if inputCommand == 'search':
searchPackage(inputSelectedObject) searchPackage(inputSelectedObject)

128
src/plugin/plugin_updatechecker.py
View File

@ -130,7 +130,7 @@ def eggCrackingJar(localJarFileName, searchMode):
return pluginName return pluginName
def checkInstalledPackage(inputSelectedObject="all"): def checkInstalledPackage(inputSelectedObject="all", inputOptionalParam=None):
configValues = configurationValues() configValues = configurationValues()
createPluginList() createPluginList()
pluginFolderPath = configValues.pathToPluginFolder pluginFolderPath = configValues.pathToPluginFolder
@ -147,6 +147,8 @@ def checkInstalledPackage(inputSelectedObject="all"):
i = 0 i = 0
oldPlugins = 0 oldPlugins = 0
print(oColors.brightBlack + f"Checking: {inputSelectedObject}" + oColors.standardWhite) print(oColors.brightBlack + f"Checking: {inputSelectedObject}" + oColors.standardWhite)
if inputOptionalParam != "changelog":
print(oColors.brightBlack + f"Use 'check {inputSelectedObject} changelog' to get the latest changelog from plugins" + oColors.standardWhite)
print("┌─────┬────────────────────────────────┬──────────────┬──────────────┬───────────────────┐") print("┌─────┬────────────────────────────────┬──────────────┬──────────────┬───────────────────┐")
print("│ No. │ Name │ Installed V. │ Latest V. │ Update available │") print("│ No. │ Name │ Installed V. │ Latest V. │ Update available │")
print("└─────┴────────────────────────────────┴──────────────┴──────────────┴───────────────────┘") print("└─────┴────────────────────────────────┴──────────────┴──────────────┴───────────────────┘")
@ -172,12 +174,10 @@ def checkInstalledPackage(inputSelectedObject="all"):
if not re.search(r'.jar$', plugin): if not re.search(r'.jar$', plugin):
continue continue
try: try:
print(plugin)
fileName = getFileName(plugin) fileName = getFileName(plugin)
fileVersion = getFileVersion(plugin) fileVersion = getFileVersion(plugin)
pluginId = getInstalledPlugin(fileName, fileVersion, plugin) pluginId = getInstalledPlugin(fileName, fileVersion, plugin)
except TypeError: except TypeError:
print("typeerror")
continue continue
pluginIdStr = str(pluginId) pluginIdStr = str(pluginId)
@ -226,10 +226,11 @@ def checkInstalledPackage(inputSelectedObject="all"):
print(f"{fileVersion}".ljust(15), end='') print(f"{fileVersion}".ljust(15), end='')
print(f"{pluginLatestVersion}".ljust(15), end='') print(f"{pluginLatestVersion}".ljust(15), end='')
print(f"{pluginIsOutdated}".ljust(5) + oColors.standardWhite) print(f"{pluginIsOutdated}".ljust(5) + oColors.standardWhite)
if (pluginLatestVersion != 'N/A'): if (inputOptionalParam == "changelog" and pluginLatestVersion != 'N/A'):
print(oColors.brightYellow + "CHANGELOG:" + oColors.standardWhite) print(oColors.brightYellow + f"CHANGELOG {fileName}:" + oColors.standardWhite)
description = getUpdateDescription(pluginId) description = getUpdateDescription(pluginId)
print(description) print(description)
print()
if inputSelectedObject == pluginIdStr or re.search(inputSelectedObject, fileName, re.IGNORECASE): if inputSelectedObject == pluginIdStr or re.search(inputSelectedObject, fileName, re.IGNORECASE):
break break
else: else:
@ -240,18 +241,37 @@ def checkInstalledPackage(inputSelectedObject="all"):
except TypeError: except TypeError:
print(oColors.brightRed + "Error occured: Aborted checking for updates." + oColors.standardWhite) print(oColors.brightRed + "Error occured: Aborted checking for updates." + oColors.standardWhite)
print(oColors.brightYellow + f"Outdated plugins: [{oldPlugins}/{i}]" + oColors.standardWhite) print(oColors.brightYellow + f"Outdated plugins: [{oldPlugins}/{i}]" + oColors.standardWhite)
print(f" Ganzes Array: {INSTALLEDPLUGINLIST}")
i -= 1
print(INSTALLEDPLUGINLIST[3][0])
temp = INSTALLEDPLUGINLIST[i][0]
temp = getFileName(temp)
print(temp)
def updateInstalledPackage(inputSelectedObject='all'): def updateInstalledPackage(inputSelectedObject='all'):
configValues = configurationValues() configValues = configurationValues()
if configValues.localPluginFolder: if not configValues.localPluginFolder:
pluginFolderPath = configValues.pathToPluginFolder if configValues.sftp_useSftp:
connection = createSFTPConnection()
else:
connection = createFTPConnection()
try:
print(oColors.brightBlack + "Selected plugins:" + oColors.standardWhite)
if inputSelectedObject == "all" or inputSelectedObject == "*":
for pluginIndex in range(len(INSTALLEDPLUGINLIST)):
fileName = getFileName(INSTALLEDPLUGINLIST[pluginIndex][0])
print(fileName, end=' ')
else:
print(inputSelectedObject, end=' ')
print()
updateConfirmation = input("Update these plugins [y/n] ? ")
if updateConfirmation != "y":
print(oColors.brightRed + "Aborting the update process."+ oColors.standardWhite)
return False
except NameError:
print(oColors.brightRed + "Check for updates before updating plugins with: 'check all'" + oColors.standardWhite)
print(oColors.brightRed + "Started checking for updates..." + oColors.standardWhite)
checkInstalledPackage()
print(oColors.brightRed + f"Please input 'update {inputSelectedObject}' again!" + oColors.standardWhite)
return False
i = 0 i = 0
pluginsUpdated = 0 pluginsUpdated = 0
@ -261,8 +281,7 @@ def updateInstalledPackage(inputSelectedObject='all'):
print("│ No. │ Name │ Old V. │ New V. │") print("│ No. │ Name │ Old V. │ New V. │")
print("└─────┴────────────────────────────────┴────────────┴──────────┘") print("└─────┴────────────────────────────────┴────────────┴──────────┘")
try: try:
for pluginArray in track(INSTALLEDPLUGINLIST, description="Updating" ,transient=True, complete_style="bright_magenta"): for pluginArray in track(INSTALLEDPLUGINLIST, description="Updating" ,transient=True, complete_style="bright_magenta", ):
print(pluginArray)
plugin = INSTALLEDPLUGINLIST[i][0] plugin = INSTALLEDPLUGINLIST[i][0]
if not configValues.localPluginFolder: if not configValues.localPluginFolder:
if configValues.sftp_seperateDownloadPath is True: if configValues.sftp_seperateDownloadPath is True:
@ -281,6 +300,7 @@ def updateInstalledPackage(inputSelectedObject='all'):
i += 1 i += 1
continue continue
else: else:
pluginFolderPath = configValues.pathToPluginFolder
if not os.path.isfile(Path(f"{pluginFolderPath}/{plugin}")): if not os.path.isfile(Path(f"{pluginFolderPath}/{plugin}")):
i += 1 i += 1
continue continue
@ -289,74 +309,22 @@ def updateInstalledPackage(inputSelectedObject='all'):
continue continue
try: try:
fileName = getFileName(plugin) #getFileName(plugin) fileName = getFileName(plugin)
fileVersion = getFileVersion(plugin) fileVersion = getFileVersion(plugin)
pluginId = INSTALLEDPLUGINLIST[i][1] #getInstalledPlugin(fileName, fileVersion, plugin) pluginId = INSTALLEDPLUGINLIST[i][1]
latestVersion = INSTALLEDPLUGINLIST[i][3] #getLatestPluginVersion(pluginId) latestVersion = INSTALLEDPLUGINLIST[i][3]
except TypeError: except (TypeError, ValueError):
continue i += 1
except ValueError:
continue continue
if re.search(r'.jar$', fileName): if re.search(r'.jar$', fileName):
fileName = eggCrackingJar(plugin, "name") fileName = eggCrackingJar(plugin, "name")
print(pluginId)
pluginIdStr = str(pluginId) pluginIdStr = str(pluginId)
if pluginId == None or pluginId == '': if pluginId == None or pluginId == '':
print(oColors.brightRed + "Couldn't find plugin id. Sorry :(" + oColors.standardWhite)
i += 1 i += 1
continue continue
#if inputSelectedObject == pluginIdStr or re.search(inputSelectedObject, fileName, re.IGNORECASE):
# if INSTALLEDPLUGINLIST[i][4] == True:
# print(f" [{indexNumberUpdated+1}]".rjust(6), end='')
# print(" ", end='')
# print(f"{fileName}".ljust(33), end='')
# print(f"{fileVersion}".ljust(13), end='')
# print(f"{latestVersion}".ljust(13))
#
# if not configValues.localPluginFolder:
# if configValues.sftp_seperateDownloadPath is True:
# pluginPath = configValues.sftp_pathToSeperateDownloadPath
# else:
# pluginPath = configValues.sftp_folderPath
# pluginPath = Path(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 + "Error: Old plugin file coulnd't be deleted" + oColors.standardWhite)
# else:
# if configValues.seperateDownloadPath is True:
# pluginPath = configValues.pathToSeperateDownloadPath
# else:
# pluginPath = pluginFolderPath
# pluginPath = Path(f"{pluginPath}/{plugin}")
# indexNumberUpdated += 1
# pluginsUpdated += 1
# try:
# getSpecificPackage(pluginId, pluginFolderPath)
# 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 FileNotFoundError:
# print(oColors.brightRed + f"Error: Old plugin file coulnd't be deleted" + oColors.standardWhite)
# break
# else:
# print(f"{fileName} is already on {latestVersion}")
# print(oColors.brightRed + "Aborting the update process."+ oColors.standardWhite)
# break
if inputSelectedObject == 'all' or inputSelectedObject == pluginIdStr or re.search(inputSelectedObject, fileName, re.IGNORECASE): if inputSelectedObject == 'all' or inputSelectedObject == pluginIdStr or re.search(inputSelectedObject, fileName, re.IGNORECASE):
if INSTALLEDPLUGINLIST[i][4] == True: if INSTALLEDPLUGINLIST[i][4] == True:
print(f" [{indexNumberUpdated+1}]".rjust(6), end='') print(f" [{indexNumberUpdated+1}]".rjust(6), end='')
@ -364,7 +332,6 @@ def updateInstalledPackage(inputSelectedObject='all'):
print(f"{fileName}".ljust(33), end='') print(f"{fileName}".ljust(33), end='')
print(f"{fileVersion}".ljust(13), end='') print(f"{fileVersion}".ljust(13), end='')
print(f"{latestVersion}".ljust(13)) print(f"{latestVersion}".ljust(13))
if not configValues.localPluginFolder: if not configValues.localPluginFolder:
if configValues.sftp_useSftp: if configValues.sftp_useSftp:
if configValues.sftp_seperateDownloadPath is True: if configValues.sftp_seperateDownloadPath is True:
@ -423,17 +390,24 @@ def updateInstalledPackage(inputSelectedObject='all'):
if inputSelectedObject != 'all': if inputSelectedObject != 'all':
break break
elif inputSelectedObject != 'all': elif inputSelectedObject != 'all':
print(f"{fileName} is already on {latestVersion}") print(oColors.brightGreen + f"{fileName} is already on {latestVersion}" + oColors.standardWhite)
print(oColors.brightRed + "Aborting the update process."+ oColors.standardWhite) print(oColors.brightRed + "Aborting the update process."+ oColors.standardWhite)
break break
else: else:
print(oColors.brightRed + "Wrong input! Use 'update all' to update every plugin." + oColors.standardWhite) i += 1
continue
i += 1 i += 1
except TypeError: except TypeError:
print(oColors.brightRed + "Error occured: Aborted updating plugins." + oColors.standardWhite) print(oColors.brightRed + "Error occured: Aborted updating plugins." + oColors.standardWhite)
print(oColors.brightYellow + f"Plugins updated: [{pluginsUpdated}/{i}]" + oColors.standardWhite) except NameError:
if inputSelectedObject =='all' and pluginsUpdated == 0: print(oColors.brightRed + "Check for updates before updating plugins with: 'check all'" + oColors.standardWhite)
print(oColors.brightRed + "Started checking for updates..." + oColors.standardWhite)
checkInstalledPackage()
print(oColors.brightRed + f"Please input 'update {inputSelectedObject}' again!" + oColors.standardWhite)
if i != 0:
print(oColors.brightYellow + f"Plugins updated: [{pluginsUpdated}/{i}]" + oColors.standardWhite)
if inputSelectedObject =='all' and pluginsUpdated == 0 and i != 0:
print(oColors.brightGreen + "All found plugins are on the latest version!" + oColors.standardWhite) print(oColors.brightGreen + "All found plugins are on the latest version!" + oColors.standardWhite)

24
src/serverjar/serverjar_paper.py
View File

@ -1,5 +1,3 @@
import os
import sys
import re import re
import urllib.request import urllib.request
from pathlib import Path from pathlib import Path
@ -13,7 +11,6 @@ from handlers.handle_config import configurationValues
from utils.utilities import createTempPluginFolder, deleteTempPluginFolder, calculateFileSizeMb from utils.utilities import createTempPluginFolder, deleteTempPluginFolder, calculateFileSizeMb
# = 1.16.5
def getInstalledPaperMinecraftVersion(localPaperName): def getInstalledPaperMinecraftVersion(localPaperName):
if localPaperName is None: if localPaperName is None:
return False return False
@ -25,7 +22,6 @@ def getInstalledPaperMinecraftVersion(localPaperName):
return mcVersion return mcVersion
# = 550
def getInstalledPaperVersion(localPaperName): def getInstalledPaperVersion(localPaperName):
if localPaperName is None: if localPaperName is None:
return False return False
@ -39,7 +35,7 @@ def getInstalledPaperVersion(localPaperName):
def findVersionGroup(mcVersion): def findVersionGroup(mcVersion):
versionGroups = ['1.16', '1.15'] versionGroups = ['1.17', '1.16', '1.15']
if mcVersion is None: if mcVersion is None:
return False return False
for versionGroup in versionGroups: for versionGroup in versionGroups:
@ -57,7 +53,7 @@ def findVersionGroup(mcVersion):
def findBuildVersion(wantedPaperBuild): def findBuildVersion(wantedPaperBuild):
versionGroups = ['1.16', '1.15'] versionGroups = ['1.17', '1.16', '1.15']
if wantedPaperBuild is None: if wantedPaperBuild is None:
return False return False
for versionGroup in versionGroups: for versionGroup in versionGroups:
@ -93,7 +89,7 @@ def findLatestBuildForVersion(mcVersion):
def versionBehind(installedPaperBuild, latestPaperBuild): def versionBehind(installedPaperBuild, latestPaperBuild):
if installedPaperBuild or latestPaperBuild is None: if installedPaperBuild is None or latestPaperBuild is None:
return False return False
installedPaperBuildint = int(installedPaperBuild) installedPaperBuildint = int(installedPaperBuild)
latestPaperBuildint = int(latestPaperBuild) latestPaperBuildint = int(latestPaperBuild)
@ -102,7 +98,7 @@ def versionBehind(installedPaperBuild, latestPaperBuild):
def getDownloadFileName(paperMcVersion, paperBuild): def getDownloadFileName(paperMcVersion, paperBuild):
if paperMcVersion or paperBuild is None: if paperMcVersion is None or paperBuild is None:
return False return False
url = f"https://papermc.io/api/v2/projects/paper/versions/{paperMcVersion}/builds/{paperBuild}" url = f"https://papermc.io/api/v2/projects/paper/versions/{paperMcVersion}/builds/{paperBuild}"
buildDetails = doAPIRequest(url) buildDetails = doAPIRequest(url)
@ -120,7 +116,6 @@ def paperCheckForUpdate(installedServerjarFullName):
return False return False
paperInstalledBuild = getInstalledPaperVersion(installedServerjarFullName) paperInstalledBuild = getInstalledPaperVersion(installedServerjarFullName)
# Report an error if getInstalledPaperVersion encountered an issue. # Report an error if getInstalledPaperVersion encountered an issue.
if not paperInstalledBuild: if not paperInstalledBuild:
print(oColors.brightRed + f"ERR: An error was encountered while detecting the server's Paper version." + print(oColors.brightRed + f"ERR: An error was encountered while detecting the server's Paper version." +
@ -128,7 +123,6 @@ def paperCheckForUpdate(installedServerjarFullName):
return False return False
versionGroup = findVersionGroup(mcVersion) versionGroup = findVersionGroup(mcVersion)
# Report an error if findVersionGroup encountered an issue. # Report an error if findVersionGroup encountered an issue.
if not versionGroup: if not versionGroup:
print(oColors.brightRed + f"ERR: An error was encountered while fetching the server's version group." + print(oColors.brightRed + f"ERR: An error was encountered while fetching the server's version group." +
@ -136,7 +130,6 @@ def paperCheckForUpdate(installedServerjarFullName):
return False return False
paperLatestBuild = findLatestBuild(versionGroup) paperLatestBuild = findLatestBuild(versionGroup)
# Report an error if findLatestBuild encountered an issue. # Report an error if findLatestBuild encountered an issue.
if not paperLatestBuild: if not paperLatestBuild:
print(oColors.brightRed + f"ERR: An error was encountered while fetching the latest version of PaperMC." + print(oColors.brightRed + f"ERR: An error was encountered while fetching the latest version of PaperMC." +
@ -145,17 +138,16 @@ def paperCheckForUpdate(installedServerjarFullName):
# being printed. # being printed.
paperVersionBehind = versionBehind(paperInstalledBuild, paperLatestBuild) paperVersionBehind = versionBehind(paperInstalledBuild, paperLatestBuild)
# Report an error if getInstalledPaperVersion encountered an issue. # Report an error if getInstalledPaperVersion encountered an issue.
if not paperVersionBehind: if not paperVersionBehind:
print(oColors.brightRed + f"ERR: An error was encountered while detecting how many versions behind you are. " print(oColors.brightRed + f"ERR: An error was encountered while detecting how many versions behind you are. "
f"Will display as 'N/A'." + oColors.standardWhite) f"Will display as 'N/A'." + oColors.standardWhite)
print(paperVersionBehind)
paperVersionBehind = "N/A" # Sets paperVersionBehind to N/A while still letting the versionBehind check return paperVersionBehind = "N/A" # Sets paperVersionBehind to N/A while still letting the versionBehind check return
# # False for error-handing reasons. # False for error-handing reasons.
# Does not return false as versions behind doesn't break things. It is just helpful information. # Does not return false as versions behind doesn't break things. It is just helpful information.
# paperVersionBehind will just display as "N/A" # paperVersionBehind will just display as "N/A"
print("┌─────┬────────────────────────────────┬──────────────┬──────────────┬───────────────────┐") print("┌─────┬────────────────────────────────┬──────────────┬──────────────┬───────────────────┐")
print("│ No. │ Name │ Installed V. │ Latest V. │ Versions behind │") print("│ No. │ Name │ Installed V. │ Latest V. │ Versions behind │")
print("└─────┴────────────────────────────────┴──────────────┴──────────────┴───────────────────┘") print("└─────┴────────────────────────────────┴──────────────┴──────────────┴───────────────────┘")
@ -181,7 +173,7 @@ def papermc_downloader(paperBuild='latest', installedServerjarName=None, mcVersi
if mcVersion == None: if mcVersion == None:
if paperBuild == 'latest': if paperBuild == 'latest':
mcVersion = '1.16.5' mcVersion = '1.17'
else: else:
mcVersion = findBuildVersion(paperBuild) mcVersion = findBuildVersion(paperBuild)
@ -199,11 +191,11 @@ def papermc_downloader(paperBuild='latest', installedServerjarName=None, mcVersi
downloadFileName = getDownloadFileName(mcVersion, paperBuild) downloadFileName = getDownloadFileName(mcVersion, paperBuild)
downloadPackagePath = Path(f"{downloadPath}/{downloadFileName}") downloadPackagePath = Path(f"{downloadPath}/{downloadFileName}")
if configValues.localPluginFolder == False: if configValues.localPluginFolder == False:
downloadPath = createTempPluginFolder() downloadPath = createTempPluginFolder()
url = f"https://papermc.io/api/v2/projects/paper/versions/{mcVersion}/builds/{paperBuild}/downloads/{downloadFileName}" url = f"https://papermc.io/api/v2/projects/paper/versions/{mcVersion}/builds/{paperBuild}/downloads/{downloadFileName}"
print(url)
remotefile = urllib.request.urlopen(url) remotefile = urllib.request.urlopen(url)
filesize = remotefile.info()['Content-Length'] filesize = remotefile.info()['Content-Length']
print(f"Getting Paper {paperBuild} for {mcVersion}") print(f"Getting Paper {paperBuild} for {mcVersion}")

2
src/utils/utilities.py
View File

@ -35,7 +35,7 @@ def getCommandHelp(optionalParams):
print(" help command all/command Get specific help to the commands of pluGET") print(" help command all/command Get specific help to the commands of pluGET")
print(oColors.brightBlack + " PLUGIN MANAGEMENT:" + oColors.standardWhite) print(oColors.brightBlack + " PLUGIN MANAGEMENT:" + oColors.standardWhite)
print(" get Name/ID Version Downloads the latest version of a plugin") print(" get Name/ID Version Downloads the latest version of a plugin")
print(" check Name/ID/all Check for an update of an installed plugin") print(" check Name/ID/all changelog Check for an update of an installed plugin")
print(" update Name/ID/all Update installed plugins to the latest version") print(" update Name/ID/all Update installed plugins to the latest version")
print(" search Name Search for a plugin and download the latest version") print(" search Name Search for a plugin and download the latest version")
print(" remove Name/ID Delete an installed plugin") print(" remove Name/ID Delete an installed plugin")