apksearch 1.3.0__tar.gz → 1.3.1__tar.gz

{apksearch-1.3.0 → apksearch-1.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apksearch
-Version: 1.3.0
+Version: 1.3.1
 Summary: Search for apks on varius websites
 Author-email: Abhi <allinoneallinone00@gmail.com>
 License: MIT License

{apksearch-1.3.0 → apksearch-1.3.1}/apksearch/__init__.py

@@ -5,7 +5,6 @@ from .sites.apkcombo import APKCombo
 from .sites.apkfab import APKFab
 from .sites.apkad import APKad
 from .sites.aptoide import Aptoide
-from .sites.apkmonk import APKMonk
 
 __all__ = [
     "APKPure",
@@ -15,5 +14,4 @@ __all__ = [
     "APKFab",
     "APKad",
     "Aptoide",
-    "APKMonk",
 ]

{apksearch-1.3.0 → apksearch-1.3.1}/apksearch/cli.py

@@ -9,7 +9,6 @@ from apksearch import (
     APKFab,
     APKad,
     Aptoide,
-    APKMonk,
 )
 from requests.exceptions import ConnectionError, ConnectTimeout
 
@@ -200,32 +199,6 @@ def search_aptoide(pkg_name: str, version: str | None) -> None:
         print(f"{BOLD}Aptoide:{NC} No Results!")
 
 
-def search_apkmonk(pkg_name: str, version: str | None) -> None:
-    apkmonk = APKMonk(pkg_name)
-    try:
-        result_apkmonk: tuple[str, str] | None = apkmonk.search_apk()
-    except (ConnectionError, ConnectTimeout):
-        result_apkmonk = None
-        print(f"{RED}Failed to resolve 'apkmonk.com'!{NC}")
-    if result_apkmonk:
-        title, apk_link = result_apkmonk
-        print(f"{BOLD}APKMonk:{NC} Found {GREEN}{title}{NC}") if title else None
-        print(f"      ╰─> {BOLD}Link: {YELLOW}{apk_link}{NC}") if not version else None
-        if version:
-            versions: list[tuple[str, str]] = apkmonk.find_versions(apk_link)
-            if versions:
-                for version_tuple in versions:
-                    if version_tuple[0] == version:
-                        print(
-                            f"      ╰─> {BOLD}Version: {GREEN}{version}{NC} - {YELLOW}{version_tuple[1]}{NC}"
-                        )
-                        break
-                else:
-                    print(f"{BOLD}APKMonk:{NC} Version {RED}{version}{NC} not found!")
-    else:
-        print(f"{BOLD}APKMonk:{NC} No Results!")
-
-
 def main():
     parser = argparse.ArgumentParser(
         prog="APKSearch", description="Search for APKs on various websites"
@@ -255,8 +228,6 @@ def main():
     search(search_apkfab, pkg_name, version, log_err)
     # Initiate search on apkad
     search(search_apkad, pkg_name, version, log_err)
-    # Initiate search on apmonk
-    search(search_apkmonk, pkg_name, version, log_err)
 
 
 if __name__ == "__main__":

{apksearch-1.3.0 → apksearch-1.3.1}/apksearch/sites/apkpure.py

@@ -107,14 +107,6 @@ class APKPure:
             None: If no matching APK is found.
             tuple[str, str]: A tuple containing the title and link of the matching APK if found.
         """
-        # Try API first
-        api_result = self._api_search()
-        if api_result:
-            title, versions = api_result
-            if versions:
-                return title, versions[0][1]
-
-        # Fall back to web scrapping
         pkg_name = self.pkg_name
         url = self.search_url + pkg_name
         response: requests.Response = self.session.get(url, headers=self.headers)
@@ -138,7 +130,7 @@ class APKPure:
         try:
             location = response.headers.get("Location")
         except AttributeError:
-            return None
+            location = None
         if location:
             if location == "https://apkpure.com":
                 return None
@@ -152,6 +144,13 @@ class APKPure:
             if content:
                 apk_title = content.split("filename=")[1].strip('"').split("_")[0]
                 return apk_title, location
+
+        api_result = self._api_search()
+        if api_result:
+            title, versions = api_result
+            if versions:
+                return title, versions[0][1]
+    
         return None
 
     def find_versions(self, apk_link: str) -> list[tuple[str, str]]:

{apksearch-1.3.0 → apksearch-1.3.1}/apksearch.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apksearch
-Version: 1.3.0
+Version: 1.3.1
 Summary: Search for apks on varius websites
 Author-email: Abhi <allinoneallinone00@gmail.com>
 License: MIT License

{apksearch-1.3.0 → apksearch-1.3.1}/apksearch.egg-info/SOURCES.txt

@@ -15,7 +15,6 @@ apksearch/sites/apkad.py
 apksearch/sites/apkcombo.py
 apksearch/sites/apkfab.py
 apksearch/sites/apkmirror.py
-apksearch/sites/apkmonk.py
 apksearch/sites/apkpure.py
 apksearch/sites/appteka.py
 apksearch/sites/aptoide.py

{apksearch-1.3.0 → apksearch-1.3.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "apksearch"
-version = "1.3.0"
+version = "1.3.1"
 description = "Search for apks on varius websites"
 authors = [{ name = "Abhi", email = "allinoneallinone00@gmail.com" }]
 license = { file = "LICENSE" }

apksearch-1.3.0/apksearch/sites/apkmonk.py

@@ -1,108 +0,0 @@
-import re
-import requests
-from bs4 import BeautifulSoup
-
-
-class APKMonk:
-    """
-    This class provides methods to search for an APK on APKMonk based on package name,
-    and to find available versions and their download links for a given APK link.
-
-    Parameters:
-        pkg_name (str): The package name of the APK to search for.
-
-    Attributes:
-        pkg_name (str): The package name of the APK to search for.
-        base_url (str): The base URL of the APKMonk website.
-        search_url (str): The URL used to search for APKs on APKMonk.
-        headers (dict): The headers used for making HTTP requests.
-        session (requests.Session): The session object used for making HTTP requests.
-
-    Methods:
-        search_apk() -> None | tuple[str, str]:
-            Searches for the APK on APKMonk and returns the title and link if found.
-
-        find_versions(apk_link: str) -> list[tuple[str, str]]:
-            Finds and returns a list of versions and their download links for the given APK link.
-    """
-
-    def __init__(self, pkg_name: str):
-        self.pkg_name = pkg_name
-        self.base_url = "https://www.apkmonk.com"
-        self.search_url = self.base_url + "/ssearch?q="
-        self.headers = {
-            "accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7",
-            "accept-language": "en-US,en;q=0.9,en-IN;q=0.8",
-            "cache-control": "no-cache",
-            "dnt": "1",
-            "pragma": "no-cache",
-            "priority": "u=0, i",
-            "referer": "https://www.apkmonk.com/",
-            "sec-ch-ua": '"Microsoft Edge";v="131", "Chromium";v="131", "Not_A Brand";v="24"',
-            "sec-ch-ua-mobile": "?0",
-            "sec-ch-ua-platform": '"Windows"',
-            "sec-fetch-dest": "document",
-            "sec-fetch-mode": "navigate",
-            "sec-fetch-site": "same-origin",
-            "sec-fetch-user": "?1",
-            "upgrade-insecure-requests": "1",
-            "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36 Edg/131.0.0.0",
-        }
-        self.session = requests.Session()
-
-    def search_apk(self) -> None | tuple[str, str]:
-        """
-        Searches for the APK on APKMonk and returns the title and link if found.
-
-        Returns:
-            None: If no matching APK is found.
-            tuple[str, str]: A tuple containing the title and link of the matching APK if found.
-        """
-        pkg_name = self.pkg_name
-        url = self.search_url + pkg_name
-        response: requests.Response = self.session.get(url, headers=self.headers)
-        soup = BeautifulSoup(response.text, "html.parser")
-        search_results = soup.find("a", {"title": re.compile(".*apk$")})
-        if search_results:
-            link = search_results["href"]
-            title = search_results.find("span", {"class": "af-title truncate"}).text
-            if link == f"/app/{pkg_name}/":
-                return title, f"{self.base_url}{link}"
-        return None
-
-    def find_versions(self, apk_link: str) -> list[tuple[str, str]]:
-        """
-        Finds and returns a list of versions and their download links for the given APK link.
-
-        Parameters:
-            apk_link (str): The link to the APK on the APKMonk website.
-
-        Returns:
-            list[tuple[str, str]]: A list of tuples, where each tuple contains the version number
-            and its corresponding download link. If no versions are found, an empty list is returned.
-        """
-        versions_info = []
-        if apk_link.startswith(self.base_url):
-            url = apk_link
-            response: requests.Response = self.session.get(url, headers=self.headers)
-            soup = BeautifulSoup(response.text, "html.parser")
-
-            version_header = soup.find(
-                "div",
-                {"class": "box-title"},
-                text=re.compile("All Versions", re.IGNORECASE),
-            )
-
-            if version_header:
-                versions_table = version_header.find_next("table", {"class": "striped"})
-
-                if versions_table:
-                    rows = versions_table.find_all("tr")
-                    for row in rows:
-                        version_link = row.find("a", href=True)
-                        if version_link:
-                            version_number = version_link.text.strip()
-                            download_url = self.base_url + version_link["href"]
-                            versions_info.append((version_number, download_url))
-
-        return versions_info