swiftshadow 1.1.0__tar.gz → 1.2.1__tar.gz

{swiftshadow-1.1.0/swiftshadow.egg-info → swiftshadow-1.2.1}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.1
 Name: swiftshadow
-Version: 1.1.0
+Version: 1.2.1
 Summary: Free IP Proxy rotator for python
 Home-page: https://github.com/sachin-sankar/swiftshadow
 Author: Sachin Sankar
 Author-email: mail.sachinsankar@gmail.com
-Classifier: Development Status :: 2 - Pre-Alpha
+Classifier: Development Status :: 5 - Production/Stable
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: requests
@@ -14,6 +14,9 @@ Requires-Dist: requests
 
 ![PyPI - Downloads](https://img.shields.io/pypi/dm/swiftshadow) ![GitHub release (latest by date including pre-releases)](https://img.shields.io/github/v/release/sachin-sankar/swiftshadow?include_prereleases&style=flat)
 
+> [!TIP]  
+> I'm refactoring the library for better speed and maintainability. Future updates might have breaking changes, but I'll keep you posted!
+
 ## About
 
 Swiftshadow is a powerful Python library designed to simplify the process of rotating IP proxies for web scraping, data mining, and other automated tasks. With its advanced features, Swiftshadow can help you overcome many of the challenges associated with web scraping, including blocked IP addresses and other forms of detection.

{swiftshadow-1.1.0 → swiftshadow-1.2.1}/README.md

@@ -2,6 +2,9 @@
 
 ![PyPI - Downloads](https://img.shields.io/pypi/dm/swiftshadow) ![GitHub release (latest by date including pre-releases)](https://img.shields.io/github/v/release/sachin-sankar/swiftshadow?include_prereleases&style=flat)
 
+> [!TIP]  
+> I'm refactoring the library for better speed and maintainability. Future updates might have breaking changes, but I'll keep you posted!
+
 ## About
 
 Swiftshadow is a powerful Python library designed to simplify the process of rotating IP proxies for web scraping, data mining, and other automated tasks. With its advanced features, Swiftshadow can help you overcome many of the challenges associated with web scraping, including blocked IP addresses and other forms of detection.

{swiftshadow-1.1.0 → swiftshadow-1.2.1}/setup.py

@@ -19,10 +19,10 @@ setup(
     description="Free IP Proxy rotator for python",
     long_description=long_description,
     long_description_content_type="text/markdown",
-    version="1.1.0",
+    version="1.2.1",
     packages=find_packages(where=".", exclude=["tests"]),
     install_requires=["requests"],
     classifiers=[
-        "Development Status :: 2 - Pre-Alpha",
+        "Development Status :: 5 - Production/Stable",
     ],
 )

swiftshadow-1.2.1/swiftshadow/__init__.py

@@ -0,0 +1,25 @@
+from swiftshadow.providers import Providers
+
+
+def QuickProxy(countries: list = [], protocol: str = "http"):
+    """
+    This function is a faster alternative to `Proxy` class.
+    No caching is done.
+
+    Args:
+     countries: ISO 3166-2 Two letter country codes to filter proxies.
+     protocol: HTTP/HTTPS protocol to filter proxies.
+
+    Returns:
+                    proxyObject (dict): A working proxy object.
+    """
+    for providerDict in Providers:
+        if protocol not in providerDict["protocols"]:
+            continue
+        if (len(countries) != 0) and (not providerDict["countryFilter"]):
+            continue
+        try:
+            return providerDict["provider"](1, countries, protocol)[0]
+        except:
+            continue
+    return None

{swiftshadow-1.1.0 → swiftshadow-1.2.1}/swiftshadow/classes.py

@@ -1,7 +1,8 @@
 from requests import get
 from random import choice
 from json import dump, load
-from swiftshadow.providers import Proxyscrape, Scrapingant, Providers
+from swiftshadow.helpers import log
+from swiftshadow.providers import Providers
 import swiftshadow.cache as cache
 import logging
 import sys
@@ -74,20 +75,6 @@ class Proxy:
             logger.addHandler(fileHandler)
         self.update()
 
-    def checkIp(self, ip, cc, protocol):
-        if (ip[1] == cc or cc == None) and ip[2] == protocol:
-            proxy = {ip[2]: ip[0]}
-            try:
-                oip = get(f"{protocol}://ipinfo.io/ip", proxies=proxy).text
-            except:
-                return False
-            if oip.count(".") == 3 and oip != self.mip:
-                return True
-            else:
-                return False
-        else:
-            return False
-
     def update(self):
         try:
             with open(self.cacheFilePath, "r") as file:
@@ -110,11 +97,16 @@ class Proxy:
             logger.info("No cache found. Cache will be created after update")
 
         self.proxies = []
-        self.proxies.extend(Proxyscrape(self.maxProxies, self.countries, self.protocol))
-        if len(self.proxies) != self.maxProxies:
+        for providerDict in Providers:
+            if self.protocol not in providerDict["protocols"]:
+                continue
+            if (len(self.countries) != 0) and (not providerDict["countryFilter"]):
+                continue
             self.proxies.extend(
-                Scrapingant(self.maxProxies, self.countries, self.protocol)
+                providerDict["provider"](self.maxProxies, self.countries, self.protocol)
             )
+            if len(self.proxies) >= self.maxProxies:
+                break
         if len(self.proxies) == 0:
             logger.warning(
                 "No proxies found for current settings. To prevent runtime error updating the proxy list again.",

swiftshadow-1.2.1/swiftshadow/helpers.py

@@ -0,0 +1,22 @@
+from requests import get
+from datetime import datetime
+
+
+def checkProxy(proxy):
+    proxyDict = {proxy[1]: proxy[0]}
+    try:
+        resp = get(
+            f"{proxy[1]}://checkip.amazonaws.com", proxies=proxyDict, timeout=2
+        ).text
+        if resp.count(".") == 3:
+            return True
+        return False
+    except Exception as e:
+        return False
+
+
+def log(level, message):
+    level = level.upper()
+    print(
+        f'{datetime.now().strftime("%d/%m/%Y %H:%M:%S")} - [swiftshadow] - {level} : {message}'
+    )

swiftshadow-1.2.1/swiftshadow/providers.py

@@ -0,0 +1,72 @@
+from requests import get
+from swiftshadow.helpers import checkProxy
+
+
+def Monosans(max, countries=[], protocol="http"):
+    raw = get(
+        "https://raw.githubusercontent.com/monosans/proxy-list/main/proxies.json"
+    ).json()
+    results = []
+    count = 0
+    for proxy in raw:
+        if count == max:
+            return results
+        if proxy["protocol"] == protocol:
+            if (
+                len(countries) != 0
+                and proxy["geolocation"]["country"]["iso_code"] not in countries
+            ):
+                continue
+            proxy = [f'{proxy["host"]}:{proxy["port"]}', proxy["protocol"]]
+            if checkProxy(proxy):
+                results.append(proxy)
+                count += 1
+    return results
+
+
+def Thespeedx(max, countries=[], protocol="http"):
+    results = []
+    count = 0
+    raw = get(
+        "https://raw.githubusercontent.com/TheSpeedX/PROXY-List/master/http.txt"
+    ).text
+    for line in raw.splitlines():
+        if count == max:
+            break
+        proxy = [line, "http"]
+        if checkProxy(proxy):
+            results.append(proxy)
+            print(proxy, True)
+            count += 1
+        else:
+            continue
+    return results
+
+
+def ProxyScrape(max, countries=[], protocol="http"):
+    baseUrl = "https://api.proxyscrape.com/v3/free-proxy-list/get?request=displayproxies&protocol=http&proxy_format=ipport&format=json"
+    results = []
+    count = 0
+    if len(countries) == 0:
+        apiUrl = baseUrl + "&country=all"
+    else:
+        apiUrl = baseUrl + "&country=" + ",".join([i.upper() for i in countries])
+    raw = get(apiUrl).json()
+    for ipRaw in raw["proxies"]:
+        if count == max:
+            break
+        proxy = [ipRaw["proxy"], "http"]
+        if checkProxy(proxy):
+            results.append(proxy)
+            count += 1
+        else:
+            print(proxy, False)
+            continue
+    return results
+
+
+Providers = [
+    {"provider": Monosans, "countryFilter": True, "protocols": ["http"]},
+    {"provider": Thespeedx, "countryFilter": False, "protocols": ["http"]},
+    {"provider": ProxyScrape, "countryFilter": True, "protocols": ["http"]},
+]

{swiftshadow-1.1.0 → swiftshadow-1.2.1/swiftshadow.egg-info}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.1
 Name: swiftshadow
-Version: 1.1.0
+Version: 1.2.1
 Summary: Free IP Proxy rotator for python
 Home-page: https://github.com/sachin-sankar/swiftshadow
 Author: Sachin Sankar
 Author-email: mail.sachinsankar@gmail.com
-Classifier: Development Status :: 2 - Pre-Alpha
+Classifier: Development Status :: 5 - Production/Stable
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: requests
@@ -14,6 +14,9 @@ Requires-Dist: requests
 
 ![PyPI - Downloads](https://img.shields.io/pypi/dm/swiftshadow) ![GitHub release (latest by date including pre-releases)](https://img.shields.io/github/v/release/sachin-sankar/swiftshadow?include_prereleases&style=flat)
 
+> [!TIP]  
+> I'm refactoring the library for better speed and maintainability. Future updates might have breaking changes, but I'll keep you posted!
+
 ## About
 
 Swiftshadow is a powerful Python library designed to simplify the process of rotating IP proxies for web scraping, data mining, and other automated tasks. With its advanced features, Swiftshadow can help you overcome many of the challenges associated with web scraping, including blocked IP addresses and other forms of detection.

swiftshadow-1.1.0/swiftshadow/__init__.py

@@ -1,19 +0,0 @@
-from swiftshadow.providers import Proxyscrape, Scrapingant
-
-
-def QuickProxy(countries: list = [], protocol: str = "http"):
-    """
-    This function is a faster alternative to `Proxy` class.
-    No caching is done.
-
-    Args:
-     countries: ISO 3166-2 Two letter country codes to filter proxies.
-     protocol: HTTP/HTTPS protocol to filter proxies.
-
-    Returns:
-                    proxyObject (dict): A working proxy object.
-    """
-    try:
-        return Proxyscrape(1, countries=countries, protocol=protocol)[0]
-    except:
-        return Scrapingant(1, countries=countries, protocol=protocol)[0]

swiftshadow-1.1.0/swiftshadow/helpers.py

@@ -1,25 +0,0 @@
-from swiftshadow.constants import CountryCodes
-from requests import get
-
-
-def getCountryCode(countryName):
-    try:
-        return CountryCodes[countryName]
-    except KeyError:
-        for name in list(CountryCodes.keys()):
-            if countryName in name:
-                return CountryCodes[name]
-
-
-def checkProxy(proxy, countries):
-    if countries != []:
-        if proxy[-1].upper() not in countries:
-            return False
-    proxyDict = {proxy[1]: proxy[0]}
-    try:
-        resp = get(f"{proxy[1]}://ipinfo.io/ip", proxies=proxyDict, timeout=2).text
-        if resp.count(".") == 3:
-            return True
-        return False
-    except Exception as e:
-        return False

swiftshadow-1.1.0/swiftshadow/providers.py

@@ -1,52 +0,0 @@
-from requests import get
-from swiftshadow.helpers import getCountryCode, checkProxy
-
-
-def Scrapingant(max, countries=[], protocol="http"):
-    result = []
-    count = 0
-    raw = get("https://scrapingant.com/proxies").text
-    rows = [i.split("<td>") for i in raw.split("<tr>")]
-
-    def clean(text):
-        return text[: text.find("<")].strip()
-
-    for row in rows[2:]:
-        if count == max:
-            return result
-        zprotocol = clean(row[3]).lower()
-        if zprotocol != protocol:
-            continue
-        cleaned = [
-            clean(row[1]) + ":" + clean(row[2]),
-            protocol,
-            getCountryCode(clean(row[4].split(" ", 1)[1])),
-        ]
-        if checkProxy(cleaned, countries):
-            result.append({cleaned[1]: cleaned[0]})
-            count += 1
-    return result
-
-
-def Proxyscrape(max, countries=[], protocol="http"):
-    result = []
-    count = 0
-    query = "https://api.proxyscrape.com/v2/?timeout=5000&request=displayproxies&protocol=http"
-    if countries == []:
-        query += "&country=all"
-    else:
-        query += "&country=" + ",".join(countries)
-    if protocol == "https":
-        query += "&ssl=yes"
-    ips = get(query).text
-    for ip in ips.split("\n"):
-        if count == max:
-            return result
-        proxy = [ip.strip(), protocol, "all"]
-        if checkProxy(proxy, []):
-            result.append({proxy[1]: proxy[0]})
-            count += 1
-    return result
-
-
-Providers = [Proxyscrape, Scrapingant]