swiftshadow 1.1.0__py3-none-any.whl → 1.2.0__py3-none-any.whl

swiftshadow/__init__.py

@@ -1,4 +1,4 @@
-from swiftshadow.providers import Proxyscrape, Scrapingant
+from swiftshadow.providers import Providers
 
 
 def QuickProxy(countries: list = [], protocol: str = "http"):
@@ -13,7 +13,13 @@ def QuickProxy(countries: list = [], protocol: str = "http"):
     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]
+    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/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/helpers.py

@@ -1,25 +1,22 @@
-from swiftshadow.constants import CountryCodes
 from requests import get
+from datetime import datetime
 
 
-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
+def checkProxy(proxy):
     proxyDict = {proxy[1]: proxy[0]}
     try:
-        resp = get(f"{proxy[1]}://ipinfo.io/ip", proxies=proxyDict, timeout=2).text
+        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/providers.py

@@ -1,52 +1,57 @@
 from requests import get
-from swiftshadow.helpers import getCountryCode, checkProxy
+from swiftshadow.helpers import checkProxy
 
-
-def Scrapingant(max, countries=[], protocol="http"):
-    result = []
+def Monosans(max, countries=[],protocol="http"):
+    raw = get('https://raw.githubusercontent.com/monosans/proxy-list/main/proxies.json').json()
+    results = []
     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:]:
+    for proxy in raw:
         if count == max:
-            return result
-        zprotocol = clean(row[3]).lower()
-        if zprotocol != protocol:
+            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
-        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 = []
+    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
-    query = "https://api.proxyscrape.com/v2/?timeout=5000&request=displayproxies&protocol=http"
-    if countries == []:
-        query += "&country=all"
+    if len(countries) == 0:
+        apiUrl = baseUrl + '&country=all'
     else:
-        query += "&country=" + ",".join(countries)
-    if protocol == "https":
-        query += "&ssl=yes"
-    ips = get(query).text
-    for ip in ips.split("\n"):
+        apiUrl = baseUrl + '&country=' + ','.join([i.upper() for i in countries])
+    raw = get(apiUrl).json()
+    for ipRaw in raw['proxies']:
         if count == max:
-            return result
-        proxy = [ip.strip(), protocol, "all"]
-        if checkProxy(proxy, []):
-            result.append({proxy[1]: proxy[0]})
+            break
+        proxy = [ipRaw['proxy'],'http']  
+        if checkProxy(proxy):
+            results.append(proxy)
             count += 1
-    return result
-
+        else:
+            print(proxy,False)
+            continue
+    return results          
 
-Providers = [Proxyscrape, Scrapingant]
+Providers = [{'provider':Monosans,'countryFilter':True,'protocols':['http']},{'provider':Thespeedx,'countryFilter':False,'protocols':['http']},{'provider':ProxyScrape,'countryFilter':True,'protocols':['http']}]

{swiftshadow-1.1.0.dist-info → swiftshadow-1.2.0.dist-info}/METADATA

@@ -1,11 +1,11 @@
 Metadata-Version: 2.1
 Name: swiftshadow
-Version: 1.1.0
+Version: 1.2.0
 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.2.0.dist-info/RECORD

@@ -0,0 +1,11 @@
+swiftshadow/__init__.py,sha256=UGscPyIFECuTgLjcMxp9_QNyfxd6b-msRAtubenBAL0,764
+swiftshadow/cache.py,sha256=tNj07m0Ii_r0wLu9NKTYxOyS8uYeC7BbgFdMnuLqK7Y,411
+swiftshadow/classes.py,sha256=YlXuV5QobEwvIMQDt2sjT173Q-EQbGk6bz5nfyn0Cds,5249
+swiftshadow/constants.py,sha256=FRhoYg8WNaLy8RLDD4BsANlXlY2tctBCdy7sCnkaVY0,6303
+swiftshadow/helpers.py,sha256=RGC-Tq9vWqiddu_KEKYWc_URO-ISm3PXuMBqB_cl7XQ,533
+swiftshadow/providers.py,sha256=qUYUxUuSifwuWWs3KxW2al_T5ee9Lr7MRaTddIR9lyw,2060
+swiftshadow-1.2.0.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+swiftshadow-1.2.0.dist-info/METADATA,sha256=RRq0DPKJlgD1gboURK0gtCJ_Fq04P08hinNvz988BjY,2793
+swiftshadow-1.2.0.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
+swiftshadow-1.2.0.dist-info/top_level.txt,sha256=GClzVDF5vWSzqHOwgG2ycQAAJXRxd-QOdP1h3YrHOuM,12
+swiftshadow-1.2.0.dist-info/RECORD,,

{swiftshadow-1.1.0.dist-info → swiftshadow-1.2.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
+Generator: setuptools (70.2.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

swiftshadow-1.1.0.dist-info/RECORD

@@ -1,11 +0,0 @@
-swiftshadow/__init__.py,sha256=cybIN6hvkK06k9aeun0YhhuUSZiEcIr6jdOne2WFWlA,604
-swiftshadow/cache.py,sha256=tNj07m0Ii_r0wLu9NKTYxOyS8uYeC7BbgFdMnuLqK7Y,411
-swiftshadow/classes.py,sha256=V2ry_xqCQtBKgV2tBRxtQET4kLvikxQCVyUmzp8fGGg,5505
-swiftshadow/constants.py,sha256=FRhoYg8WNaLy8RLDD4BsANlXlY2tctBCdy7sCnkaVY0,6303
-swiftshadow/helpers.py,sha256=HHZmaBU4qZjypn30jQ5TXHqy8xhr46tSmV9qBdZeBpw,691
-swiftshadow/providers.py,sha256=GaVKg5J5hH2HSfdGDPuFivcCu6QB5HFjlVFvrrtNdhw,1490
-swiftshadow-1.1.0.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-swiftshadow-1.1.0.dist-info/METADATA,sha256=BcaplWtegmLscWt__ciZ2y3dUE5hoWRoB_jJTX-lHlk,2635
-swiftshadow-1.1.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-swiftshadow-1.1.0.dist-info/top_level.txt,sha256=GClzVDF5vWSzqHOwgG2ycQAAJXRxd-QOdP1h3YrHOuM,12
-swiftshadow-1.1.0.dist-info/RECORD,,