Merge pull request #258 from nikhilbadyal/sourcery/main

Sourcery refactored main branch

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
+        return apk_mirror_base_url + re.sub(
-        apk_mirror_url = 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 = (
-    table += "|-------------|----------|----------------|---------------|------------------|----------|\n"
+        "| 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 = []
+    data = [
-    for index, app in enumerate(missing_support):
+        [
-        data.append(
+            app,
-            [
+            f'<img src="{gplay_icon_scrapper(app)}" width=50 height=50>',
-                app,
+            f"[PlayStore Link](https://play.google.com/store/apps/details?id={app})",
-                f'<img src="{gplay_icon_scrapper(app)}" width=50 height=50>',
+            f"[APKMirror Link](https://www.apkmirror.com/?s={app})",
-                f"[PlayStore Link](https://play.google.com/store/apps/details?id={app})",
+            f"[APKCombo Link](https://apkcombo.com/genericApp/{app})",
-                f"[APKMirror Link](https://www.apkmirror.com/?s={app})",
+            "<li>- [ ] </li>",
-                f"[APKCombo Link](https://apkcombo.com/genericApp/{app})",
+        ]
-                "<li>- [ ] </li>",
+        for app in missing_support
-            ]
+    ]
-        )
     table = generate_markdown_table(data)
     output += table
     with open("status.md", "w", encoding="utf_8") as status:

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 self.config.apk_mirror + sub_url
-        return download_url
 
     def specific_version(self, app: str, version: str) -> None:
         """Function to download the specified version of app from  apkmirror.

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(
+            headers["Authorization"] = f"token {self.config.personal_access_token}"
-                {"Authorization": "token " + self.config.personal_access_token}
-            )
         response = self.config.session.get(
             url,
             stream=True,

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)

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(
+            headers["Authorization"] = f"token {self.config.personal_access_token}"
-                {"Authorization": "token " + self.config.personal_access_token}
-            )
         response = requests.get(repo_url, headers=headers)
         handle_response(response)
         if repo_name == "revanced-patches":

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.extend(("--rip-lib", arch))
-                args.append(arch)
-
         start = perf_counter()
         logger.debug(
             f"Sending request to revanced cli for building with args java {args}"

src/utils.py

@@ -16,27 +16,22 @@ 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")
+    with open("changelog.md", "a", encoding="utf_8") as file1:
-    collapse_start = f"\n<details> <summary>👀 {name} </summary>\n\n"
+        collapse_start = f"\n<details> <summary>👀 {name} </summary>\n\n"
-    release_version = (
+        release_version = f"**Release Version** - [{response['tag_name']}]({response['html_url']})<br>"
-        f"**Release Version** - [{response['tag_name']}]({response['html_url']})<br>"
+        change_log = f"**Changelog** -<br> {response['body']}"
-    )
+        publish_time = f"**Published at** -<br> {response['published_at']}"
-    change_log = f"**Changelog** -<br> {response['body']}"
+        footer = f"<br><sub>Change logs generated by [Docker Py Revanced]({parent_repo})</sub>\n"
-    publish_time = f"**Published at** -<br> {response['published_at']}"
+        collapse_end = "</details>"
-    footer = (
+        change_log = (
-        f"<br><sub>Change logs generated by [Docker Py Revanced]({parent_repo})</sub>\n"
+            collapse_start
-    )
+            + release_version
-    collapse_end = "</details>"
+            + change_log
-    change_log = (
+            + publish_time
-        collapse_start
+            + footer
-        + release_version
+            + collapse_end
-        + change_log
+        )
-        + publish_time
+        file1.write(change_log)
-        + footer
-        + collapse_end
-    )
-    file1.write(change_log)
-    file1.close()
 
 
 class AppNotFound(ValueError):