Devices searching (#207)

bluecherrydvr · Jan 30, 2024 · ca6f1db · ca6f1db
2 parents 9b14b48 + b8c47d5
commit ca6f1db
Show file tree

Hide file tree

Showing 27 changed files with 1,092 additions and 331 deletions.
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
@@ -15,10 +15,13 @@
   "savePassword": "Save password",
   "showPassword": "Show password",
   "hidePassword": "Hide password",
+  "hide": "Hide",
+  "show": "Show",
   "useDefault": "Use Default",
   "connect": "Connect",
   "connectAutomaticallyAtStartup": "Connect automatically at startup",
   "connectAutomaticallyAtStartupDescription": "If enabled, the server will be automatically connected when the app starts.",
+  "checkingServerCredentials": "Checking server credentials",
   "skip": "Skip",
   "cancel": "Cancel",
   "disabled": "Disabled",
@@ -89,6 +92,7 @@
   "reloadCamera": "Reload Camera",
   "selectACamera": "Select a camera",
   "switchCamera": "Switch camera",
+  "status": "Status",
   "online": "Online",
   "offline": "Offline",
   "live": "LIVE",
@@ -104,10 +108,12 @@
   "streamURL": "Stream URL",
   "streamURLRequired": "The stream URL is required",
   "streamURLNotValid": "The stream URL is not valid",
+  "uri": "URI",
   "eventBrowser": "Events History",
   "eventsTimeline": "Timeline of Events",
   "server": "Server",
   "device": "Device",
+  "deviceInfo": "Device info",
   "event": "Event",
   "duration": "Duration",
   "priority": "Priority",
@@ -165,7 +171,7 @@
   "no": "No",
   "about": "About",
   "versionText": "Copyright © 2022, Bluecherry LLC.\nAll rights reserved.",
-  "gettingDevices": "Getting devices...",
+  "gettingDevices": "Getting devices",
   "noDevices": "No devices",
   "noEventsLoaded": "NO EVENTS LOADED",
   "noEventsLoadedTips": "•  Select the cameras you want to see the events\n•  Use the calendar to select a specific date or a date range \n•  Use the \"Filter\" button to perform the search",
@@ -183,6 +189,15 @@
   "configureServer": "Configure server",
   "refreshDevices": "Refresh devices",
   "refreshServer": "Refresh server",
+  "viewDevices": "View devices",
+  "serverDevices": "{server} devices",
+  "@serverDevices": {
+    "placeholders": {
+      "server": {
+        "type": "String"
+      }
+    }
+  },
   "refresh": "Refresh",
   "view": "View",
   "cameraRefreshPeriod": "Camera refresh period",
@@ -344,6 +359,7 @@
   "expand": "Expand",
   "more": "More",
   "@PTZ": {},
+  "isPtzSupported": "Supports PTZ?",
   "ptzSupported": "PTZ is supported",
   "enabledPTZ": "PTZ is enabled",
   "disabledPTZ": "PTZ is disabled",
@@ -508,5 +524,7 @@
   "serverHostnameExample": "https://my-server.bluecherry.app:7001",
   "rackName": "Rack name",
   "rackNameExample": "Lab 1",
-  "openServer": "Open server"
+  "openServer": "Open server",
+  "@SEARCH": {},
+  "disableSearch": "Disable search"
 }
diff --git a/lib/l10n/app_fr.arb b/lib/l10n/app_fr.arb
@@ -15,10 +15,13 @@
   "savePassword": "Sauvegarder mot de passe",
   "showPassword": "Afficher mot de passe",
   "hidePassword": "Masquer mot de passe",
+  "hide": "Hide",
+  "show": "Show",
   "useDefault": "Par défaut",
   "connect": "Connecter",
   "connectAutomaticallyAtStartup": "Connecter automatiquement au démarrage",
   "connectAutomaticallyAtStartupDescription": "If enabled, the app will automatically connect to the server when it starts.",
+  "checkingServerCredentials": "Checking server credentials",
   "skip": "Sauter",
   "cancel": "Annuler",
   "disabled": "Disabled",
@@ -85,6 +88,7 @@
   "reloadCamera": "Recharger caméra",
   "selectACamera": "Sélectionner une caméra",
   "switchCamera": "Switch camera",
+  "status": "Status",
   "online": "En ligne",
   "offline": "Hors ligne",
   "live": "EN DIRECT",
@@ -100,10 +104,12 @@
   "streamURL": "Stream URL",
   "streamURLRequired": "The stream URL is required",
   "streamURLNotValid": "The stream URL is not valid",
+  "uri": "URI",
   "eventBrowser": "Navigateur d'événements",
   "eventsTimeline": "Ligne du temps",
   "server": "Serveur",
   "device": "Appareil",
+  "deviceInfo": "Device info",
   "event": "Évènement",
   "duration": "Durée",
   "priority": "Priorité",
@@ -173,6 +179,15 @@
   "configureServer": "Configurer le serveur",
   "refreshDevices": "Actualiser les appareils",
   "refreshServer": "Actualiser le serveur",
+  "viewDevices": "View devices",
+  "serverDevices": "{server} devices",
+  "@serverDevices": {
+    "placeholders": {
+      "server": {
+        "type": "String"
+      }
+    }
+  },
   "refresh": "Actualiser",
   "view": "Vue",
   "cameraRefreshPeriod": "Camera refresh period",
@@ -322,6 +337,7 @@
   "expand": "Développer",
   "more": "More",
   "@PTZ": {},
+  "isPtzSupported": "Supports PTZ?",
   "ptzSupported": "Support PTZ",
   "enabledPTZ": "PTZ est activé",
   "disabledPTZ": "PTZ est désactivé",
@@ -482,5 +498,7 @@
   "serverHostnameExample": "https://my-server.bluecherry.app:7001",
   "rackName": "Rack name",
   "rackNameExample": "Lab 1",
-  "openServer": "Open server"
+  "openServer": "Open server",
+  "@SEARCH": {},
+  "disableSearch": "Disable search"
 }
diff --git a/lib/l10n/app_pl.arb b/lib/l10n/app_pl.arb
@@ -15,10 +15,13 @@
   "savePassword": "Zapisz hasło",
   "showPassword": "Show password",
   "hidePassword": "Hide password",
+  "hide": "Hide",
+  "show": "Show",
   "useDefault": "Użyj wartości domyślnych",
   "connect": "Połącz",
   "connectAutomaticallyAtStartup": "Połącz automatycznie przy uruchomieniu",
   "connectAutomaticallyAtStartupDescription": "If enabled, the app will automatically connect to the server when it starts.",
+  "checkingServerCredentials": "Checking server credentials",
   "skip": "Pomiń",
   "cancel": "Anuluj",
   "disabled": "Disabled",
@@ -89,6 +92,7 @@
   "reloadCamera": "Odśwież kamerę",
   "selectACamera": "Wybierz kamerę",
   "switchCamera": "Przełącz kamerę",
+  "status": "Status",
   "online": "Online",
   "offline": "Offline",
   "live": "NA ŻYWO",
@@ -104,10 +108,12 @@
   "streamURL": "Stream URL",
   "streamURLRequired": "The stream URL is required",
   "streamURLNotValid": "The stream URL is not valid",
+  "uri": "URI",
   "eventBrowser": "Historia zdarzeń",
   "eventsTimeline": "Oś czasu zdarzeń",
   "server": "Serwer",
   "device": "Urządzenie",
+  "deviceInfo": "Device info",
   "event": "Zdarzenie",
   "duration": "Czas trwania",
   "priority": "Priorytet",
@@ -183,6 +189,15 @@
   "configureServer": "Konfiguracja serwera",
   "refreshDevices": "Odśwież urządzenia",
   "refreshServer": "Odśwież serwer",
+  "viewDevices": "View devices",
+  "serverDevices": "{server} devices",
+  "@serverDevices": {
+    "placeholders": {
+      "server": {
+        "type": "String"
+      }
+    }
+  },
   "refresh": "Odśwież",
   "view": "Widok",
   "cameraRefreshPeriod": "Camera refresh period",
@@ -344,6 +359,7 @@
   "expand": "Rozwiń",
   "more": "More",
   "@PTZ": {},
+  "isPtzSupported": "Supports PTZ?",
   "ptzSupported": "PTZ jest wspierane",
   "enabledPTZ": "PTZ jest włączone",
   "disabledPTZ": "PTZ jest wyłączone",
@@ -508,5 +524,7 @@
   "serverHostnameExample": "https://my-server.bluecherry.app:7001",
   "rackName": "Rack name",
   "rackNameExample": "Lab 1",
-  "openServer": "Open server"
+  "openServer": "Open server",
+  "@SEARCH": {},
+  "disableSearch": "Disable search"
 }
diff --git a/lib/l10n/app_pt.arb b/lib/l10n/app_pt.arb
@@ -15,10 +15,13 @@
   "savePassword": "Salvar senha",
   "showPassword": "Mostrar senha",
   "hidePassword": "Ocultar senha",
+  "hide": "Esconder",
+  "show": "Mostrar",
   "useDefault": "Usar Padrão",
   "connect": "Conectar",
   "connectAutomaticallyAtStartup": "Conectar automaticamente ao iniciar",
   "connectAutomaticallyAtStartupDescription": "Se ativado, o servidor será conectado automaticamente quando o aplicativo for iniciado.",
+  "checkingServerCredentials": "Verificando credenciais",
   "skip": "Pular",
   "cancel": "Cancelar",
   "disabled": "Desativado",
@@ -89,6 +92,7 @@
   "reloadCamera": "Recarregar Câmera",
   "selectACamera": "Selecione uma câmera",
   "switchCamera": "Trocar câmera",
+  "status": "Status",
   "online": "Online",
   "offline": "Offline",
   "live": "AO VIVO",
@@ -104,10 +108,12 @@
   "streamURL": "URL da Transmissão",
   "streamURLRequired": "A URL da transmissão é obrigatória",
   "streamURLNotValid": "A url não é válida",
+  "uri": "URI",
   "eventBrowser": "Histórico de eventos",
   "eventsTimeline": "Linha do tempo de eventos",
   "server": "Servidor",
   "device": "Dispositivo",
+  "deviceInfo": "Informações do dispositivo",
   "event": "Evento",
   "duration": "Duração",
   "priority": "Prioridade",
@@ -183,6 +189,15 @@
   "configureServer": "Configurar servidor",
   "refreshDevices": "Recarregar dispositivos",
   "refreshServer": "Recarregar servidor",
+  "viewDevices": "Ver dispositivos",
+  "serverDevices": "Dispositivos de {server}",
+  "@serverDevices": {
+    "placeholders": {
+      "server": {
+        "type": "String"
+      }
+    }
+  },
   "refresh": "Recarregar",
   "view": "Layouts",
   "cameraRefreshPeriod": "Intervalo para recarregar cameras",
@@ -344,7 +359,8 @@
   "expand": "Expandir",
   "more": "Mais",
   "@PTZ": {},
-  "ptzSupported": "PTZ é suportado",
+  "isPtzSupported": "Possui PTZ?",
+  "ptzSupported": "Possui PTZ",
   "enabledPTZ": "PTZ está ativado",
   "disabledPTZ": "PTZ está desativado",
   "move": "Movimento",
@@ -508,5 +524,7 @@
   "serverHostnameExample": "https://servidor.bluecherry.app:7001",
   "rackName": "Nome do rack",
   "rackNameExample": "Lab 1",
-  "openServer": "Abrir servidor"
+  "openServer": "Abrir servidor",
+  "@SEARCH": {},
+  "disableSearch": "Desativar pesquisa"
 }
diff --git a/lib/providers/server_provider.dart b/lib/providers/server_provider.dart
@@ -65,7 +65,7 @@ class ServersProvider extends UnityProvider {
 
     servers.add(server);
     await save();
-    refreshDevices();
+    await refreshDevices(ids: [server.id]);
 
     if (isMobilePlatform) {
       // Register notification token.

diff --git a/lib/utils/extensions.dart b/lib/utils/extensions.dart
@@ -150,8 +150,13 @@ extension DateTimeExtension on DateTime {
 
 extension DeviceListExtension on Iterable<Device> {
   /// Returns this device list sorted properly
-  List<Device> sorted([Iterable? available]) {
-    final list = [...this]..sort((a, b) => a.name.compareTo(b.name));
+  List<Device> sorted({
+    Iterable? available,
+    String searchQuery = '',
+  }) {
+    final list = where((device) =>
+        device.name.toLowerCase().contains(searchQuery.toLowerCase())).toList()
+      ..sort((a, b) => a.name.compareTo(b.name));
 
     if (available != null) list.sort((a, b) => available.contains(a) ? 0 : 1);
     list.sort((a, b) => a.status ? 0 : 1);

diff --git a/lib/utils/window.dart b/lib/utils/window.dart
@@ -57,9 +57,9 @@ Future<void> configureWindow() async {
         windowButtonVisibility: true,
       ),
       () async {
-        // if ((isDesktopPlatform && Platform.isMacOS) || kDebugMode) {
-        //  await windowManager.setSize(kInitialWindowSize);
-        // }
+        if (kDebugMode) {
+          await windowManager.setSize(kInitialWindowSize);
+        }
         await windowManager.show();
       },
     );

diff --git a/lib/widgets/collapsable_sidebar.dart b/lib/widgets/collapsable_sidebar.dart
@@ -109,9 +109,7 @@ class _CollapsableSidebarState extends State<CollapsableSidebar>
               : AlignmentDirectional.topCenter,
           padding: collapsed
               ? EdgeInsetsDirectional.zero
-              : widget.left
-                  ? const EdgeInsetsDirectional.symmetric(horizontal: 5.0)
-                  : const EdgeInsetsDirectional.only(end: 5.0),
+              : const EdgeInsetsDirectional.symmetric(horizontal: 5.0),
           child: SquaredIconButton(
             key: collapseButtonKey,
             tooltip: collapsed ? loc.expand : loc.collapse,

diff --git a/lib/widgets/device_grid/desktop/desktop_device_grid.dart b/lib/widgets/device_grid/desktop/desktop_device_grid.dart
@@ -91,9 +91,7 @@ class _DesktopDeviceGridState extends State<DesktopDeviceGrid> {
                 ),
                 child: Text(
                   '${view.currentLayout.devices.length}',
-                  style: TextStyle(
-                    color: theme.colorScheme.onPrimaryContainer,
-                  ),
+                  style: TextStyle(color: theme.colorScheme.onPrimaryContainer),
                 ),
               ),
             ]);