Merge pull request #45 from ProfessorSniff/#!/bin/sh

add shebang to launcher.sh
2024-04-29 16:12:30 +00:00 · 2021-12-05 16:53:44 +01:00 · 2021-12-03 04:02:24 +00:00 · 2021-08-26 19:24:17 +02:00
2 changed files with 12 additions and 4 deletions
--- a/launcher.sh
+++ b/launcher.sh
@@ -1,2 +1,3 @@
+#!/bin/sh
 cd src/
-python3 "__main__.py"
+python3 "__main__.py"
--- a/src/plugin/plugin_downloader.py
+++ b/src/plugin/plugin_downloader.py
@@ -21,8 +21,11 @@ def handleRegexPackageName(packageNameFull):
        packageNameFull2 = packageNameFull.replace(unwantedpackageNameString, '')
    # gets the real packagename "word1 & word2" is not supported only gets word 1
    packageName = re.search(r'([a-zA-Z]\d*)+(\s?\-*\_*[a-zA-Z]\d*\+*\-*\'*)+', packageNameFull2)
-    packageNameFullString = packageName.group()
-    packageNameOnly = packageNameFullString.replace(' ', '')
+    try:
+        packageNameFullString = packageName.group()
+        packageNameOnly = packageNameFullString.replace(' ', '')
+    except AttributeError:
+        packageNameOnly = unwantedpackageNameString
    return packageNameOnly


@@ -133,7 +136,11 @@ def getSpecificPackage(resourceId, downloadPath, inputPackageVersion='latest'):
        downloadPath = createTempPluginFolder()
    url = f"https://api.spiget.org/v2/resources/{resourceId}"
    packageDetails = doAPIRequest(url)
-    packageName = packageDetails["name"]
+    try:
+        packageName = packageDetails["name"]
+    except KeyError:
+        print(oColors.brightRed +  "Error: Plugin ID couldn't be found" + oColors.standardWhite)
+        return None
    packageNameNew = handleRegexPackageName(packageName)
    versionId = getVersionID(resourceId, inputPackageVersion)
    packageVersion = getVersionName(resourceId, versionId)
Author	SHA1	Message	Date
Neocky	cf710088a9	Merge pull request #45 from ProfessorSniff/#!/bin/sh add shebang to launcher.sh	2021-12-05 16:53:44 +01:00
ProfessorSniff	b1b5eeb992	add shebang to launcher.sh	2021-12-03 04:02:24 +00:00
Neocky	3bcb3de4cf	Fixed error when searching for plugins Changes: - fixed bug when searching for plugins where the name couldn't be sanitized - fixed bug when searching for plugins with numbers in name	2021-08-26 19:24:17 +02:00