From 0b10a76a3b19a9d254552d4fa55b188164c2a2ba Mon Sep 17 00:00:00 2001 From: Jan-Luca Bogdan | BEL NET GmbH Date: Wed, 29 Jun 2022 16:00:55 +0200 Subject: [PATCH] Added version lookup for egg_cracking_jar --- src/plugin/plugin_downloader.py | 2 +- src/plugin/plugin_updatechecker.py | 18 +++++++++++------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/plugin/plugin_downloader.py b/src/plugin/plugin_downloader.py index 817ebce..93a9590 100644 --- a/src/plugin/plugin_downloader.py +++ b/src/plugin/plugin_downloader.py @@ -143,7 +143,7 @@ def download_specific_plugin_version_spiget(plugin_id, download_path, version_id file_size_data = convert_file_size_down(file_size) console.print(" [not bold][bright_green]Downloaded[bright_magenta] " + (str(file_size_data)).rjust(9) + \ f" KB [cyan]→ [white]{download_path}") - # TODO add sftp and ftp support + if config_values.connection == "sftp": sftp_session = sftp_create_connection() sftp_upload_file(sftp_session, download_path) diff --git a/src/plugin/plugin_updatechecker.py b/src/plugin/plugin_updatechecker.py index 6c45691..cdcf3b3 100644 --- a/src/plugin/plugin_updatechecker.py +++ b/src/plugin/plugin_updatechecker.py @@ -243,14 +243,11 @@ def egg_cracking_jar(plugin_file_name: str) -> str: if re.match(r"^\s*?name: ", line): plugin_name = re.sub(r'^\s*?name: ', '', line) plugin_name = plugin_name.replace("\n", "").replace("'", "").replace('"', "") - #plugin_name = plugin_name.replace("'", '') - #plugin_name = plugin_name.replace('"', '') if re.match(r"^\s*?version: ", line): - plugin_verson = re.sub(r'^\s*?version: ', '', line) - plugin_verson = plugin_verson.replace('\n', '').replace("'", "").replace('"', "") - #pluginVersion = pluginVersion.replace("'", '') - #pluginVersion = pluginVersion.replace('"', '') + plugin_version = re.sub(r'^\s*?version: ', "", line) + plugin_version = plugin_version.replace("\n", "").replace("'", "").replace('"', "") + except FileNotFoundError: plugin_name = plugin_version = "" except KeyError: @@ -523,7 +520,7 @@ def search_plugin_spiget(plugin_file: str, plugin_file_name: str, plugin_file_ve url = f"https://api.spiget.org/v2/search/resources/{plugin_file_name}?field=name&sort=-downloads" plugin_list = api_do_request(url) plugin_file_version2 = plugin_file_version - for i in range(3): + for i in range(4): if i == 1: plugin_file_version2 = re.sub(r'(\-\w*)', '', plugin_file_version) if i == 2: @@ -537,6 +534,11 @@ def search_plugin_spiget(plugin_file: str, plugin_file_name: str, plugin_file_ve if plugin_list is None: continue + # search with version which is in plugin.yml for the plugin + if i == 3: + plugin_file_version2 = plugin_version_in_yml + + for plugin in plugin_list: plugin_id = plugin["id"] url2 = f"https://api.spiget.org/v2/resources/{plugin_id}/versions?size=100&sort=-name" @@ -544,6 +546,8 @@ def search_plugin_spiget(plugin_file: str, plugin_file_name: str, plugin_file_ve plugin_versions = api_do_request(url2) except ValueError: continue + if plugin_versions is None: + continue for updates in plugin_versions: update_version_name = updates["name"] if plugin_file_version2 in update_version_name: