apksearch 1.1.0__tar.gz → 1.2.0__tar.gz

{apksearch-1.1.0 → apksearch-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: apksearch
-Version: 1.1.0
+Version: 1.2.0
 Summary: Search for apks on varius websites
 Author-email: Abhi <allinoneallinone00@gmail.com>
 License: MIT License
@@ -134,6 +134,12 @@ if result:
 - **`__init__(self, pkg_name: str)`**: Initializes with the package name.
 - **`search_apk(self, version: str = None) -> None | tuple[str, str]`**: Searches for the APK on AppTeka and returns the title and link if found. If a version is provided, it checks if that version is available and returns the corresponding download link, None otherwise. If no version is provided, it returns the link for the latest version available.
 
+#### `APKCombo`
+
+- **`__init__(self, pkg_name: str)`**: Initializes with the package name.
+- **`search_apk(self) -> None | tuple[str, str]`**: Searches for the APK on APKCombo and returns the title and link if found.
+- **`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.
+
 ### Testing
 
 The project includes tests for the `sites` classes. To run the tests, use the following command:

{apksearch-1.1.0 → apksearch-1.2.0}/README.md

@@ -82,6 +82,12 @@ if result:
 - **`__init__(self, pkg_name: str)`**: Initializes with the package name.
 - **`search_apk(self, version: str = None) -> None | tuple[str, str]`**: Searches for the APK on AppTeka and returns the title and link if found. If a version is provided, it checks if that version is available and returns the corresponding download link, None otherwise. If no version is provided, it returns the link for the latest version available.
 
+#### `APKCombo`
+
+- **`__init__(self, pkg_name: str)`**: Initializes with the package name.
+- **`search_apk(self) -> None | tuple[str, str]`**: Searches for the APK on APKCombo and returns the title and link if found.
+- **`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.
+
 ### Testing
 
 The project includes tests for the `sites` classes. To run the tests, use the following command:

{apksearch-1.1.0 → apksearch-1.2.0}/apksearch/__init__.py

@@ -1,5 +1,6 @@
 from .sites.apkpure import APKPure
 from .sites.apkmirror import APKMirror
 from .sites.appteka import AppTeka
+from .sites.apkcombo import APKCombo
 
-__all__ = ["APKPure", "APKMirror", "AppTeka"]
+__all__ = ["APKPure", "APKMirror", "AppTeka", "APKCombo"]

{apksearch-1.1.0 → apksearch-1.2.0}/apksearch/cli.py

@@ -1,6 +1,6 @@
 import argparse
 
-from apksearch import APKPure, APKMirror, AppTeka
+from apksearch import APKPure, APKMirror, AppTeka, APKCombo
 from requests.exceptions import ConnectionError, ConnectTimeout
 
 # Color codes
@@ -36,15 +36,40 @@ def search_apkpure(pkg_name: str, version: str | None) -> None:
         print(f"{BOLD}APKPure:{NC} No Results!")
 
 
+def search_apkcombo(pkg_name: str, version: str | None) -> None:
+    apkcombo = APKCombo(pkg_name)
+    try:
+        result_apkcombo: tuple[str, str] | None = apkcombo.search_apk()
+    except (ConnectionError, ConnectTimeout):
+        result_apkcombo = None
+        print(f"{RED}Failed to resolve 'apkcombo.app'!{NC}")
+    if result_apkcombo:
+        title, apk_link = result_apkcombo
+        print(f"{BOLD}APKCombo:{NC} Found {GREEN}{title}{NC}") if title else None
+        print(f"      ╰─> {BOLD}Link: {YELLOW}{apk_link}{NC}") if not version else None
+        versions: list[tuple[str, str]] = apkcombo.find_versions(apk_link)
+        if version:
+            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}APKCombo:{NC} Version {RED}{version}{NC} not found!")
+    else:
+        print(f"{BOLD}APKCombo:{NC} No Results!")
+
+
 def search_apkmirror(pkg_name: str, version: str | None) -> None:
     apkmirror = APKMirror(pkg_name)
     try:
-        result_apkpure: tuple[str, str] | None = apkmirror.search_apk()
+        result_apkmirror: tuple[str, str] | None = apkmirror.search_apk()
     except (ConnectionError, ConnectTimeout):
-        result_apkpure = None
+        result_apkmirror = None
         print(f"{RED}Failed to resolve 'apkmirror.com'!{NC}")
-    if result_apkpure:
-        title, apk_link = result_apkpure
+    if result_apkmirror:
+        title, apk_link = result_apkmirror
         print(f"{BOLD}APKMirror:{NC} Found {GREEN}{title}{NC}") if title else None
         print(f"      ╰─> {BOLD}Link: {YELLOW}{apk_link}{NC}") if not version else None
         if version:
@@ -62,12 +87,12 @@ def search_apkmirror(pkg_name: str, version: str | None) -> None:
 def search_appteka(pkg_name: str, version: str | None) -> None:
     appteka = AppTeka(pkg_name)
     try:
-        result_apkpure: tuple[str, str] | None = appteka.search_apk(version)
+        result_appteka: tuple[str, str] | None = appteka.search_apk(version)
     except (ConnectionError, ConnectTimeout):
-        result_apkpure = None
+        result_appteka = None
         print(f"{RED}Failed to resolve 'appteka.store'!{NC}")
-    if result_apkpure:
-        title, apk_link = result_apkpure
+    if result_appteka:
+        title, apk_link = result_appteka
         print(f"{BOLD}AppTeka:{NC} Found {GREEN}{title}{NC}") if title else None
         if version:
             if apk_link:
@@ -99,6 +124,8 @@ def main():
     search_apkmirror(pkg_name, version)
     # Initiate search on appteka
     search_appteka(pkg_name, version)
+    # Initiate search on apkcombo
+    search_apkcombo(pkg_name, version)
 
 
 if __name__ == "__main__":

apksearch-1.2.0/apksearch/sites/apkcombo.py

@@ -0,0 +1,104 @@
+from bs4 import BeautifulSoup
+import requests
+
+
+class APKCombo:
+    """
+    This class provides methods to search for an APK on APKCombo 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 APKCombo website.
+        search_url (str): The URL used to search for APKs on APKCombo.
+        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 APKCombo 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://apkcombo.app"
+        self.search_url = self.base_url + "/search/"
+        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",
+            "cookie": "__apkcombo_lang=en",
+            "dnt": "1",
+            "pragma": "no-cache",
+            "priority": "u=0, i",
+            "referer": "https://apkcombo.app/",
+            "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 APKCombo 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, allow_redirects=False
+        )
+        # Redirect to the APK page if there's only one result. i.e, apk found.
+        if response.status_code == 302:
+            url = self.search_url + response.headers["Location"]
+            response: requests.Response = self.session.get(url, headers=self.headers)
+        elif response.status_code == 200:  # Package name not found or multiple results.
+            return None
+        else:
+            raise Exception(f"Error: {response.status_code}")
+        soup = BeautifulSoup(response.text, "html.parser")
+        title = soup.find("div", {"class": "app_name"}).text.strip()
+        apk_link = url
+        return title, apk_link
+
+    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 APKCombo 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.
+        """
+        url = apk_link + "/old-versions"
+        response: requests.Response = self.session.get(url, headers=self.headers)
+        soup = BeautifulSoup(response.text, "html.parser")
+        versions_list = soup.find("ul", {"class": "list-versions"})
+        versions_info = []
+
+        if versions_list:
+            versions = versions_list.find_all("a", {"class": "ver-item"})
+            for version in versions:
+                version_number = version.find("span", {"class": "vername"}).text
+                version_number = version_number.split(" ")[-1]
+                download_url = self.base_url + version["href"]
+                versions_info.append((version_number, download_url))
+
+        return versions_info

{apksearch-1.1.0 → apksearch-1.2.0}/apksearch.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: apksearch
-Version: 1.1.0
+Version: 1.2.0
 Summary: Search for apks on varius websites
 Author-email: Abhi <allinoneallinone00@gmail.com>
 License: MIT License
@@ -134,6 +134,12 @@ if result:
 - **`__init__(self, pkg_name: str)`**: Initializes with the package name.
 - **`search_apk(self, version: str = None) -> None | tuple[str, str]`**: Searches for the APK on AppTeka and returns the title and link if found. If a version is provided, it checks if that version is available and returns the corresponding download link, None otherwise. If no version is provided, it returns the link for the latest version available.
 
+#### `APKCombo`
+
+- **`__init__(self, pkg_name: str)`**: Initializes with the package name.
+- **`search_apk(self) -> None | tuple[str, str]`**: Searches for the APK on APKCombo and returns the title and link if found.
+- **`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.
+
 ### Testing
 
 The project includes tests for the `sites` classes. To run the tests, use the following command:

{apksearch-1.1.0 → apksearch-1.2.0}/apksearch.egg-info/SOURCES.txt

@@ -11,9 +11,11 @@ apksearch.egg-info/entry_points.txt
 apksearch.egg-info/requires.txt
 apksearch.egg-info/top_level.txt
 apksearch/sites/__init__.py
+apksearch/sites/apkcombo.py
 apksearch/sites/apkmirror.py
 apksearch/sites/apkpure.py
 apksearch/sites/appteka.py
+tests/test_apkcombo.py
 tests/test_apkmirror.py
 tests/test_apkpure.py
 tests/test_appteka.py

{apksearch-1.1.0 → apksearch-1.2.0}/pyproject.toml

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

apksearch-1.2.0/tests/test_apkcombo.py

@@ -0,0 +1,38 @@
+from apksearch.sites.apkcombo import APKCombo
+
+
+def test_search_apk():
+    query = "com.roblox.client"
+    apkcombo = APKCombo(query)
+    result = apkcombo.search_apk()
+
+    assert result is not None, "No APK found for the query."
+    assert isinstance(result, tuple), "Result should be a tuple."
+    assert len(result) == 2, "Tuple should contain two elements."
+    assert isinstance(result[0], str), "First element of the tuple should be a string."
+    assert isinstance(result[1], str), "Second element of the tuple should be a string."
+
+
+def test_find_versions():
+    query = "com.roblox.client"
+    apkcombo = APKCombo(query)
+    result = apkcombo.search_apk()
+
+    if result:
+        apk_link = result[1]
+        versions = apkcombo.find_versions(apk_link)
+
+        assert isinstance(versions, list), "Versions should be a list."
+        assert len(versions) > 0, "No versions found."
+        assert all(
+            isinstance(version, tuple) for version in versions
+        ), "Each version should be a tuple."
+        assert all(
+            len(version) == 2 for version in versions
+        ), "Each version tuple should contain two elements."
+        assert all(
+            isinstance(version[0], str) for version in versions
+        ), "First element of each version tuple should be a string."
+        assert all(
+            isinstance(version[1], str) for version in versions
+        ), "Second element of each version tuple should be a string."