swiftshadow 0.2.0__tar.gz → 0.2.1__tar.gz

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

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

{swiftshadow-0.2.0 → 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.2.0"),
+    version=VERSION.get("__version__", "0.2.1"),
     packages=find_packages(where=".", exclude=["tests"]),
     install_requires=["requests"],
     classifiers=[

{swiftshadow-0.2.0 → swiftshadow-0.2.1}/swiftshadow/cache.py

@@ -4,7 +4,7 @@ from time import sleep
 
 def getExpiry(expiryIn):
     now = datetime.now(timezone.utc)
-    expiry = now + timedelta(minutes=expiryIn)
+    expiry = now + timedelta(seconds=expiryIn)
     return expiry
 
 

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

@@ -1,7 +1,7 @@
 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
@@ -26,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
@@ -45,6 +45,7 @@ class Proxy:
         self.maxProxies = maxProxies
         self.autoRotate = autoRotate
         self.cachePeriod = cachePeriod
+
         self.update()
 
     def checkIp(self, ip, cc, protocol):
@@ -63,9 +64,9 @@ class Proxy:
 
     def update(self):
         try:
-            with open(".swiftshadow.dat", "rb") as file:
+            with open(".swiftshadow.json", "r") as file:
                 data = load(file)
-                self.expiry = data[0]
+                self.expiry = datetime.fromisoformat(data[0])
                 expired = cache.checkExpiry(self.expiry)
             if not expired:
                 log(
@@ -95,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([cache.getExpiry(self.cachePeriod), 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):
@@ -125,11 +126,3 @@ class Proxy:
             return choice(self.proxies)
         else:
             return self.current
-
-
-from time import sleep
-
-a = Proxy(cachePeriod=1, maxProxies=1)
-while True:
-    print(a.proxy())
-    sleep(1)

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

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