Site Objects

main.py

@@ -1,10 +1,10 @@
 import src.tools as tools
-import src.monitor as monitor
+import src.site as site
 import src.proxy as proxy
+import src.monitor as monitor
 
 import os
 import glob
-import json
 from dotenv import load_dotenv
 from colorama import Style, Fore, init
 
@@ -18,10 +18,10 @@ def initialize():
     init(autoreset=True)
 
 
-def readsites(sitepath=None):
+def checksites(sitepath=None):
     print(f"{tools.heading('Checking Sitedata')}\n{tools.spacer}")
 
-    dod = {}
+    sitedic = {}
     if sitepath:
         sitedir = sitepath
     else:
@@ -29,54 +29,63 @@ def readsites(sitepath=None):
         sitedir = rootdir + r"\sites"
 
     for sitefile in glob.glob(sitedir + r"\*.json"):
-        sfn = os.path.basename(sitefile)
-        site, ext = os.path.splitext(sfn)
-        print(f"> {sfn}", end=" | ")
-        with open(sitefile, 'r') as f:
-            data = json.load(f)
-            print(f"data:{data}")
-        dod[site] = data
+        asite = site.Site(sitefile)
 
-    # print(f"DEBUG: {dod}")
+        print(f"> {Fore.MAGENTA}{asite.name:10s}{Style.RESET_ALL} |"
+              f" {tools.keyword('URL')}({asite.url})")
+
+        sitedic[asite.name] = asite
 
     print(tools.spacer)
+    return sitedic
 
 
-def proxytest():
+def createproxys():
     print(f"{tools.heading('Creating Proxy(s)')}\n{tools.spacer}")
 
+    proxydic = {}
     one = proxy.Proxy(
-        name="One",
+        name="PrxOne",
         url=os.getenv("PROXYURL"),
         port=os.getenv("PROXYPORT"),
         usr=os.getenv("PROXYUSR"),
         pwd=os.getenv("PROXYPW")
     )
-    print(f"> {Fore.MAGENTA}{one.name}{Style.RESET_ALL} |"
+    print(f"> {Fore.MAGENTA}{one.name:10s}{Style.RESET_ALL} |"
           f" {tools.keyword('PROXYIP')}({one.ip}) {tools.keyword('WORKING')}({one.isworking})")
 
     # one.testurl("http://www.whatismyproxy.com/")
+    proxydic[one.name] = one
 
     print(tools.spacer)
+    return proxydic
 
 
-def monitortest(n=1):
+def createmonitors(n=1):
     print(f"{tools.heading(f'Creating Monitor(s)')}\n{tools.spacer}")
 
+    monitordic = {}
     for i in range(0, n):
         mon = monitor.Monitor()
-        mon.name = f"Monitor {i}"
+        mon.name = f"Mon{i}"
         mon.url = "test"
-        print(f"> {Fore.MAGENTA}{mon.name}{Style.RESET_ALL} |"
+        print(f"> {Fore.MAGENTA}{mon.name:10s}{Style.RESET_ALL} |"
               f" {tools.keyword('URL')}({mon.url}) {tools.keyword('PROXY')}({mon.proxy})")
 
+        monitordic[mon.name] = mon
+
     print(tools.spacer)
+    return monitordic
 
 
 if __name__ == "__main__":
 
     tools.clear()
     initialize()
-    readsites()
-    proxytest()
-    monitortest()
+    dicSites = checksites()
+    dicProxys = createproxys()
+    dicMonitors = createmonitors()
+
+    print(dicSites)
+    print(dicProxys)
+    print(dicMonitors)

src/site.py

@@ -0,0 +1,28 @@
+import os
+import json
+
+
+class Site:
+
+    def __init__(self, file):
+
+        # Necessary
+        self.file = file
+
+        # Created on readfile
+        self.name = None
+        self.url = None
+        self.data = None
+        self.ext = None
+
+        self.readfile()
+
+    def readfile(self):
+        self.name = os.path.basename(self.file)
+        site, self.ext = os.path.splitext(self.name)
+
+        with open(self.file, 'r') as f:
+            self.data = json.load(f)
+
+        if 'url' in self.data:
+            self.url = self.data['url']