mirror of
https://github.com/jxxghp/MoviePilot.git
synced 2026-09-05 07:27:15 +08:00
fix(plugin): handle 404 plugin index and None response safely
This commit is contained in:
+11
-3
@@ -86,8 +86,12 @@ class PluginHelper(metaclass=WeakSingleton):
|
|||||||
package_url = f"{raw_url}package.{package_version}.json" if package_version else f"{raw_url}package.json"
|
package_url = f"{raw_url}package.{package_version}.json" if package_version else f"{raw_url}package.json"
|
||||||
|
|
||||||
res = self.__request_with_fallback(package_url, headers=settings.REPO_GITHUB_HEADERS(repo=f"{user}/{repo}"))
|
res = self.__request_with_fallback(package_url, headers=settings.REPO_GITHUB_HEADERS(repo=f"{user}/{repo}"))
|
||||||
if res is None or res.status_code != 200:
|
if res is None:
|
||||||
return {} if res.status_code == 404 else None
|
return None
|
||||||
|
if res.status_code == 404:
|
||||||
|
return {}
|
||||||
|
if res.status_code != 200:
|
||||||
|
return None
|
||||||
return self.__parse_plugin_index_response(res.text)
|
return self.__parse_plugin_index_response(res.text)
|
||||||
|
|
||||||
def get_plugin_package_version(self, pid: str, repo_url: str,
|
def get_plugin_package_version(self, pid: str, repo_url: str,
|
||||||
@@ -991,7 +995,11 @@ class PluginHelper(metaclass=WeakSingleton):
|
|||||||
|
|
||||||
res = await self.__async_request_with_fallback(package_url,
|
res = await self.__async_request_with_fallback(package_url,
|
||||||
headers=settings.REPO_GITHUB_HEADERS(repo=f"{user}/{repo}"))
|
headers=settings.REPO_GITHUB_HEADERS(repo=f"{user}/{repo}"))
|
||||||
if res is None or res.status_code != 200:
|
if res is None:
|
||||||
|
return None
|
||||||
|
if res.status_code == 404:
|
||||||
|
return {}
|
||||||
|
if res.status_code != 200:
|
||||||
return None
|
return None
|
||||||
return self.__parse_plugin_index_response(res.text)
|
return self.__parse_plugin_index_response(res.text)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user