Merge pull request #536 from arabcoders/dev

New Events Viewer WebUI & migrated state:progress to the new events system.

Author: arabcoders

FAQ.md

@@ -402,7 +402,7 @@ command via CLI.
 
 > [!IMPORTANT]
 > for environment variables that has `{TASK}` tag, you **MUST** replace it with one
-> of `IMPORT`, `EXPORT`, `PUSH`, `BACKUP`, `PRUNE`, `INDEXES`, `REQUESTS`. To see tasks active settings run
+> of `IMPORT`, `EXPORT`, `PUSH`, `BACKUP`, `PRUNE`, `INDEXES`. To see tasks active settings run
 
 ```bash
 $ docker exec -ti watchstate console system:tasks

README.md

@@ -9,6 +9,14 @@ out of the box, this tool support `Jellyfin`, `Plex` and `Emby` media servers.
 
 ## Updates
 
+### 2024-08-18
+
+We have started migrating the old events system to a new one, so far we have migrated the `progress` and `requests` to it. As such,
+The old tasks `state:progress` and `state:requests` are now gone. To control if you want to enable the watch progress, there is new
+environment variable `WS_SYNC_PROGRESS` which you can set to `true` to enable the watch progress. It's disabled by default.
+
+We will continue to migrate the rest of the events to the new system, and we will keep you updated.
+
 ### 2024-08-10
 
 I have recently added new experimental feature, to play your content directly from the WebUI. This feature is still in

bin/console

@@ -63,6 +63,7 @@ try {
             ]
     );
     fwrite(STDERR, $message . PHP_EOL);
+    fwrite(STDERR, $e->getTraceAsString() . PHP_EOL);
     exit(503);
 }
 

config/config.php

@@ -9,9 +9,7 @@
 use App\Commands\State\BackupCommand;
 use App\Commands\State\ExportCommand;
 use App\Commands\State\ImportCommand;
-use App\Commands\State\ProgressCommand;
 use App\Commands\State\PushCommand;
-use App\Commands\State\RequestsCommand;
 use App\Commands\System\IndexCommand;
 use App\Commands\System\PruneCommand;
 use App\Libs\Mappers\Import\MemoryMapper;
@@ -76,6 +74,9 @@
             'proxy' => (bool)env('WS_TRUST_PROXY', false),
             'header' => (string)env('WS_TRUST_HEADER', 'X-Forwarded-For'),
         ],
+        'sync' => [
+            'progress' => (bool)env('WS_SYNC_PROGRESS', false),
+        ],
     ];
 
     $config['backends_file'] = fixPath(env('WS_BACKENDS_FILE', ag($config, 'path') . '/config/servers.yaml'));
@@ -273,14 +274,6 @@
                 'timer' => $checkTaskTimer((string)env('WS_CRON_PUSH_AT', '*/10 * * * *'), '*/10 * * * *'),
                 'args' => env('WS_CRON_PUSH_ARGS', '-v'),
             ],
-            ProgressCommand::TASK_NAME => [
-                'command' => ProgressCommand::ROUTE,
-                'name' => ProgressCommand::TASK_NAME,
-                'info' => 'Send play progress to backends.',
-                'enabled' => (bool)env('WS_CRON_PROGRESS', false),
-                'timer' => $checkTaskTimer((string)env('WS_CRON_PROGRESS_AT', '*/45 * * * *'), '*/45 * * * *'),
-                'args' => env('WS_CRON_PROGRESS_ARGS', '-v'),
-            ],
             BackupCommand::TASK_NAME => [
                 'command' => BackupCommand::ROUTE,
                 'name' => BackupCommand::TASK_NAME,
@@ -305,14 +298,6 @@
                 'timer' => $checkTaskTimer((string)env('WS_CRON_INDEXES_AT', '0 3 * * 3'), '0 3 * * 3'),
                 'args' => env('WS_CRON_INDEXES_ARGS', '-v'),
             ],
-            RequestsCommand::TASK_NAME => [
-                'command' => RequestsCommand::ROUTE,
-                'name' => RequestsCommand::TASK_NAME,
-                'info' => 'Process queued http requests.',
-                'enabled' => (bool)env('WS_CRON_REQUESTS', true),
-                'timer' => $checkTaskTimer((string)env('WS_CRON_REQUESTS_AT', '*/2 * * * *'), '*/2 * * * *'),
-                'args' => env('WS_CRON_REQUESTS_ARGS', '-v --no-stats'),
-            ],
             DispatchCommand::TASK_NAME => [
                 'command' => DispatchCommand::ROUTE,
                 'name' => DispatchCommand::TASK_NAME,

config/env.spec.php

@@ -161,6 +161,11 @@
             'description' => 'All executing all commands in the console. They must be prefixed with $',
             'type' => 'bool',
         ],
+        [
+            'key' => 'WS_SYNC_PROGRESS',
+            'description' => 'Enable watch progress sync.',
+            'type' => 'bool',
+        ],
     ];
 
     $validateCronExpression = function (string $value): string {
@@ -186,7 +191,7 @@
     };
 
     // -- Do not forget to update the tasks list if you add a new task.
-    $tasks = ['import', 'export', 'push', 'progress', 'backup', 'prune', 'indexes', 'requests'];
+    $tasks = ['import', 'export', 'push', 'backup', 'prune', 'indexes'];
     $task_env = [
         [
             'key' => 'WS_CRON_{TASK}',

frontend/components/Pager.vue

@@ -0,0 +1,70 @@
+<template>
+  <div class="field is-grouped">
+    <div class="control">
+      <button rel="first" class="button" v-if="page !== 1" @click="changePage(1)" :disabled="isLoading"
+              :class="{'is-loading':isLoading}">
+        <span class="icon"><i class="fas fa-angle-double-left"></i></span>
+      </button>
+    </div>
+    <div class="control">
+      <button rel="prev" class="button" v-if="page > 1 && (page-1) !== 1" @click="changePage(page-1)"
+              :disabled="isLoading" :class="{'is-loading':isLoading}">
+        <span class="icon"><i class="fas fa-angle-left"></i></span>
+      </button>
+    </div>
+    <div class="control">
+      <div class="select">
+        <select id="pager_list" v-model="currentPage" @change="changePage(currentPage)" :disabled="isLoading">
+          <option v-for="(item, index) in makePagination(page, last_page)" :key="`pager-${index}`"
+                  :value="item.page" :disabled="0 === item.page">
+            {{ item.text }}
+          </option>
+        </select>
+      </div>
+    </div>
+    <div class="control">
+      <button rel="next" class="button" v-if="page !== last_page && ( page + 1 ) !== last_page"
+              @click="changePage( page + 1 )" :disabled="isLoading" :class="{ 'is-loading': isLoading }">
+        <span class="icon"><i class="fas fa-angle-right"></i></span>
+      </button>
+    </div>
+    <div class="control">
+      <button rel="last" class="button" v-if="page !== last_page" @click="changePage(last_page)"
+              :disabled="isLoading" :class="{ 'is-loading': isLoading }">
+        <span class="icon"><i class="fas fa-angle-double-right"></i></span>
+      </button>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import {makePagination} from '~/utils/index'
+
+const emitter = defineEmits(['navigate'])
+
+const props = defineProps({
+  page: {
+    type: Number,
+    required: true
+  },
+  last_page: {
+    type: Number,
+    required: true
+  },
+  isLoading: {
+    type: Boolean,
+    required: false,
+    default: false
+  },
+})
+
+const changePage = p => {
+  if (p < 1 || p > props.last_page) {
+    return
+  }
+  emitter('navigate', p)
+  currentPage.value = p
+}
+
+const currentPage = ref(props.page)
+</script>

frontend/layouts/default.vue

@@ -79,10 +79,15 @@
               <hr class="navbar-divider">
 
               <NuxtLink class="navbar-item" to="/events" @click.native="(e) => changeRoute(e)">
-                <span class="icon"><i class="fas fa-list"></i></span>
+                <span class="icon"><i class="fas fa-calendar-alt"></i></span>
                 <span>Events</span>
               </NuxtLink>
 
+              <NuxtLink class="navbar-item" to="/old_events" @click.native="(e) => changeRoute(e)">
+                <span class="icon"><i class="fas fa-list"></i></span>
+                <span>Old Events</span>
+              </NuxtLink>
+
               <NuxtLink class="navbar-item" to="/ignore" @click.native="(e) => changeRoute(e)">
                 <span class="icon"><i class="fas fa-ban"></i></span>
                 <span>Ignore List</span>