diff --git a/main.py b/main.py index f87be4d..4204b70 100644 --- a/main.py +++ b/main.py @@ -31,17 +31,25 @@ def main() -> None: 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_patch = "custom-branding" if config.build_extended: branding_patch = "custom-branding-blue" branding_index = all_patches.index(branding_patch) was_og_build = True if all_patches[branding_index - 1] == "-e" else False - app = "youtube-custom-icon" if was_og_build else "youtube" - _, version, is_experimental = patcher.get_app_configs("youtube") + output = "-custom-icon-" if was_og_build else "" + app = "youtube" + _, version, is_experimental = patcher.get_app_configs(app) + logger.info(parser.get_all_patches()) parser.invert_patch(branding_patch) - parser.patch_app(app=app, version=version, is_experimental=is_experimental) - logger.info(parser.get_all_patches()) + logger.info(parser.get_all_patches()) + parser.patch_app( + app=app, + version=version, + is_experimental=is_experimental, + output_prefix=output, + ) if __name__ == "__main__": diff --git a/src/parser.py b/src/parser.py index 015c151..198e83a 100644 --- a/src/parser.py +++ b/src/parser.py @@ -59,12 +59,20 @@ class Parser(object): else: self._PATCHES[patch_index - 1] = "-e" - def patch_app(self, app: str, version: str, is_experimental: bool = False) -> None: + # noinspection IncorrectFormatting + def patch_app( + self, + app: str, + version: str, + is_experimental: bool = False, + output_prefix: str = "-", + ) -> None: """Revanced APP Patcher. :param app: Name of the app :param version: Version of the application :param is_experimental: Whether to enable experimental support + :param output_prefix: Prefix to add to the output apks file name """ logger.debug(f"Sending request to revanced cli for building {app} revanced") cli = self.config.normal_cli_jar @@ -84,7 +92,7 @@ class Parser(object): "-m", integrations, "-o", - f"Re-{app}-{version}-output.apk", + f"Re-{app}-{version}{output_prefix}output.apk", "--keystore", self.config.keystore_name, ]