♻️ Cleanup

This commit is contained in:
Nikhil Badyal
2022-10-05 19:11:25 +05:30
parent cd3f961cd8
commit 5daeeee59c
5 changed files with 131 additions and 151 deletions
+26 -44
View File
@@ -2,55 +2,38 @@ from subprocess import PIPE, Popen
from time import perf_counter
from typing import Any, List
from environs import Env
from loguru import logger
from src.downloader import temp_folder
env = Env()
class ArgParser(object):
build_extended = env.bool("BUILD_EXTENDED", False)
extended_apps = ["youtube", "youtube_music"]
keystore_name = env.str("KEYSTORE_FILE_NAME", "revanced.keystore")
apk_mirror = "https://www.apkmirror.com"
github = "https://www.github.com"
normal_cli_jar = "revanced-cli.jar"
normal_patches_jar = "revanced-patches.jar"
normal_integrations_apk = "revanced-integrations.apk"
cli_jar = f"inotia00-{normal_cli_jar}" if build_extended else normal_cli_jar
patches_jar = (
f"inotia00-{normal_patches_jar}" if build_extended else normal_patches_jar
)
integrations_apk = (
f"inotia00-{normal_integrations_apk}"
if build_extended
else normal_integrations_apk
)
apk_mirror_urls = {
"reddit": f"{apk_mirror}/apk/redditinc/reddit/",
"twitter": f"{apk_mirror}/apk/twitter-inc/twitter/",
"tiktok": f"{apk_mirror}/apk/tiktok-pte-ltd/tik-tok-including-musical-ly/",
"warnwetter": f"{apk_mirror}/apk/deutscher-wetterdienst/warnwetter/",
"youtube": f"{apk_mirror}/apk/google-inc/youtube/",
"youtube_music": f"{apk_mirror}/apk/google-inc/youtube-music/",
}
apk_mirror_version_urls = {
"reddit": f"{apk_mirror_urls.get('reddit')}reddit",
"twitter": f"{apk_mirror_urls.get('twitter')}twitter",
"tiktok": f"{apk_mirror_urls.get('tiktok')}tik-tok-including-musical-ly",
"warnwetter": f"{apk_mirror_urls.get('warnwetter')}warnwetter",
"youtube": f"{apk_mirror_urls.get('youtube')}youtube",
"youtube_music": f"{apk_mirror_urls.get('youtube_music')}youtube-music",
}
upto_down = ["spotify"]
def __init__(self, patcher):
class Parser(object):
def __init__(self, patcher, env):
self._PATCHES = []
self._EXCLUDED = []
self.patcher = patcher
self.keystore_name = env.str("KEYSTORE_FILE_NAME", "revanced.keystore")
self.build_extended = env.bool("BUILD_EXTENDED", False)
self.extended_apps = ["youtube", "youtube_music"]
self.keystore_name = env.str("KEYSTORE_FILE_NAME", "revanced.keystore")
self.normal_cli_jar = "revanced-cli.jar"
self.normal_patches_jar = "revanced-patches.jar"
self.normal_integrations_apk = "revanced-integrations.apk"
self.cli_jar = (
f"inotia00-{self.normal_cli_jar}"
if self.build_extended
else self.normal_cli_jar
)
self.patches_jar = (
f"inotia00-{self.normal_patches_jar}"
if self.build_extended
else self.normal_patches_jar
)
self.integrations_apk = (
f"inotia00-{self.normal_integrations_apk}"
if self.build_extended
else self.normal_integrations_apk
)
def include(self, name: str) -> None:
self._PATCHES.extend(["-i", name])
@@ -62,7 +45,7 @@ class ArgParser(object):
def get_excluded_patches(self) -> List[Any]:
return self._EXCLUDED
def run(self, app: str, version: str, is_experimental: bool = False) -> None:
def patch_app(self, app: str, version: str, is_experimental: bool = False) -> None:
logger.debug(f"Sending request to revanced cli for building {app} revanced")
cli = self.normal_cli_jar
patches = self.normal_patches_jar
@@ -98,7 +81,6 @@ class ArgParser(object):
for line in process.stdout:
logger.debug(line.decode(), flush=True, end="")
process.wait()
logger.debug(
f"Patching completed for app {app} in {perf_counter() - start:.2f} "
f"seconds."
logger.info(
f"Patching completed for app {app} in {perf_counter() - start:.2f} seconds."
)