From 6b1cefadf4e4205393dd75b8e84132ca2c57a68a Mon Sep 17 00:00:00 2001 From: Sourcery AI <> Date: Tue, 8 Aug 2023 03:36:41 +0000 Subject: [PATCH 1/2] 'Refactored by Sourcery' --- scripts/status_check.py | 36 +++++++++++++++----------------- src/downloader/apkmirror.py | 3 +-- src/downloader/download.py | 4 +--- src/downloader/factory.py | 2 +- src/downloader/github.py | 4 +--- src/parser.py | 6 ++---- src/utils.py | 41 ++++++++++++++++++------------------- 7 files changed, 43 insertions(+), 53 deletions(-) diff --git a/scripts/status_check.py b/scripts/status_check.py index 1167a39..253bb71 100644 --- a/scripts/status_check.py +++ b/scripts/status_check.py @@ -59,11 +59,9 @@ def apkmirror_scrapper(package_name: str) -> str: # regular expression pattern to match w=xx&h=xx&q=xx pattern = r"(w=\d+&h=\d+&q=\d+)" - # Replace the matched patterns with the new dimensions and q value - apk_mirror_url = apk_mirror_base_url + re.sub( + return apk_mirror_base_url + re.sub( pattern, f"w={new_width}&h={new_height}&q={new_quality}", sub_url ) - return apk_mirror_url raise APKMirrorScrapperFailure() @@ -88,12 +86,13 @@ def gplay_icon_scrapper(package_name: str) -> str: def generate_markdown_table(data: List[List[str]]) -> str: """Generate table.""" - if len(data) == 0: + if not data: return "No data to generate table." - table = "| Package Name | App Icon | PlayStore link | APKMirror link|APKCombo Link| Supported?|\n" - table += "|-------------|----------|----------------|---------------|------------------|----------|\n" - + table = ( + "| Package Name | App Icon | PlayStore link | APKMirror link|APKCombo Link| Supported?|\n" + + "|-------------|----------|----------------|---------------|------------------|----------|\n" + ) for row in data: if len(row) != 6: raise ValueError("Each row must contain 4 columns of data.") @@ -119,18 +118,17 @@ def main() -> None: supported_app = set(Patches.support_app().keys()) missing_support = sorted(possible_apps.difference(supported_app)) output = "New app found which aren't supported or outdated.\n\n" - data = [] - for index, app in enumerate(missing_support): - data.append( - [ - app, - f'', - f"[PlayStore Link](https://play.google.com/store/apps/details?id={app})", - f"[APKMirror Link](https://www.apkmirror.com/?s={app})", - f"[APKCombo Link](https://apkcombo.com/genericApp/{app})", - "
  • - [ ]
    • ", - ] - ) + data = [ + [ + app, + f'', + f"[PlayStore Link](https://play.google.com/store/apps/details?id={app})", + f"[APKMirror Link](https://www.apkmirror.com/?s={app})", + f"[APKCombo Link](https://apkcombo.com/genericApp/{app})", + "
  • - [ ]
    • ", + ] + for app in missing_support + ] table = generate_markdown_table(data) output += table with open("status.md", "w", encoding="utf_8") as status: diff --git a/src/downloader/apkmirror.py b/src/downloader/apkmirror.py index d0975af..ece15a9 100644 --- a/src/downloader/apkmirror.py +++ b/src/downloader/apkmirror.py @@ -56,8 +56,7 @@ class ApkMirror(Downloader): f"Unable to find any apk on apkmirror_specific_version on {main_page}" ) raise AppNotFound("Unable to find apk on apkmirror site.") - download_url = self.config.apk_mirror + sub_url - return download_url + return self.config.apk_mirror + sub_url def specific_version(self, app: str, version: str) -> None: """Function to download the specified version of app from apkmirror. diff --git a/src/downloader/download.py b/src/downloader/download.py index 6960048..9229242 100644 --- a/src/downloader/download.py +++ b/src/downloader/download.py @@ -45,9 +45,7 @@ class Downloader(object): headers = {} if self.config.personal_access_token and "github" in url: logger.debug("Using personal access token") - headers.update( - {"Authorization": "token " + self.config.personal_access_token} - ) + headers["Authorization"] = f"token {self.config.personal_access_token}" response = self.config.session.get( url, stream=True, diff --git a/src/downloader/factory.py b/src/downloader/factory.py index 5308532..7b236e8 100644 --- a/src/downloader/factory.py +++ b/src/downloader/factory.py @@ -24,7 +24,7 @@ class DownloaderFactory(object): patcher : Patcher config : Config """ - if app == "patches" or app == "microg": + if app in {"patches", "microg"}: return Github(patcher, config) if app in config.apk_pure: return ApkPure(patcher, config) diff --git a/src/downloader/github.py b/src/downloader/github.py index 8121959..b47a8e9 100644 --- a/src/downloader/github.py +++ b/src/downloader/github.py @@ -31,9 +31,7 @@ class Github(Downloader): } if self.config.personal_access_token: logger.debug("Using personal access token") - headers.update( - {"Authorization": "token " + self.config.personal_access_token} - ) + headers["Authorization"] = f"token {self.config.personal_access_token}" response = requests.get(repo_url, headers=headers) handle_response(response) if repo_name == "revanced-patches": diff --git a/src/parser.py b/src/parser.py index 473edd8..6204308 100644 --- a/src/parser.py +++ b/src/parser.py @@ -81,7 +81,7 @@ class Parser(object): "-jar", app.resource["cli"], "-a", - app.app_name + ".apk", + f"{app.app_name}.apk", "-b", app.resource["patches"], "-m", @@ -104,9 +104,7 @@ class Parser(object): if app.app_name in self.config.rip_libs_apps: excluded = set(possible_archs) - set(app.archs_to_build) for arch in excluded: - args.append("--rip-lib") - args.append(arch) - + args.extend(("--rip-lib", arch)) start = perf_counter() logger.debug( f"Sending request to revanced cli for building with args java {args}" diff --git a/src/utils.py b/src/utils.py index 9e0ed76..eb99e20 100644 --- a/src/utils.py +++ b/src/utils.py @@ -16,27 +16,26 @@ possible_archs = ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"] def update_changelog(name: str, response: Dict[str, str]) -> None: """Updated Changelog.""" parent_repo = "https://github.com/nikhilbadyal/docker-py-revanced" - file1 = open("changelog.md", "a", encoding="utf_8") - collapse_start = f"\n
    👀 {name} \n\n" - release_version = ( - f"**Release Version** - [{response['tag_name']}]({response['html_url']})
    " - ) - change_log = f"**Changelog** -
    {response['body']}" - publish_time = f"**Published at** -
    {response['published_at']}" - footer = ( - f"
    Change logs generated by [Docker Py Revanced]({parent_repo})\n" - ) - collapse_end = "
    " - change_log = ( - collapse_start - + release_version - + change_log - + publish_time - + footer - + collapse_end - ) - file1.write(change_log) - file1.close() + with open("changelog.md", "a", encoding="utf_8") as file1: + collapse_start = f"\n
    👀 {name} \n\n" + release_version = ( + f"**Release Version** - [{response['tag_name']}]({response['html_url']})
    " + ) + change_log = f"**Changelog** -
    {response['body']}" + publish_time = f"**Published at** -
    {response['published_at']}" + footer = ( + f"
    Change logs generated by [Docker Py Revanced]({parent_repo})\n" + ) + collapse_end = "
    " + change_log = ( + collapse_start + + release_version + + change_log + + publish_time + + footer + + collapse_end + ) + file1.write(change_log) class AppNotFound(ValueError): From d49e7897b252be1ebbc966e19257f32ba3a70f55 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 8 Aug 2023 03:36:49 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/utils.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/utils.py b/src/utils.py index eb99e20..dcad32f 100644 --- a/src/utils.py +++ b/src/utils.py @@ -18,14 +18,10 @@ def update_changelog(name: str, response: Dict[str, str]) -> None: parent_repo = "https://github.com/nikhilbadyal/docker-py-revanced" with open("changelog.md", "a", encoding="utf_8") as file1: collapse_start = f"\n
    👀 {name} \n\n" - release_version = ( - f"**Release Version** - [{response['tag_name']}]({response['html_url']})
    " - ) + release_version = f"**Release Version** - [{response['tag_name']}]({response['html_url']})
    " change_log = f"**Changelog** -
    {response['body']}" publish_time = f"**Published at** -
    {response['published_at']}" - footer = ( - f"
    Change logs generated by [Docker Py Revanced]({parent_repo})\n" - ) + footer = f"
    Change logs generated by [Docker Py Revanced]({parent_repo})\n" collapse_end = "
    " change_log = ( collapse_start