Enhance broadcasting features: add environment variables for upload and backup broadcasts; update notification links in Firebase notifications

Author: Jared-Gross

dockerfile

@@ -15,6 +15,8 @@ ENV PORT=5054
 ENV TZ="America/Guatemala"
 ENV PYTHONUNBUFFERED=1
 ENV MINIMUM_RECORDING_LENGTH="10"
+ENV UPLOAD_BROADCAST="true"
+ENV BACKUP_BROADCAST="true"
 ENV LOG_SERVER_HOST="0.0.0.0"
 ENV LOG_SERVER_PORT="5054"
 ENV NOTIFICATION_DELAY="2"

filebrowser_uploader.py

@@ -8,6 +8,9 @@
 
 load_dotenv()
 
+UPLOAD_BROADCAST: bool = os.getenv("UPLOAD_BROADCAST", "true").lower() == "true"
+BACKUP_BROADCAST: bool = os.getenv("BACKUP_BROADCAST", "true").lower() == "true"
+
 # Database settings
 db_settings = {
     "host": os.getenv("POSTGRES_HOST"),
@@ -138,12 +141,13 @@ async def upload(
     except Exception as e:
         raise RuntimeError(f"Unexpected error while uploading file: {str(e)}")
 
-    pool = await asyncpg.create_pool(**db_settings)
     download_url = f"https://broadcasting.hbni.net/play_recording/{quote(file_name)}"
-    await insert_data_to_db(
-        pool, file_name, download_url, date, description, length, host, share_hash
-    )
-    await pool.close()
+    if UPLOAD_BROADCAST:
+        pool = await asyncpg.create_pool(**db_settings)
+        await insert_data_to_db(
+            pool, file_name, download_url, date, description, length, host, share_hash
+        )
+        await pool.close()
 
 
 if __name__ == "__main__":

firebase_android_notification.py

@@ -39,22 +39,38 @@ def _build_common_message(
     title: str,
     body: str,
     topic: str = "news",
-    link: str = "https://hbniaudio.hbni.net/",
+    link: str = "https://broadcasting.hbni.net/events",
 ):
     return {
         "message": {
             "topic": topic,
-            "notification": {"title": title, "body": body},
-            "data": {"link": link},
+            "notification": {
+                "title": title,
+                "body": body,
+            },
+            "webpush": {
+                "notification": {
+                    "title": title,
+                    "body": body,
+                    "icon": "/favicon.ico",  # optional: your logo icon
+                },
+                "fcm_options": {
+                    "link": link,
+                },
+            },
+            "data": {
+                "link": link,
+            },
         }
     }
 
 
+
 def _build_override_message(
     title: str,
     body: str,
     topic: str = "news",
-    link: str = "https://hbniaudio.hbni.net/",
+    link: str = "https://broadcasting.hbni.net/events",
 ):
     fcm_message = _build_common_message(title=title, body=body, topic=topic, link=link)
 
@@ -80,7 +96,7 @@ def send_notification(title: str, body: str, link: str):
 
 
 def send_notification_to_dev(
-    title: str, body: str, link: str = "https://hbniaudio.hbni.net/"
+    title: str, body: str, link: str = "https://broadcasting.hbni.net/events"
 ):
     override_message = _build_override_message(
         title=title, body=body, topic="developer", link=link

firebase_web_notification.py

@@ -13,6 +13,7 @@ def send_notification_to_topic(title, body, topic="broadcasts"):
                 body=body,
                 image="/static/logo.png",
             ),
+            data={"link": "https://broadcasting.hbni.net/events"},
             topic=topic,
         )
         response = messaging.send(message)

main.py

@@ -29,6 +29,9 @@
 load_dotenv()
 
 FOLDER_LOCATION: str = os.path.abspath(os.getcwd()).replace("\\", "/")
+UPLOAD_BROADCAST: bool = os.getenv("UPLOAD_BROADCAST", "true").lower() == "true"
+BACKUP_BROADCAST: bool = os.getenv("BACKUP_BROADCAST", "true").lower() == "true"
+
 db_settings = {
     "host": os.getenv("POSTGRES_HOST"),
     "port": int(os.getenv("POSTGRES_PORT", 5434)),
@@ -170,7 +173,18 @@ def convert_delta_time(self, duration: timedelta) -> str:
         )
 
     def process_file(self):
-        self.backup_stream(self.recording_file_name)
+        if self.upload_callback and BACKUP_BROADCAST:
+            self.backup_stream(self.recording_file_name)
+            app_log.info(f"Backing up {self.recording_file_name}")
+            self.upload_callback(
+                self.recording_file_name.replace(".mp3", ".zip"),
+                f"{FOLDER_LOCATION}/CURRENTLY_RECORDING/{self.recording_file_name.replace(".mp3", ".zip")}",
+                self.host,
+                self.description,
+                self.starting_time.strftime("%B %d %A %Y %I_%M %p"),
+                self.audio_file_length,
+            )
+
         app_log.info(f"Processing {self.recording_file_name}")
         remove_silence.remove_silence_everywhere(self.recording_file_path)
         self.audio_file_length = audio_file.get_audio_length(self.recording_file_path)