From 48a53cdb73f78624a2195c00cb014bb765b03225 Mon Sep 17 00:00:00 2001 From: Nikhil Badyal Date: Fri, 4 Nov 2022 13:58:57 +0530 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Alternative=20youtube=20build?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.py | 26 +++++++++++--------------- src/config.py | 7 ++----- 2 files changed, 13 insertions(+), 20 deletions(-) diff --git a/main.py b/main.py index a7006a2..cfa037d 100644 --- a/main.py +++ b/main.py @@ -30,21 +30,17 @@ def main() -> None: parser.patch_app(app=app, version=version, is_experimental=is_experimental) except Exception as e: logger.exception(f"Failed to build {app} because of {e}") - if config.build_og_nd_branding_youtube: - logger.info("Rebuilding youtube") - all_patches = parser.get_all_patches() - branding_index = all_patches.index(config.branding_patch) - was_og_build = True if all_patches[branding_index - 1] == "-e" else False - output = "-custom-icon-" if was_og_build else "-original-icon-" - app = "youtube" - _, version, is_experimental = patcher.get_app_configs(app) - parser.invert_patch(config.branding_patch) - parser.patch_app( - app=app, - version=version, - is_experimental=is_experimental, - output_prefix=output, - ) + if config.build_alternative_youtube: + for alternative_patch in config.alternative_youtube_patches: + logger.info(f"Rebuilding youtube with ${alternative_patch}") + _, version, is_experimental = patcher.get_app_configs("youtube") + parser.invert_patch(alternative_patch) + parser.patch_app( + app="youtube", + version=version, + is_experimental=is_experimental, + output_prefix=alternative_patch, + ) if __name__ == "__main__": diff --git a/src/config.py b/src/config.py index 2eaf531..f01ceef 100644 --- a/src/config.py +++ b/src/config.py @@ -57,9 +57,6 @@ class RevancedConfig: "youtube": f"{self.apk_mirror_urls.get('youtube')}youtube", "youtube_music": f"{self.apk_mirror_urls.get('youtube_music')}youtube-music", } - self.build_og_nd_branding_youtube = env.bool("BUILD_OG_BRANDING_YOUTUBE", False) - self.branding_patch = env.str( - "BRANDING_PATCH", - "custom-branding-icon-blue" if self.build_extended else "custom-branding", - ) self.archs_to_build = env.list("ARCHS_TO_BUILD", []) + self.build_alternative_youtube = env.bool("BUILD_ALTERNATIVE_YOUTUBE", False) + self.alternative_youtube_patches = env.list("ALTERNATIVE_YOUTUBE_PATCHES", [])