Core447 · Mar 24, 2024 · Mar 7, 2024 · Mar 7, 2024 · Mar 7, 2024 · Mar 7, 2024
diff --git a/.gitignore b/.gitignore
@@ -181,4 +181,6 @@ Pyro5
 
 data/
 
-vid_cache/
+vid_cache/
+
+**/.flatpak-builder/
diff --git a/Assets/images/Attribution.txt b/Assets/images/Attribution.txt
@@ -1,4 +1,4 @@
-- multi_action.png:
+- multi_action.png & error.png:
     - source: fonts.google.com
     - licence: Apache License 2.0
     - licence_link: https://www.apache.org/licenses/LICENSE-2.0
diff --git a/Assets/images/Screenshots/Screenshot_1.png b/Assets/images/Screenshots/Screenshot_1.png
diff --git a/Assets/images/Screenshots/Screenshot_2.png b/Assets/images/Screenshots/Screenshot_2.png
diff --git a/Assets/images/Screenshots/Screenshot_3.png b/Assets/images/Screenshots/Screenshot_3.png
diff --git a/GtkHelper/GtkHelper.py b/GtkHelper/GtkHelper.py
@@ -101,6 +101,13 @@ def reorder_child_after(self, child, after):
     def remove_child(self, child:Gtk.Widget) -> None:
         self.get_list_box().remove(child)
 
+    def get_index_of_child(self, child):
+        for i, action in enumerate(self.actions):
+            if action == child:
+                return i
+
+        raise ValueError("Child not found")
+
 
 class BetterPreferencesGroup(Adw.PreferencesGroup):
     def __init__(self, *args, **kwargs):
@@ -353,4 +360,19 @@ def set_url(self, url:str):
     def on_open_clicked(self, button:Gtk.Button):
         if self.get_subtitle() in [None, "N/A"]:
             return
-        web.open(self.get_subtitle())
+        web.open(self.get_subtitle())
+
+
+class EntryRowWithoutTitle(Adw.EntryRow):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        # Make title invisible
+        child:Gtk.Box = self.get_child() # Box
+        prefix_box:Gtk.Box = child.get_first_child()
+        gizmo = prefix_box.get_next_sibling()
+        empty_title = gizmo.get_first_child()
+        title = empty_title.get_next_sibling()
+
+        empty_title.set_visible(False)
+        title.set_visible(False)
diff --git a/flatpak/com.core447.StreamController.yml → com.core447.StreamController.yml b/flatpak/com.core447.StreamController.yml → com.core447.StreamController.yml
@@ -9,15 +9,15 @@ modules:
     build-commands:
       - cp . /app/bin/StreamController -r
 
-      - "pip install -r requirements.txt --prefix=/app"
+      - "pip install -r requirements.txt --ignore-installed --prefix=/app"
 
       - install -D flatpak/launch.sh /app/bin/launch.sh
       - chmod +x /app/bin/launch.sh
       - install -D flatpak/icon_256.png /app/share/icons/hicolor/256x256/apps/com.core447.StreamController.png
       - install -D flatpak/launch.desktop /app/share/applications/com.core447.StreamController.desktop
     sources:
       - type: git
-        url: https://github.com/Core447/StreamController.git
+        url: https://github.com/StreamController/StreamController.git
         branch: dev  # or use 'commit' or 'tag' to pin to a specific version
 
     build-options:

diff --git a/globals.py b/globals.py
@@ -3,13 +3,14 @@
 from typing import TYPE_CHECKING
 import argparse
 
-DATA_PATH = os.path.join(os.getenv("XDG_CONFIG_HOME", os.path.expanduser("~/.config")), "StreamController")
-DATA_PATH = "data"
+DATA_PATH = os.path.join(os.path.expanduser("~"), ".var", "app", "com.core447.StreamController", "data")
+# DATA_PATH = "data"
 
 if TYPE_CHECKING:
     from src.app import App
     from locales.LocaleManager import LocaleManager
-    from src.backend.AssetManager import AssetManager
+    from src.backend.AssetManagerBackend import AssetManagerBackend
+    from src.windows.AssetManager.AssetManager import AssetManager
     from src.backend.MediaManager import MediaManager
     from src.backend.PageManagement.PageManager import PageManager
     from src.backend.SettingsManager import SettingsManager
@@ -18,11 +19,15 @@
     from src.backend.IconPackManagement.IconPackManager import IconPackManager
     from src.backend.WallpaperPackManagement.WallpaperPackManager import WallpaperPackManager
     from src.windows.Store.StoreBackend import StoreBackend
+    from src.Signals.SignalManager import SignalManager
+    from src.backend.DesktopGrabber import DesktopGrabber
+
 
 top_level_dir:str = os.path.dirname(__file__)
 lm:"LocaleManager" = None
 media_manager:"MediaManager" = None #MediaManager
-asset_manager:"AssetManager" = None #AssetManager
+asset_manager_backend:"AssetManagerBackend" = None #AssetManager
+asset_manager: "AssetManager" = None
 page_manager:"PageManager" = None #PageManager
 settings_manager:"SettingsManager" = None #SettingsManager
 app:"App" = None #App
@@ -34,7 +39,12 @@
 wallpaper_pack_manager: "WallpaperPackManager" = None
 store_backend: "StoreBackend" = None
 pyro_daemon: Pyro5.api.Daemon = None
-app_version: str = "1.0.0-alpha" # In breaking.feature.fix-state format
+signal_manager: "SignalManager" = None
+dekstop_grabber: "DesktopGrabber" = None
+
+
+app_version: str = "1.1.2-alpha" # In breaking.feature.fix-state format
+exact_app_version_check: bool = False
 argparser: argparse.ArgumentParser = None
 logs: list[str] = []
 

diff --git a/locales/de_DE.json b/locales/de_DE.json
@@ -47,14 +47,14 @@
     "deck-switcher-no-decks": "Keine Decks Erkannt",
     "open-settings": "Einstellungen öffnen",
     "settings-emulate-at-double-click": "Bei Doppelklick klick auf Gerät simulieren",
-    "settings-dev-settings-title": "Entwicklereinstellungen",
+    "settings-dev-settings-title": "Entwickler",
     "settings-fake-decks-header": "Fake Decks",
     "settings-number-of-fake-decks": "Anzahl der Fake Decks",
     "settings-number-of-fake-decks-hint": "Für Testzwecke (App muss mölicherweise neugestartet werden)",
     "settings-store-settings-title": "Store",
     "settings-store-settings-header": "Store",
     "settings-store-settings-auto-update": "Automatische Aktualisierung der Assets",
-    "settings-ui-settings-title": "UI Einstellungen",
+    "settings-ui-settings-title": "UI",
     "settings-ui-settings-key-grid-header": "Tastenraster",
     "open-about": "Über",
     "store.plugins.section": "Plugins",
@@ -102,5 +102,18 @@
     "right-area.image-editor.layout.subtitle": "Layout für diese Taste (nur bei benutzerdefinierten Medien)",
     "right-area.image-editor.layout.size.label": "Größe (%)",
     "right-area.image-editor.layout.valign.label": "VAlign",
-    "right-area.image-editor.layout.halign.label": "HAlign"
+    "right-area.image-editor.layout.halign.label": "HAlign",
+    "deck.fake-deck-group.title": "Fake Deck",
+    "deck.fake-deck-group.description": "Konfiguration des Fake Decks",
+    "deck.fake-deck-group.layout.columns.label": "Spalten",
+    "deck.fake-deck-group.layout.rows.label": "Zeilen",
+    "warning.low-fps": "Niedrige FPS erkannt. Dies kann durch Hintergrundvideos verursacht werden. Nach dem Caching kann diese Warnung verschwinden.",
+    "warning.low-fps.fix": "Deaktivieren",
+    "warning.dismiss": "Verwerfen",
+    "settings.enable-fps-warnings": "FPS Warnungen aktivieren",
+    "settings.performance.title": "Performance",
+    "settings.performance.header": "Performance & Optimierungen",
+    "settings.performance.n-cached-pages.title": "Anzahl der zu cachenden Seiten",
+    "settings.performance.n-cached-pages.subtitle": "Anzahl der Seiten, die im Caching gespeichert werden sollen",
+    "settings.performance.n-cached-pages.tooltip": "Eine höhere Zahl bedeutet mehr Speicherverbrauch aber schnellere Seitenladezeit."
 }
diff --git a/locales/en_US.json b/locales/en_US.json
@@ -48,14 +48,14 @@
     "deck-switcher-no-decks": "No Decks Detected",
     "open-settings": "Open Settings",
     "settings-emulate-at-double-click": "Emulate button press on double click",
-    "settings-dev-settings-title": "Developer Settings",
+    "settings-dev-settings-title": "Developer",
     "settings-fake-decks-header": "Fake Decks",
     "settings-number-of-fake-decks": "Number of fake decks",
     "settings-number-of-fake-decks-hint": "For testing purposes (might require restart of the app)",
     "settings-store-settings-title": "Store",
     "settings-store-settings-header": "Store",
     "settings-store-settings-auto-update": "Auto-update assets",
-    "settings-ui-settings-title": "UI Settings",
+    "settings-ui-settings-title": "UI",
     "settings-ui-settings-key-grid-header": "Key Grid",
     "open-about": "About",
     "store.plugins.section": "Plugins",
@@ -103,5 +103,18 @@
     "right-area.image-editor.layout.subtitle": "Layout for this key (only affecting custom media)",
     "right-area.image-editor.layout.size.label": "Size (%)",
     "right-area.image-editor.layout.valign.label": "VAlign",
-    "right-area.image-editor.layout.halign.label": "HAlign"
+    "right-area.image-editor.layout.halign.label": "HAlign",
+    "deck.fake-deck-group.title": "Fake Deck",
+    "deck.fake-deck-group.description": "Configure fake deck settings",
+    "deck.fake-deck-group.layout.columns.label": "Columns",
+    "deck.fake-deck-group.layout.rows.label": "Rows",
+    "warning.low-fps": "Low FPS detected. This might be caused by your background video. This may dissapear after the caching is finished.",
+    "warning.low-fps.fix": "Deactivate",
+    "warning.dismiss": "Dismiss",
+    "settings.enable-fps-warnings": "Enable FPS warnings",
+    "settings.performance.title": "Performance",
+    "settings.performance.header": "Performance & Optimizations",
+    "settings.performance.n-cached-pages.title": "Number of cached pages",
+    "settings.performance.n-cached-pages.subtitle": "Number of pages to keep in cache",
+    "settings.performance.n-cached-pages.tooltip": "A higher number means more memory usage but faster page loading"
 }
diff --git a/locales/fr_FR.json b/locales/fr_FR.json
@@ -92,5 +92,18 @@
     "right-area.image-editor.layout.subtitle": "Layout pour cette touche (les médias utilisés par défaut ne sont pas modifiables)",
     "right-area.image-editor.layout.size.label": "Taille (%)",
     "right-area.image-editor.layout.valign.label": "VAlign",
-    "right-area.image-editor.layout.halign.label": "HAlign"
+    "right-area.image-editor.layout.halign.label": "HAlign",
+    "deck.fake-deck-group.title": "Fake Deck",
+    "deck.fake-deck-group.description": "Configuration du Fake Deck",
+    "deck.fake-deck-group.layout.columns.label": "Colonnes",
+    "deck.fake-deck-group.layout.rows.label": "Rangees",
+    "warning.low-fps": "Faible FPS détecté. Peut-être dû à votre vidéo d'arrière-plan. Le problème pourrait disparaître après mise en cache.",
+    "warning.low-fps.fix": "Désactiver",
+    "warning.dismiss": "Décrisser",
+    "settings.enable-fps-warnings": "Activer les avertissements FPS",
+    "settings.performance.title": "Performance",
+    "settings.performance.header": "Performance & Optimisations",
+    "settings.performance.n-cached-pages.title": "Nombre de pages en cache",
+    "settings.performance.n-cached-pages.subtitle": "Nombre de pages à garder en cache",
+    "settings.performance.n-cached-pages.tooltip": "Un nombre plus élevé signifie une utilisation de mémoire plus importante mais un chargement de page plus rapide."
 }
diff --git a/main.py b/main.py
@@ -13,6 +13,9 @@
 along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 # Import Python modules
+import setproctitle
+setproctitle.setproctitle("StreamController")
+
 import sys
 from loguru import logger as log
 import os
@@ -32,15 +35,17 @@
 from src.backend.DeckManagement.DeckManager import DeckManager
 from locales.LocaleManager import LocaleManager
 from src.backend.MediaManager import MediaManager
-from src.backend.AssetManager import AssetManager
+from src.backend.AssetManagerBackend import AssetManagerBackend
 from src.backend.PageManagement.PageManager import PageManager
 from src.backend.SettingsManager import SettingsManager
 from src.backend.PluginManager.PluginManager import PluginManager
 from src.backend.DeckManagement.HelperMethods import get_sys_args_without_param
 from src.backend.IconPackManagement.IconPackManager import IconPackManager
 from src.backend.WallpaperPackManagement.WallpaperPackManager import WallpaperPackManager
-from src.windows.Store.StoreBackend import StoreBackend
+from src.windows.Store.StoreBackend import StoreBackend, NoConnectionError
 from autostart import setup_autostart
+from src.Signals.SignalManager import SignalManager
+from src.backend.DesktopGrabber import DesktopGrabber
 
 # Import globals
 import globals as gl
@@ -89,10 +94,12 @@ def create_global_objects():
     gl.argparser.add_argument("-b", help="Open in background", action="store_true")
     gl.argparser.add_argument("app_args", nargs="*")
 
+    gl.settings_manager = SettingsManager()
+
+    gl.signal_manager = SignalManager()
 
     gl.media_manager = MediaManager()
-    gl.asset_manager = AssetManager()
-    gl.settings_manager = SettingsManager()
+    gl.asset_manager_backend = AssetManagerBackend()
     gl.page_manager = PageManager(gl.settings_manager)
     gl.icon_pack_manager = IconPackManager()
     gl.wallpaper_pack_manager = WallpaperPackManager()
@@ -105,6 +112,9 @@ def create_global_objects():
     gl.plugin_manager.load_plugins()
     gl.plugin_manager.generate_action_index()
 
+
+    # gl.dekstop_grabber = DesktopGrabber()
+
 def update_assets():
     settings = gl.settings_manager.load_settings_from_file(os.path.join(gl.DATA_PATH, "settings", "settings.json"))
     auto_update = settings.get("store", {}).get("auto-update", True)
@@ -114,8 +124,20 @@ def update_assets():
 
     log.info("Updating store assets")
     start = time.time()
-    asyncio.run(gl.store_backend.update_everything())
-    log.info(f"Updating store assets took {time.time() - start} seconds")
+    number_of_installed_updates = asyncio.run(gl.store_backend.update_everything())
+    if isinstance(number_of_installed_updates, NoConnectionError):
+        log.error("Failed to update store assets")
+        if hasattr(gl.app, "main_win"):
+            gl.app.main_win.show_error_toast("Failed to update store assets")
+        return
+    log.info(f"Updating {number_of_installed_updates} store assets took {time.time() - start} seconds")
+
+    if number_of_installed_updates <= 0:
+        return
+
+    # Show toast in ui
+    if hasattr(gl.app, "main_win"):
+        gl.app.main_win.show_info_toast(f"{number_of_installed_updates} assets updated")
 
 @log.catch
 def reset_all_decks():
@@ -158,7 +180,7 @@ def reset_all_decks():
 
     create_global_objects()
     create_cache_folder()
-    threading.Thread(target=update_assets).start()
+    threading.Thread(target=update_assets, name="update_assets").start()
     load()
 
 

diff --git a/notifications.py b/notifications.py
@@ -0,0 +1,23 @@
+import gi
+from gi.repository import GLib
+import dbus
+from dbus.mainloop.glib import DBusGMainLoop
+
+def print_notification(bus, message):
+	keys = ["app_name", "replaces_id", "app_icon", "summary",
+			"body", "actions", "hints", "expire_timeout"]
+	args = message.get_args_list()
+	if len(args) == 8:
+		notification = dict([(keys[i], args[i]) for i in range(8)])
+		print(notification["summary"], notification["body"])
+	else:
+		print("Unknown notification")
+		print(args)
+
+
+loop = DBusGMainLoop(set_as_default=True)
+session_bus = dbus.SessionBus()
+session_bus.add_match_string("type='method_call',interface='org.freedesktop.Notifications',member='Notify'")
+session_bus.add_message_filter(print_notification)
+
+GLib.MainLoop().run()