swiftshadow 0.1.2__tar.gz → 0.2.1__tar.gz

{swiftshadow-0.1.2/swiftshadow.egg-info → swiftshadow-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: swiftshadow
-Version: 0.1.2
+Version: 0.2.1
 Summary: Free IP Proxy rotator for python
 Home-page: https://github.com/sachin-sankar/swiftshadow
 Author: Sachin Sankar

{swiftshadow-0.1.2 → swiftshadow-0.2.1}/setup.py

@@ -25,7 +25,7 @@ setup(
     description="Free IP Proxy rotator for python",
     long_description=long_description,
     long_description_content_type="text/markdown",
-    version=VERSION.get("__version__", "0.1.2"),
+    version=VERSION.get("__version__", "0.2.1"),
     packages=find_packages(where=".", exclude=["tests"]),
     install_requires=["requests"],
     classifiers=[

swiftshadow-0.2.1/swiftshadow/cache.py

@@ -0,0 +1,16 @@
+from datetime import datetime, timezone, timedelta
+from time import sleep
+
+
+def getExpiry(expiryIn):
+    now = datetime.now(timezone.utc)
+    expiry = now + timedelta(seconds=expiryIn)
+    return expiry
+
+
+def checkExpiry(expiryDateObject):
+    now = datetime.now(timezone.utc)
+    if (now - expiryDateObject).days < 0:
+        return False
+    else:
+        return True

{swiftshadow-0.1.2 → swiftshadow-0.2.1}/swiftshadow/swiftshadow.py

@@ -1,9 +1,10 @@
 from requests import get
 from random import choice
 from datetime import datetime, timezone, timedelta
-from pickle import dump, load
+from json import dump, load
 from swiftshadow.helpers import log
 from swiftshadow.providers import Proxyscrape, Scrapingant
+import swiftshadow.cache as cache
 
 
 class Proxy:
@@ -25,7 +26,7 @@ class Proxy:
                 protocol: HTTP/HTTPS protocol to filter proxies.
                 maxProxies: Maximum number of proxies to store and rotate from.
                 autoRotate: Rotates proxy when `Proxy.proxy()` function is called.
-                cachePeriod: Time to cache proxies in minutes.
+                cachePeriod: Time to cache proxies in seconds.
 
         Returns:
                 proxyClass (swiftshadow.Proxy): `swiftshadow.Proxy` class instance
@@ -44,7 +45,8 @@ class Proxy:
         self.maxProxies = maxProxies
         self.autoRotate = autoRotate
         self.cachePeriod = cachePeriod
-        self.updateProxyList()
+
+        self.update()
 
     def checkIp(self, ip, cc, protocol):
         if (ip[1] == cc or cc == None) and ip[2] == protocol:
@@ -60,27 +62,16 @@ class Proxy:
         else:
             return False
 
-    def checkCache(self, latest, cache=datetime.now(timezone.utc)):
-        expiry = latest + timedelta(minutes=self.cachePeriod)
-        live = cache - latest
-        dead = expiry - cache
-        limit = float(self.cachePeriod)
-        if live.seconds / 60 < limit and dead.seconds / 60 < limit:
-            cacheValid = True
-        else:
-            cacheValid = False
-        return cacheValid
-
-    def updateProxyList(self):
+    def update(self):
         try:
-            with open(".swiftshadow.dat", "rb") as file:
+            with open(".swiftshadow.json", "r") as file:
                 data = load(file)
-                self.latest = data[0]
-                cacheState = self.checkCache(self.latest)
-            if cacheState:
+                self.expiry = datetime.fromisoformat(data[0])
+                expired = cache.checkExpiry(self.expiry)
+            if not expired:
                 log(
                     "info",
-                    f"{datetime.now(timezone.utc).time()} Loaded proxies from cache",
+                    f"Loaded proxies from cache",
                 )
                 self.proxies = data[1]
                 self.current = self.proxies[0]
@@ -88,7 +79,7 @@ class Proxy:
             else:
                 log(
                     "info",
-                    f"{datetime.now(timezone.utc).time()} Cache expired. Updating cache...",
+                    f"Cache expired. Updating cache...",
                 )
         except FileNotFoundError:
             log("error", "No cache found. Cache will be created after update")
@@ -105,8 +96,8 @@ class Proxy:
                 "No proxies found for current settings. To prevent runtime error updating the proxy list again.",
             )
             self.update()
-        with open(".swiftshadow.dat", "wb") as file:
-            dump([datetime.now(timezone.utc), self.proxies], file)
+        with open(".swiftshadow.json", "w") as file:
+            dump([cache.getExpiry(self.cachePeriod).isoformat(), self.proxies], file)
         self.current = self.proxies[0]
 
     def rotate(self):
@@ -118,7 +109,7 @@ class Proxy:
         Note:
                 Function only for manual rotation. If `autoRotate` is set to `True` then no need to call this function.
         """
-        if not self.checkCache(self.latest):
+        if cache.checkExpiry(self.expiry):
             self.update()
         self.current = choice(self.proxies)
 
@@ -129,7 +120,7 @@ class Proxy:
         Returns:
                 proxyDict (dict):A proxy dict of format `{protocol:address}`
         """
-        if not self.checkCache(self.latest):
+        if cache.checkExpiry(self.expiry):
             self.update()
         if self.autoRotate == True:
             return choice(self.proxies)

{swiftshadow-0.1.2 → swiftshadow-0.2.1/swiftshadow.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: swiftshadow
-Version: 0.1.2
+Version: 0.2.1
 Summary: Free IP Proxy rotator for python
 Home-page: https://github.com/sachin-sankar/swiftshadow
 Author: Sachin Sankar

{swiftshadow-0.1.2 → swiftshadow-0.2.1}/swiftshadow.egg-info/SOURCES.txt

@@ -2,7 +2,7 @@ LICENSE
 README.md
 setup.py
 swiftshadow/__init__.py
-swiftshadow/classes.py
+swiftshadow/cache.py
 swiftshadow/constants.py
 swiftshadow/helpers.py
 swiftshadow/providers.py

swiftshadow-0.1.2/swiftshadow/classes.py

@@ -1,22 +0,0 @@
-from requests import get
-
-
-class ScrapingAnt:
-    def __init__(self):
-        self.update()
-
-    def update(self):
-        raw = get("https://scrapingant.com/proxies").text
-        rows = [i.split("<td>") for i in raw.split("<tr>")]
-        data = []
-
-        def clean(text):
-            return text[: text.find("<")].strip()
-
-        for row in rows[2:]:
-            cleaned = [clean(row[1]) + ":" + clean(row[2]), clean(row[3]).lower()]
-            data.append(cleaned)
-        print(data)
-
-
-a = ScrapingAnt()