Started refactoring

gotipy.py

@@ -3,32 +3,19 @@ import json
 import base64
 from pprint import pprint
 
-proxies = {
-    'http': "localhost:8080"
-}
-
 class gotipy(object):        
-    def __init__(self, token, url):
+## Application Functions
+    class applications(object):
+        def __init__(self, token, url, proxies = {}):
             self.token = token
             self.url = url
             self.headers = {'X-Gotify-Key' : self.token}
+            self.proxies = proxies
 
-## Auth Function
-    def basicAuth(self, user, passwd):
-        self.user = user
-        self.passwd = passwd
-        self.string = self.user + ':' + self.passwd
-        self.encoded = base64.b64encode(self.string.encode("utf-8"))
-        print(self.string.encode('utf-8'))
-        self.headers["authorization"] = "Basic " + base64.b64encode(self.string)
-        print(self.encoded)
-        return  self.headers
-
-## Token Functions
         def getApplications(self):
             self.requrl = self.url + '/application'
             
-        req = requests.get(self.requrl, headers=self.headers)
+            req = requests.get(self.requrl, headers=self.headers, proxies=self.proxies)
             return req
 
         def createApplication(self, name, description):
@@ -58,6 +45,16 @@ class gotipy(object):
 
             req = requests.post(self.requrl, headers=self.headers, files=self.imgData)
             return req
+## Auth Function
+
+
+## Client Functions
+    class clients(object):
+        def __init__(self, token, url, proxies = {}):
+            self.token = token
+            self.url = url
+            self.headers = {'X-Gotify-Key' : self.token}
+            self.proxies = proxies
 
         def getClients(self):
             self.requrl = self.url + '/client'
@@ -82,6 +79,13 @@ class gotipy(object):
             return req
 
 ## Message Functions
+    class msgManager(object):
+        def __init__(self, token, url, proxies = {}):
+            self.token = token
+            self.url = url
+            self.headers = {'X-Gotify-Key' : self.token}
+            self.proxies = proxies
+
         def getMessagesByApp(self, appid):
             self.appid = appid
             self.requrl = self.url + '/application/' + str(self.appid) + "/message"
@@ -102,19 +106,6 @@ class gotipy(object):
             req = requests.get(self.requrl, headers=self.headers)
             return req
 
-    def sendMessage(self, title, message):
-        self.title = title
-        self.message = message
-        self.requrl = self.url + '/message'        
-
-        #define a new dict for the message
-        data = {}
-        data["message"] = self.message
-        data["title"] = self.title
-
-        req = requests.post(self.requrl, headers=self.headers, json=data)
-        return req
-
         def deleteAllMessages(self):
             self.requrl = self.url + '/message'
 
@@ -134,7 +125,33 @@ class gotipy(object):
             req = requests.get(self.requrl, headers=self.headers)
             return req
 
+    class messages(object):
+        def __init__(self, token, url, proxies = {}):
+            self.token = token
+            self.url = url
+            self.headers = {'X-Gotify-Key' : self.token}
+            self.proxies = proxies
+
+        def sendMessage(self, title, message):
+            self.title = title
+            self.message = message
+            self.requrl = self.url + '/message'        
+
+            #define a new dict for the message
+            data = {}
+            data["message"] = self.message
+            data["title"] = self.title
+
+            req = requests.post(self.requrl, headers=self.headers, json=data)
+            return req
 ## User Functions
+    class users(object):
+        def __init__(self, token, url, proxies = {}):
+            self.token = token
+            self.url = url
+            self.headers = {'X-Gotify-Key' : self.token}
+            self.proxies = proxies
+
 
         def getCurrentUser(self):
             self.requrl = self.url + '/current/user'
@@ -197,9 +214,25 @@ class gotipy(object):
             return req
 
 ## Get version information
+    class utils(object):
+        def __init__(self, token, url, proxies = {}):
+            self.token = token
+            self.url = url
+            self.headers = {'X-Gotify-Key' : self.token}
+            self.proxies = proxies
 
         def getVersion(self):
             self.requrl = self.url + '/version'
 
             req = requests.get(self.requrl)
             return req
+
+        def basicAuth(self, user, passwd):
+            self.user = user
+            self.passwd = passwd
+            self.string = self.user + ':' + self.passwd
+            self.encoded = base64.b64encode(self.string.encode("utf-8"))
+            print(self.string.encode('utf-8'))
+            self.headers["authorization"] = "Basic " + base64.b64encode(self.string)
+            print(self.encoded)
+            return  self.headers