swiftshadow 1.0.2__tar.gz → 1.1.0__tar.gz

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

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

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

@@ -19,7 +19,7 @@ setup(
     description="Free IP Proxy rotator for python",
     long_description=long_description,
     long_description_content_type="text/markdown",
-    version="1.0.2",
+    version="1.1.0",
     packages=find_packages(where=".", exclude=["tests"]),
     install_requires=["requests"],
     classifiers=[

{swiftshadow-1.0.2 → swiftshadow-1.1.0}/swiftshadow/cache.py

@@ -1,5 +1,4 @@
 from datetime import datetime, timezone, timedelta
-from time import sleep
 
 
 def getExpiry(expiryIn):

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

@@ -1,10 +1,17 @@
 from requests import get
 from random import choice
 from json import dump, load
-from swiftshadow.helpers import log
 from swiftshadow.providers import Proxyscrape, Scrapingant, Providers
 import swiftshadow.cache as cache
-import os
+import logging
+import sys
+
+logger = logging.getLogger("swiftshadow")
+logger.setLevel(logging.INFO)
+logFormat = logging.Formatter("%(asctime)s - %(name)s [%(levelname)s]:%(message)s")
+streamhandler = logging.StreamHandler(stream=sys.stdout)
+streamhandler.setFormatter(logFormat)
+logger.addHandler(streamhandler)
 
 
 class Proxy:
@@ -16,6 +23,8 @@ class Proxy:
         autoRotate: bool = False,
         cachePeriod: int = 10,
         cacheFolder: str = "",
+        debug: bool = False,
+        logToFile: bool = False,
     ):
         """
         The one class for everything.
@@ -29,6 +38,8 @@ class Proxy:
                 autoRotate: Rotates proxy when `Proxy.proxy()` function is called.
                 cachePeriod: Time to cache proxies in minutes.
                 cacheFolder: Folder to store cache file.
+                debug: Sets Log Level to Debug.
+                logToFile: Whether to pipe log to a log file. If cacheFolder is set log file is saved there.
 
         Returns:
                 proxyClass (swiftshadow.Proxy): `swiftshadow.Proxy` class instance
@@ -51,7 +62,16 @@ class Proxy:
             self.cacheFilePath = ".swiftshadow.json"
         else:
             self.cacheFilePath = f"{cacheFolder}/.swiftshadow.json"
-
+        if debug:
+            logger.setLevel(logging.DEBUG)
+        if logToFile:
+            if cacheFolder == "":
+                logFilePath = "swiftshadow.log"
+            else:
+                logFilePath = f"{cacheFolder}/swiftshadow.log"
+            fileHandler = logging.FileHandler(logFilePath)
+            fileHandler.setFormatter(logFormat)
+            logger.addHandler(fileHandler)
         self.update()
 
     def checkIp(self, ip, cc, protocol):
@@ -75,8 +95,7 @@ class Proxy:
                 self.expiry = data[0]
                 expired = cache.checkExpiry(self.expiry)
             if not expired:
-                log(
-                    "info",
+                logger.info(
                     "Loaded proxies from cache",
                 )
                 self.proxies = data[1]
@@ -84,12 +103,11 @@ class Proxy:
                 self.current = self.proxies[0]
                 return
             else:
-                log(
-                    "info",
-                    "Cache expired. Updating cache...",
+                logger.info(
+                    "Cache expired. Updating cache.",
                 )
         except FileNotFoundError:
-            log("error", "No cache found. Cache will be created after update")
+            logger.info("No cache found. Cache will be created after update")
 
         self.proxies = []
         self.proxies.extend(Proxyscrape(self.maxProxies, self.countries, self.protocol))
@@ -98,8 +116,7 @@ class Proxy:
                 Scrapingant(self.maxProxies, self.countries, self.protocol)
             )
         if len(self.proxies) == 0:
-            log(
-                "warning",
+            logger.warning(
                 "No proxies found for current settings. To prevent runtime error updating the proxy list again.",
             )
             self.update()
@@ -134,32 +151,3 @@ class Proxy:
             return choice(self.proxies)
         else:
             return self.current
-
-
-class ProxyChains:
-    def __init__(
-        self, countries: list = [], protocol: str = "http", maxProxies: int = 10
-    ):
-        self.countries = [i.upper() for i in countries]
-        self.protocol = protocol
-        self.maxProxies = maxProxies
-        self.update()
-
-    def update(self):
-        proxies = []
-        for provider in Providers:
-            print(len(proxies))
-            if len(proxies) == self.maxProxies:
-                break
-            log("INFO", f"{provider}")
-            for proxyDict in provider(self.maxProxies, self.countries, self.protocol):
-                proxyRaw = list(proxyDict.items())[0]
-                proxy = f'{proxyRaw[0]} {proxyRaw[1].replace(":"," ")}'
-                proxies.append(proxy)
-        proxies = "\n".join(proxies)
-        configFileName = "swiftshadow-proxychains.conf"
-        config = f"random_chain\nchain_len=1\nproxy_dns\n[ProxyList]\n{proxies}"
-        with open(configFileName, "w") as file:
-            file.write(config)
-        cmd = f"proxychains -f {os.path.abspath(configFileName)}"
-        os.system(cmd)

{swiftshadow-1.0.2 → swiftshadow-1.1.0}/swiftshadow/helpers.py

@@ -1,6 +1,5 @@
 from swiftshadow.constants import CountryCodes
 from requests import get
-from datetime import datetime
 
 
 def getCountryCode(countryName):
@@ -23,12 +22,4 @@ def checkProxy(proxy, countries):
             return True
         return False
     except Exception as e:
-        # log('error',str(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.0.2 → swiftshadow-1.1.0/swiftshadow.egg-info}/PKG-INFO

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