apksearch 1.1.0__tar.gz → 1.2.5__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: apksearch
-Version: 1.1.0
+Version: 1.2.5
 Summary: Search for apks on varius websites
 Author-email: Abhi <allinoneallinone00@gmail.com>
 License: MIT License
@@ -28,7 +28,7 @@ License: MIT License
 Project-URL: homepage, https://github.com/AbhiTheModder/apksearch.git
 Project-URL: source, https://github.com/AbhiTheModder/apksearch.git
 Project-URL: issues, https://github.com/AbhiTheModder/apksearch.git/issues
-Classifier: Development Status :: 4 - Beta
+Classifier: Development Status :: 5 - Production/Stable
 Classifier: Natural Language :: English
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
@@ -63,18 +63,32 @@ There were countless occasions when I needed a specific APK for a package name,
 - **Retrieve APK Versions and Download Links:** It can fetch available versions and their download links for a given APK from APKPure and APKMirror.
 - **Command-Line Interface:** A CLI is available for users to search for APKs directly from the command line.
 
+## Supported Websites
+
+- [APKPure](https://apkpure.net/)
+- [APKMirror](https://www.apkmirror.com/)
+- [APKCombo](https://apkcombo.app/)
+- [APKFab](https://apkfab.com/)
+- [Appteka](https://appteka.store/)
+
+> [!NOTE]
+> **For site owners:**
+> If you're the owner of a website that's not listed here and you'd like to add support for it, feel free to open an issue or submit a pull request. I'm open to adding more websites to the library.
+> I respect the _value of user engagement and the revenue_ it generates for your site. To honor this, I have deliberately avoided including a download feature in the library, ensuring users will still need to visit your website, maintaining its traffic and engagement.
+> Additionally, I kindly ask that you **refrain from enforcing strict blocking measures**, such as aggressive Cloudflare rules, as the library is designed to work collaboratively rather than disruptively. Thank you!
+
 ## Installation
 
 To install the `apksearch` library, use the following command:
 
 ```sh
-pip install git+https://github.com/AbhiTheModder/apksearch.git
+pip install -U git+https://github.com/AbhiTheModder/apksearch.git
 ```
 
 OR, through pip:
 
 ```sh
-pip install apksearch
+pip install -U apksearch
 ```
 
 ## Usage
@@ -117,7 +131,7 @@ if result:
 
 ### Classes and Methods
 
-#### `APKPure`
+#### `APKPure` | `APKCombo` | `APKFab`
 
 - **`__init__(self, pkg_name: str)`**: Initializes with the package name.
 - **`search_apk(self) -> None | tuple[str, str]`**: Searches for the APK on APKPure and returns the title and link if found.
@@ -146,6 +160,13 @@ pytest
 
 - [ ] Add more websites to search for APKs.
 
+## Acknowledgements
+
+- [APKUpdater](https://github.com/rumboalla/apkupdater) for APKMirror API.
+- [apkeep](https://github.com/EFForg/apkeep) for APKPure API.
+
+**Recommendation:** If you're looking for an APK downloader, I highly recommend using [apkeep](https://github.com/EFForg/apkeep).
+
 ## License
 
 This project is licensed under the MIT License. See the [LICENSE](https://github.com/AbhiTheModder/apksearch/blob/main/LICENSE) file for more details.
@@ -153,3 +174,5 @@ This project is licensed under the MIT License. See the [LICENSE](https://github
 ## Contributing
 
 Contributions are welcome! Please open an issue or submit a pull request on [GitHub](https://github.com/AbhiTheModder/apksearch).
+
+If you find this project helpful, please consider giving it a ⭐. Your support is greatly appreciated!

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

@@ -11,18 +11,32 @@ There were countless occasions when I needed a specific APK for a package name,
 - **Retrieve APK Versions and Download Links:** It can fetch available versions and their download links for a given APK from APKPure and APKMirror.
 - **Command-Line Interface:** A CLI is available for users to search for APKs directly from the command line.
 
+## Supported Websites
+
+- [APKPure](https://apkpure.net/)
+- [APKMirror](https://www.apkmirror.com/)
+- [APKCombo](https://apkcombo.app/)
+- [APKFab](https://apkfab.com/)
+- [Appteka](https://appteka.store/)
+
+> [!NOTE]
+> **For site owners:**
+> If you're the owner of a website that's not listed here and you'd like to add support for it, feel free to open an issue or submit a pull request. I'm open to adding more websites to the library.
+> I respect the _value of user engagement and the revenue_ it generates for your site. To honor this, I have deliberately avoided including a download feature in the library, ensuring users will still need to visit your website, maintaining its traffic and engagement.
+> Additionally, I kindly ask that you **refrain from enforcing strict blocking measures**, such as aggressive Cloudflare rules, as the library is designed to work collaboratively rather than disruptively. Thank you!
+
 ## Installation
 
 To install the `apksearch` library, use the following command:
 
 ```sh
-pip install git+https://github.com/AbhiTheModder/apksearch.git
+pip install -U git+https://github.com/AbhiTheModder/apksearch.git
 ```
 
 OR, through pip:
 
 ```sh
-pip install apksearch
+pip install -U apksearch
 ```
 
 ## Usage
@@ -65,7 +79,7 @@ if result:
 
 ### Classes and Methods
 
-#### `APKPure`
+#### `APKPure` | `APKCombo` | `APKFab`
 
 - **`__init__(self, pkg_name: str)`**: Initializes with the package name.
 - **`search_apk(self) -> None | tuple[str, str]`**: Searches for the APK on APKPure and returns the title and link if found.
@@ -94,6 +108,13 @@ pytest
 
 - [ ] Add more websites to search for APKs.
 
+## Acknowledgements
+
+- [APKUpdater](https://github.com/rumboalla/apkupdater) for APKMirror API.
+- [apkeep](https://github.com/EFForg/apkeep) for APKPure API.
+
+**Recommendation:** If you're looking for an APK downloader, I highly recommend using [apkeep](https://github.com/EFForg/apkeep).
+
 ## License
 
 This project is licensed under the MIT License. See the [LICENSE](https://github.com/AbhiTheModder/apksearch/blob/main/LICENSE) file for more details.
@@ -101,3 +122,5 @@ This project is licensed under the MIT License. See the [LICENSE](https://github
 ## Contributing
 
 Contributions are welcome! Please open an issue or submit a pull request on [GitHub](https://github.com/AbhiTheModder/apksearch).
+
+If you find this project helpful, please consider giving it a ⭐. Your support is greatly appreciated!

apksearch-1.2.5/apksearch/__init__.py

@@ -0,0 +1,7 @@
+from .sites.apkpure import APKPure
+from .sites.apkmirror import APKMirror
+from .sites.appteka import AppTeka
+from .sites.apkcombo import APKCombo
+from .sites.apkfab import APKFab
+
+__all__ = ["APKPure", "APKMirror", "AppTeka", "APKCombo", "APKFab"]

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

@@ -1,6 +1,6 @@
 import argparse
 
-from apksearch import APKPure, APKMirror, AppTeka
+from apksearch import APKPure, APKMirror, AppTeka, APKCombo, APKFab
 from requests.exceptions import ConnectionError, ConnectTimeout
 
 # Color codes
@@ -22,7 +22,59 @@ def search_apkpure(pkg_name: str, version: str | None) -> None:
         title, apk_link = result_apkpure
         print(f"{BOLD}APKPure:{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]] = apkpure.find_versions(apk_link)
+        if version:
+            versions: list[tuple[str, str]] = apkpure.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}APKPure:{NC} Version {RED}{version}{NC} not found!")
+    else:
+        print(f"{BOLD}APKPure:{NC} No Results!")
+
+
+def search_apkfab(pkg_name: str, version: str | None) -> None:
+    apkfab = APKFab(pkg_name)
+    try:
+        result_apkfab: tuple[str, str] | None = apkfab.search_apk()
+    except (ConnectionError, ConnectTimeout):
+        result_apkfab = None
+        print(f"{RED}Failed to resolve 'apkfab.com'!{NC}")
+    if result_apkfab:
+        title, apk_link = result_apkfab
+        print(f"{BOLD}APKFab:{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]] = apkfab.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}APKFab:{NC} Version {RED}{version}{NC} not found!")
+    else:
+        print(f"{BOLD}APKFab:{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:
@@ -31,20 +83,20 @@ def search_apkpure(pkg_name: str, version: str | None) -> None:
                     )
                     break
             else:
-                print(f"{BOLD}APKPure:{NC} Version {RED}{version}{NC} not found!")
+                print(f"{BOLD}APKCombo:{NC} Version {RED}{version}{NC} not found!")
     else:
-        print(f"{BOLD}APKPure:{NC} No Results!")
+        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 +114,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 +151,10 @@ 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)
+    # Initiate search on apkfab
+    search_apkfab(pkg_name, version)
 
 
 if __name__ == "__main__":

apksearch-1.2.5/apksearch/sites/apkcombo.py

@@ -0,0 +1,107 @@
+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")
+        try:
+            title = soup.find("div", {"class": "app_name"}).text.strip()
+        except AttributeError:
+            return None
+        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.2.5/apksearch/sites/apkfab.py

@@ -0,0 +1,120 @@
+from bs4 import BeautifulSoup
+import requests
+
+
+class APKFab:
+    """
+    This class provides methods to search for an APK on APKFab 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 APKFab website.
+        search_url (str): The URL used to search for APKs on APKFab.
+        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 APKFab 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://apkfab.com"
+        self.search_url = self.base_url + "/search?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://apkfab.com/search",
+            "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 APKFab 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_result = soup.find("div", {"class": "search-white"})
+        if search_result:
+            container = search_result.find("div", {"class": "container"})
+            if container:
+                lists = container.find("div", {"class": "list-template lists"})
+                if lists:
+                    items = lists.find_all("div", {"class": "list"})
+                    if items:
+                        item = items[0]
+                        apk_title = item.find("div", {"class": "title"}).text
+                        apk_link = item.find("a")["href"]
+                        package_name = apk_link.split("/")[-1]
+                        if package_name == pkg_name:
+                            return apk_title, apk_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 APKFab 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 + "/versions"
+            response: requests.Response = self.session.get(url, headers=self.headers)
+            soup = BeautifulSoup(response.text, "html.parser")
+            versions_list = soup.find("div", {"class": "version_history"})
+
+            if versions_list:
+                versions = versions_list.find_all("div", {"class": "list"})
+                if versions:
+                    for version in versions:
+                        package_info = version.find(
+                            "div", {"class": "package_info open_info"}
+                        )
+                        if package_info:
+                            title = package_info.find("div", {"class": "title"})
+                            apk_version = title.find(
+                                "span", {"class": "version"}
+                            ).text.strip()
+                            dl = version.find(
+                                "div", {"class": "v_h_button button_down"}
+                            )
+                            if dl:
+                                download_link = dl.find("a")["href"]
+                                versions_info.append((apk_version, download_link))
+                            else:
+                                # Some versions have multiple variants
+                                versions_info.append((apk_version, url))
+
+        return versions_info

{apksearch-1.1.0 → apksearch-1.2.5}/apksearch/sites/apkpure.py

@@ -29,6 +29,8 @@ class APKPure:
     def __init__(self, pkg_name: str):
         self.pkg_name = pkg_name
         self.base_url = "https://apkpure.net"
+        self.cdn_url = "https://d.cdnpure.com/b/APK/"
+        self.cdn_version = "?version="
         self.search_url = self.base_url + "/search?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",
@@ -72,6 +74,29 @@ class APKPure:
                     apk_package_name = apk_item["data-dt-pkg"]
                     if apk_package_name == pkg_name:
                         return apk_title, apk_link
+        # If site search resulted 0 results, try cdn link
+        # https://github.com/AbhiTheModder/apksearch/issues/2
+        url = self.cdn_url + pkg_name + self.cdn_version + "latest"
+        response: requests.Response = self.session.get(
+            url, headers=self.headers, allow_redirects=False
+        )
+        try:
+            location = response.headers.get("Location")
+        except AttributeError:
+            return None
+        if location:
+            if location == "https://apkpure.com":
+                return None
+            response: requests.Response = self.session.head(
+                location, allow_redirects=False
+            )
+            try:
+                content = response.headers.get("Content-Disposition")
+            except AttributeError:
+                return None
+            if content:
+                apk_title = content.split("filename=")[1].strip('"').split("_")[0]
+                return apk_title, location
         return None
 
     def find_versions(self, apk_link: str) -> list[tuple[str, str]]:
@@ -85,24 +110,24 @@ class APKPure:
             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 + "/versions"
-        response: requests.Response = self.session.get(url, headers=self.headers)
-        soup = BeautifulSoup(response.text, "html.parser")
-        versions_list = soup.find("ul", {"class": "version-list"})
         versions_info = []
+        if apk_link.startswith(self.base_url):
+            url = apk_link + "/versions"
+            response: requests.Response = self.session.get(url, headers=self.headers)
+            soup = BeautifulSoup(response.text, "html.parser")
+            versions_list = soup.find("ul", {"class": "version-list"})
 
-        if versions_list:
-            versions = versions_list.find_all(
-                "li", {"class": re.compile("^version dt-version-item.*")}
-            )
-            for version in versions:
-                version_icon = version.find("a", {"class": "dt-version-icon"})
-                version_info = version.find("div", {"class": "version-info"})
-                if version_icon and version_info:
-                    version_number = version_info.find(
-                        "span", {"class": "name one-line"}
-                    ).text
-                    download_url = self.base_url + version_icon["href"]
-                    versions_info.append((version_number, download_url))
-
+            if versions_list:
+                versions = versions_list.find_all(
+                    "li", {"class": re.compile("^version dt-version-item.*")}
+                )
+                for ver in versions:
+                    version_icon = ver.find("a", {"class": "dt-version-icon"})
+                    version_info = ver.find("div", {"class": "version-info"})
+                    if version_icon and version_info:
+                        version_number = version_info.find(
+                            "span", {"class": "name one-line"}
+                        ).text
+                        download_url = self.base_url + version_icon["href"]
+                        versions_info.append((version_number, download_url))
         return versions_info

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: apksearch
-Version: 1.1.0
+Version: 1.2.5
 Summary: Search for apks on varius websites
 Author-email: Abhi <allinoneallinone00@gmail.com>
 License: MIT License
@@ -28,7 +28,7 @@ License: MIT License
 Project-URL: homepage, https://github.com/AbhiTheModder/apksearch.git
 Project-URL: source, https://github.com/AbhiTheModder/apksearch.git
 Project-URL: issues, https://github.com/AbhiTheModder/apksearch.git/issues
-Classifier: Development Status :: 4 - Beta
+Classifier: Development Status :: 5 - Production/Stable
 Classifier: Natural Language :: English
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
@@ -63,18 +63,32 @@ There were countless occasions when I needed a specific APK for a package name,
 - **Retrieve APK Versions and Download Links:** It can fetch available versions and their download links for a given APK from APKPure and APKMirror.
 - **Command-Line Interface:** A CLI is available for users to search for APKs directly from the command line.
 
+## Supported Websites
+
+- [APKPure](https://apkpure.net/)
+- [APKMirror](https://www.apkmirror.com/)
+- [APKCombo](https://apkcombo.app/)
+- [APKFab](https://apkfab.com/)
+- [Appteka](https://appteka.store/)
+
+> [!NOTE]
+> **For site owners:**
+> If you're the owner of a website that's not listed here and you'd like to add support for it, feel free to open an issue or submit a pull request. I'm open to adding more websites to the library.
+> I respect the _value of user engagement and the revenue_ it generates for your site. To honor this, I have deliberately avoided including a download feature in the library, ensuring users will still need to visit your website, maintaining its traffic and engagement.
+> Additionally, I kindly ask that you **refrain from enforcing strict blocking measures**, such as aggressive Cloudflare rules, as the library is designed to work collaboratively rather than disruptively. Thank you!
+
 ## Installation
 
 To install the `apksearch` library, use the following command:
 
 ```sh
-pip install git+https://github.com/AbhiTheModder/apksearch.git
+pip install -U git+https://github.com/AbhiTheModder/apksearch.git
 ```
 
 OR, through pip:
 
 ```sh
-pip install apksearch
+pip install -U apksearch
 ```
 
 ## Usage
@@ -117,7 +131,7 @@ if result:
 
 ### Classes and Methods
 
-#### `APKPure`
+#### `APKPure` | `APKCombo` | `APKFab`
 
 - **`__init__(self, pkg_name: str)`**: Initializes with the package name.
 - **`search_apk(self) -> None | tuple[str, str]`**: Searches for the APK on APKPure and returns the title and link if found.
@@ -146,6 +160,13 @@ pytest
 
 - [ ] Add more websites to search for APKs.
 
+## Acknowledgements
+
+- [APKUpdater](https://github.com/rumboalla/apkupdater) for APKMirror API.
+- [apkeep](https://github.com/EFForg/apkeep) for APKPure API.
+
+**Recommendation:** If you're looking for an APK downloader, I highly recommend using [apkeep](https://github.com/EFForg/apkeep).
+
 ## License
 
 This project is licensed under the MIT License. See the [LICENSE](https://github.com/AbhiTheModder/apksearch/blob/main/LICENSE) file for more details.
@@ -153,3 +174,5 @@ This project is licensed under the MIT License. See the [LICENSE](https://github
 ## Contributing
 
 Contributions are welcome! Please open an issue or submit a pull request on [GitHub](https://github.com/AbhiTheModder/apksearch).
+
+If you find this project helpful, please consider giving it a ⭐. Your support is greatly appreciated!

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

@@ -11,9 +11,13 @@ 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/apkfab.py
 apksearch/sites/apkmirror.py
 apksearch/sites/apkpure.py
 apksearch/sites/appteka.py
+tests/test_apkcombo.py
+tests/test_apkfab.py
 tests/test_apkmirror.py
 tests/test_apkpure.py
 tests/test_appteka.py

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "apksearch"
-version = "1.1.0"
+version = "1.2.5"
 description = "Search for apks on varius websites"
 authors = [{ name = "Abhi", email = "allinoneallinone00@gmail.com" }]
 license = { file = "LICENSE" }
@@ -12,7 +12,7 @@ readme = "README.md"
 requires-python = ">=3.10"
 dependencies = ["beautifulsoup4>=4.12.3", "requests>=2.32.3"]
 classifiers = [
-    "Development Status :: 4 - Beta",
+    "Development Status :: 5 - Production/Stable",
     "Natural Language :: English",
     "Intended Audience :: Developers",
     "License :: OSI Approved :: MIT License",

apksearch-1.2.5/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."

apksearch-1.2.5/tests/test_apkfab.py

@@ -0,0 +1,38 @@
+from apksearch.sites.apkfab import APKFab
+
+
+def test_search_apk():
+    query = "com.roblox.client"
+    apkfab = APKFab(query)
+    result = apkfab.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"
+    apkfab = APKFab(query)
+    result = apkfab.search_apk()
+
+    if result:
+        apk_link = result[1]
+        versions = apkfab.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."

apksearch-1.1.0/apksearch/__init__.py

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