mirror of
https://github.com/sotam0316/docker-py-revanced.git
synced 2026-04-25 03:48:37 +09:00
♻️ Removed Any from mypy
This commit is contained in:
+8
-8
@@ -4,7 +4,7 @@ from concurrent.futures import ThreadPoolExecutor
|
|||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from queue import PriorityQueue
|
from queue import PriorityQueue
|
||||||
from time import perf_counter
|
from time import perf_counter
|
||||||
from typing import Any, Tuple
|
from typing import Tuple
|
||||||
|
|
||||||
import requests
|
import requests
|
||||||
from environs import Env
|
from environs import Env
|
||||||
@@ -114,12 +114,12 @@ class Downloader(object):
|
|||||||
download_url = self.apk_mirror + sub_url
|
download_url = self.apk_mirror + sub_url
|
||||||
return download_url
|
return download_url
|
||||||
|
|
||||||
def __upto_down_downloader(self, app: str) -> Any:
|
def __upto_down_downloader(self, app: str) -> str:
|
||||||
page = "https://spotify.en.uptodown.com/android/download"
|
page = "https://spotify.en.uptodown.com/android/download"
|
||||||
parser = LexborHTMLParser(self.session.get(page).text)
|
parser = LexborHTMLParser(self.session.get(page).text)
|
||||||
main_page = parser.css_first("#detail-download-button")
|
main_page = parser.css_first("#detail-download-button")
|
||||||
download_url = main_page.attributes["data-url"]
|
download_url = main_page.attributes["data-url"]
|
||||||
app_version = parser.css_first(".version").text()
|
app_version: str = parser.css_first(".version").text()
|
||||||
self._download(download_url, "spotify.apk")
|
self._download(download_url, "spotify.apk")
|
||||||
logger.debug(f"Downloaded {app} apk from apkmirror_specific_version in rt")
|
logger.debug(f"Downloaded {app} apk from apkmirror_specific_version in rt")
|
||||||
return app_version
|
return app_version
|
||||||
@@ -134,7 +134,7 @@ class Downloader(object):
|
|||||||
logger.debug(f"Downloaded {app} apk from apkmirror_specific_version")
|
logger.debug(f"Downloaded {app} apk from apkmirror_specific_version")
|
||||||
return version
|
return version
|
||||||
|
|
||||||
def apkmirror_latest_version(self, app: str) -> Any:
|
def apkmirror_latest_version(self, app: str) -> str:
|
||||||
logger.debug(f"Trying to download {app}'s latest version from apkmirror")
|
logger.debug(f"Trying to download {app}'s latest version from apkmirror")
|
||||||
page = self.apk_mirror_urls.get(app)
|
page = self.apk_mirror_urls.get(app)
|
||||||
if not page:
|
if not page:
|
||||||
@@ -150,7 +150,7 @@ class Downloader(object):
|
|||||||
sys.exit(-1)
|
sys.exit(-1)
|
||||||
int_version = match.start()
|
int_version = match.start()
|
||||||
extra_release = main_page.rfind("release") - 1
|
extra_release = main_page.rfind("release") - 1
|
||||||
version = main_page[int_version:extra_release]
|
version: str = main_page[int_version:extra_release]
|
||||||
version = version.replace("-", ".")
|
version = version.replace("-", ".")
|
||||||
main_page = f"{self.apk_mirror}{main_page}"
|
main_page = f"{self.apk_mirror}{main_page}"
|
||||||
parser = LexborHTMLParser(self.session.get(main_page).text)
|
parser = LexborHTMLParser(self.session.get(main_page).text)
|
||||||
@@ -188,16 +188,16 @@ class Downloader(object):
|
|||||||
executor.map(lambda repo: self.repository(*repo), assets)
|
executor.map(lambda repo: self.repository(*repo), assets)
|
||||||
logger.info("Downloaded revanced microG ,cli, integrations and patches.")
|
logger.info("Downloaded revanced microG ,cli, integrations and patches.")
|
||||||
|
|
||||||
def upto_down_downloader(self, app: str) -> Any:
|
def upto_down_downloader(self, app: str) -> str:
|
||||||
return self.__upto_down_downloader(app)
|
return self.__upto_down_downloader(app)
|
||||||
|
|
||||||
def download_from_apkmirror(self, version: str, app: str) -> Any:
|
def download_from_apkmirror(self, version: str, app: str) -> str:
|
||||||
if version and version != "latest":
|
if version and version != "latest":
|
||||||
return self.apkmirror_specific_version(app, version)
|
return self.apkmirror_specific_version(app, version)
|
||||||
else:
|
else:
|
||||||
return self.apkmirror_latest_version(app)
|
return self.apkmirror_latest_version(app)
|
||||||
|
|
||||||
def download_apk_to_patch(self, version: str, app: str) -> Any:
|
def download_apk_to_patch(self, version: str, app: str) -> str:
|
||||||
if app in self.upto_down:
|
if app in self.upto_down:
|
||||||
return self.upto_down_downloader(app)
|
return self.upto_down_downloader(app)
|
||||||
else:
|
else:
|
||||||
|
|||||||
+2
-2
@@ -2,7 +2,7 @@ import sys
|
|||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from subprocess import PIPE, Popen
|
from subprocess import PIPE, Popen
|
||||||
from time import perf_counter
|
from time import perf_counter
|
||||||
from typing import Any, List
|
from typing import List
|
||||||
|
|
||||||
from environs import Env
|
from environs import Env
|
||||||
from loguru import logger
|
from loguru import logger
|
||||||
@@ -46,7 +46,7 @@ class Parser(object):
|
|||||||
self._PATCHES.extend(["-e", name])
|
self._PATCHES.extend(["-e", name])
|
||||||
self._EXCLUDED.append(name)
|
self._EXCLUDED.append(name)
|
||||||
|
|
||||||
def get_excluded_patches(self) -> List[Any]:
|
def get_excluded_patches(self) -> List[str]:
|
||||||
return self._EXCLUDED
|
return self._EXCLUDED
|
||||||
|
|
||||||
def patch_app(self, app: str, version: str, is_experimental: bool = False) -> None:
|
def patch_app(self, app: str, version: str, is_experimental: bool = False) -> None:
|
||||||
|
|||||||
+2
-2
@@ -120,7 +120,7 @@ class Patches(object):
|
|||||||
return patches, version
|
return patches, version
|
||||||
|
|
||||||
def include_and_exclude_patches(
|
def include_and_exclude_patches(
|
||||||
self, app: str, arg_parser: Any, app_patches: List[Any]
|
self, app: str, arg_parser: Any, app_patches: List[Dict[str, str]]
|
||||||
) -> None:
|
) -> None:
|
||||||
logger.debug(f"Excluding patches for app {app}")
|
logger.debug(f"Excluding patches for app {app}")
|
||||||
if self.build_extended and app in self.extended_apps:
|
if self.build_extended and app in self.extended_apps:
|
||||||
@@ -139,7 +139,7 @@ class Patches(object):
|
|||||||
else:
|
else:
|
||||||
logger.debug(f"No excluded patches for {app}")
|
logger.debug(f"No excluded patches for {app}")
|
||||||
|
|
||||||
def get_app_configs(self, app: str) -> Any:
|
def get_app_configs(self, app: str) -> Tuple[List[Dict[str, str]], str, bool]:
|
||||||
experiment = False
|
experiment = False
|
||||||
total_patches, recommended_version = self.get(app=app)
|
total_patches, recommended_version = self.get(app=app)
|
||||||
env_version = self.env.str(f"{app}_VERSION".upper(), None)
|
env_version = self.env.str(f"{app}_VERSION".upper(), None)
|
||||||
|
|||||||
Reference in New Issue
Block a user