Notification rework v0.3

front/plugins/_publisher_apprise/apprise.py

@@ -15,7 +15,9 @@ sys.path.extend(["/home/pi/pialert/front/plugins", "/home/pi/pialert/pialert"])
 import conf
 from plugin_helper import Plugin_Objects
 from logger import mylog, append_line_to_file
-from helper import timeNowTZ, noti_struc
+from helper import timeNowTZ, noti_obj
+from notification import Notification_obj
+from database import DB
 
 
 CUR_PATH = str(pathlib.Path(__file__).parent.resolve())
@@ -24,41 +26,60 @@ RESULT_FILE = os.path.join(CUR_PATH, 'last_result.log')
 def main():
     
     mylog('verbose', ['[APPRISE](publisher) In script'])    
+    
+    # Check if basic config settings supplied
+    if check_config() == False:
+        mylog('none', ['[Check Config] Error: Apprise service not set up correctly. Check your pialert.conf APPRISE_* variables.'])
+        return
 
-    parser = argparse.ArgumentParser(description='APPRISE publisher Plugin')
-    values = parser.parse_args()
+    # Create a database connection
+    db = DB()  # instance of class DB
+    db.open()
 
+    # parser = argparse.ArgumentParser(description='APPRISE publisher Plugin')
+    # values = parser.parse_args()
+
+    # Initialize the Plugin obj output file
     plugin_objects = Plugin_Objects(RESULT_FILE)
 
-    speedtest_result = send()
+    # Create a Notification_obj instance
+    Notification_obj(db)
 
-    plugin_objects.add_object(
-        primaryId   = 'APPRISE',
-        secondaryId = timeNowTZ(),            
-        watched1    = speedtest_result['download_speed'],
-        watched2    = speedtest_result['upload_speed'],
-        watched3    = 'null',
-        watched4    = 'null',
-        extra       = 'null',
-        foreignKey  = 'null'
-    )
+    # Retrieve new notifications
+    new_notifications = notifications.getNew()
+
+    # Process the new notifications
+    for notification in new_notifications:
+
+        # Send notification
+        result = send(notification["HTML"], notification["Text"])    
+
+        # Log result
+        plugin_objects.add_object(
+            primaryId   = 'APPRISE',
+            secondaryId = timeNowTZ(),            
+            watched1    = notification["GUID"],
+            watched2    = result,            
+            watched3    = 'null',
+            watched4    = 'null',
+            extra       = 'null',
+            foreignKey  = 'null'
+        )
 
     plugin_objects.write_result_file()
 
 #-------------------------------------------------------------------------------
 def check_config():
-        if conf.APPRISE_URL == '' or conf.APPRISE_HOST == '':
-            mylog('none', ['[Check Config] Error: Apprise service not set up correctly. Check your pialert.conf APPRISE_* variables.'])
+        if conf.APPRISE_URL == '' or conf.APPRISE_HOST == '':            
             return False
         else:
             return True
 
 #-------------------------------------------------------------------------------
-def send(msg: noti_struc):
-    html = msg.html
-    text = msg.text
+def send(html, text):
 
     payloadData = ''
+    result = ''
 
     # limit = 1024 * 1024  # 1MB limit (1024 bytes * 1024 bytes = 1MB)
     limit = conf.APPRISE_SIZE
@@ -66,7 +87,7 @@ def send(msg: noti_struc):
     #  truncate size
     if conf.APPRISE_PAYLOAD == 'html':                 
         if len(msg.html) > limit:
-            payloadData = msg.html[:limit] + " <h1> (text was truncated)</h1>"
+            payloadData = msg.html[:limit] + "<h1>(text was truncated)</h1>"
         else:
             payloadData = msg.html
     if conf.APPRISE_PAYLOAD == 'text':            
@@ -88,14 +109,22 @@ def send(msg: noti_struc):
         # try runnning a subprocess
         p = subprocess.Popen(["curl","-i","-X", "POST" ,"-H", "Content-Type:application/json" ,"-d", json.dumps(_json_payload), conf.APPRISE_HOST], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
         stdout, stderr = p.communicate()
-        # write stdout and stderr into .log files for debugging if needed
-        
 
+        # write stdout and stderr into .log files for debugging if needed
         # Log the stdout and stderr
-        mylog('debug', [stdout, stderr])  # TO-DO should be changed to mylog
+        mylog('debug', [stdout, stderr])  
+
+        # log result
+        result = stdout
+
     except subprocess.CalledProcessError as e:
         # An error occurred, handle it
         mylog('none', [e.output])
 
+        # log result
+        result = e.output
+
+    return result
+
 if __name__ == '__main__':
     sys.exit(main())