tray, notification, fix buzzheavier upload, ui fixes

Author: daveberrys

requirements.txt

@@ -2,6 +2,6 @@ requests
 pyinstaller
 pywebview[gtk]; sys_platform == "linux"
 pywebview; sys_platform != "linux"
-# desktop-notifier (NOT USED FOR NOW! will be used in a future update :3)
-# pystray (NOT USED FOR NOW! will be used in a future update :3)
+desktop-notifier
+pystray
 termcolor

src/back/api/sendingFile.py

@@ -54,7 +54,11 @@ def buzzheavier(file_path):
         with open(file_path, "rb") as f:
             response = requests.put(url, data=f, headers=HEADERS)
             if response.status_code in [200, 201]:
-                return response.text.strip()
+                data = response.json()
+                file_id = data.get("data", {}).get("id")
+                if file_id:
+                    return f"https://buzzheavier.com/{file_id}"
+                return "Error: Could not find file ID in response."
             return f"Server Error: {response.status_code}"
     except Exception as e:
         return f"Request Failed: {str(e)}"

src/back/system/contact.py

@@ -3,6 +3,7 @@
 
 from src.back.api.sendingFile import catbox, litterbox, buzzheavier
 from src.back.api.checkForUpdate import isUpdateAvailable
+from src.back.util.notify import notify
 
 class API:
     def pickFile(self):
@@ -15,18 +16,30 @@ def pickFile(self):
         return None
 
     def uploadTo(self, path, platform, duration="1h"):
+        filename = os.path.basename(path)
+        notify("Upload Started", f"Sending {filename} to {platform}...")
+
+        result = ""
         if platform == "catbox":
-            return catbox(path)
+            result = catbox(path)
         elif platform == "litterbox":
-            return litterbox(path, duration)
+            result = litterbox(path, duration)
         elif platform == "buzzheavier":
-            return buzzheavier(path)
-        return "Unknown platform"
+            result = buzzheavier(path)
+        else:
+            result = "Unknown platform"
+
+        if result.startswith("http"):
+            notify("Upload Success!", f"Link: {result}")
+        else:
+            notify("Upload Failed", f"Problem with {platform}: {result}")
+
+        return result
 
     def checkForUpdates(self):
         try:
             with open("version.txt", "r") as f:
                 currentVersion = f.read().strip()
             return isUpdateAvailable(currentVersion)
         except Exception as e:
-            return f"Error: {str(e)}"
+            return {"status": "error", "message": str(e)}

src/back/util/notify.py

@@ -0,0 +1,30 @@
+import asyncio
+from desktop_notifier import DesktopNotifier
+import src.back.util.print as print
+from sys import platform
+from pathlib import Path
+
+baseDir = Path(__file__).resolve().parent.parent.parent.parent
+iconExt = "ico" if platform == "win32" else "png"
+iconPath = baseDir / "assets" / "icon" / f"SendYourFiles.{iconExt}"
+
+notifier = DesktopNotifier(
+    app_name="Send Your Files",
+    app_icon=iconPath
+)
+
+async def _send(title, message):
+    try:
+        await notifier.send(title=title, message=message, icon=iconPath)
+    except Exception as e:
+        print.error(f"Failed to send notification: {e}")
+
+def notify(title, message):
+    try:
+        loop = asyncio.get_event_loop()
+        if loop.is_running():
+            loop.create_task(_send(title, message))
+        else:
+            loop.run_until_complete(_send(title, message))
+    except Exception:
+        asyncio.run(_send(title, message))

src/front/main/index.html

@@ -205,7 +205,7 @@
     </div>
 
     <div class="frame">
-        <div class="anotherElem">
+        <div class="anotherElem logs">
             <pre id="logs">No logs yet. Send a file!</pre>
         </div>
 
@@ -214,4 +214,12 @@
             <div class="button" onclick="showPopup('platformPopup')">Upload to...</div>
         </div>
     </div>
-</main>
+</main>
+
+<style>
+    .logs {
+        max-width: 350px;
+        scrollbar-width: auto;
+        scrollbar-color: var(--frameColor) var(--elemColor);
+    }
+</style>

src/front/window.py

@@ -1,52 +1,103 @@
 import webview as wv
 import os
 import sys
+import threading
+import pystray
+from PIL import Image
 
 import src.back.util.print as print
 from src.back.system.contact import API
 
-def startUp(debugMode):
-    # def loadCSS(window):
-    #     whereCss = os.path.join(os.path.dirname(__file__), "cacaStyle.css")
-    #     with open(whereCss, "r") as f:
-    #         css = f.read()
-    #     window.load_css(css)
+class WindowManager:
+    def __init__(self):
+        self.window = None
+        self.debugMode = False
+        self.projectRoot = self.getProjectRoot()
+        self.iconPath = self.getIconPath()
 
-    API.checkForUpdates(API())
+    def getProjectRoot(self):
+        if getattr(sys, "frozen", False):
+            return sys._MEIPASS
+        return os.path.dirname(
+            os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+        )
 
-    here = os.path.join(os.path.dirname(__file__), "main", "index.html")
-    print.debug(f"URL for HTTP is at {here}")
+    def getIconPath(self):
+        iconExt = ".ico" if sys.platform == "win32" else ".png"
+        return os.path.join(
+            self.projectRoot, "assets", "icon", f"SendYourFiles{iconExt}"
+        )
 
-    if debugMode:
-        print.success("Debug mode is enabled. I don't know why you'd want this.")
+    def createWindow(self):
+        if self.window:
+            self.showWindow()
+            return
 
-    # NO idea what this is, probably guessing PyInstaller's OneFile thingy.
-    if getattr(sys, "frozen", False):
-        projectRoot = sys._MEIPASS
-    else:
-        projectRoot = os.path.dirname(
-            os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+        htmlPath = os.path.join(os.path.dirname(__file__), "main", "index.html")
+        print.debug(f"Creating window with URL: {htmlPath}")
+
+        self.window = wv.create_window(
+            title="Send Your Files",
+            url=htmlPath,
+            js_api=API(),
+            width=800,
+            height=600,
         )
 
-    iconExt = ".ico" if sys.platform == "win32" else ".png"
-    iconPath = os.path.join(projectRoot, "assets", "icon", f"SendYourFiles{iconExt}")
+        self.window.events.closing += self.onWindowClosing
+
+    def onWindowClosing(self):
+        print.debug("X clicked! Hiding to tray and clearing RAM...")
+        self.window.load_html(" ")  # less ram usage :3 (hopefully)
+        self.window.hide()
+        return False
 
-    print.debug(f"Using icon at: {iconPath}")
+    def showWindow(self, icon=None, item=None):
+        if self.window:
+            print.debug("Refreshing UI and showing window...")
+            htmlPath = os.path.join(os.path.dirname(__file__), "main", "index.html")
+            self.window.load_url(htmlPath)
+            self.window.show()
+        else:
+            self.createWindow()
 
-    wv.create_window(
-        title="Send Your Files",
-        url=here,
-        js_api=API(),
+    def quitApp(self, icon, item):
+        print.warning("Shutting down application...")
+        icon.stop()
+        os._exit(0)
 
-        width=800,
-        height=600,
-    )
+    def setupTray(self):
+        try:
+            image = Image.open(self.iconPath)
+            menu = pystray.Menu(
+                pystray.MenuItem("Open", self.showWindow, default=True),
+                pystray.MenuItem("Quit", self.quitApp),
+            )
 
-    # window.events.loaded += loadCSS
-    wv.start(
-        http_server=True,
-        private_mode=True,
+            self.trayIcon = pystray.Icon(
+                "SendYourFiles", image, "Send Your Files", menu
+            )
+            self.trayIcon.run()
+        except Exception as e:
+            print.error(f"Failed to setup tray: {e}")
 
-        debug=debugMode,
-        icon=iconPath,
-    )
+    def start(self, debugMode):
+        self.debugMode = debugMode
+        if self.debugMode:
+            print.success("Debug mode is active.")
+
+        trayThread = threading.Thread(target=self.setupTray, daemon=True)
+        trayThread.start()
+
+        self.createWindow()
+        wv.start(
+            http_server=True,
+            private_mode=True,
+            debug=self.debugMode,
+            icon=self.iconPath,
+        )
+
+
+def startUp(debugMode):
+    manager = WindowManager()
+    manager.start(debugMode)