Merge pull request #587 from arabcoders/dev

Implements progress sync for all users via state:sync

Author: arabcoders

composer.lock

@@ -161,12 +161,6 @@
         'visible' => false,
         'description' => 'The http version to use when making requests to the backend.',
     ],
-    [
-        'key' => 'options.use_old_progress_endpoint',
-        'type' => 'bool',
-        'visible' => false,
-        'description' => 'Whether to use the old progress endpoint for plex progress sync.',
-    ],
     [
         'key' => 'options.is_limited_token',
         'type' => 'bool',

config/servers.spec.php

@@ -258,26 +258,17 @@ private function action(
             }
 
             try {
-                if (true === (bool)ag($context->options, Options::PLEX_USE_OLD_PROGRESS_ENDPOINT, false)) {
-                    $url = $context->backendUrl->withPath('/:/progress/')->withQuery(http_build_query([
-                        'key' => $logContext['remote']['id'],
-                        'identifier' => 'com.plexapp.plugins.library',
-                        'state' => 'stopped',
-                        'time' => $entity->getPlayProgress(),
-                    ]));
-                } else {
-                    // -- it seems /:/timeline/ allow us to update external user progress, while /:/progress/ does not.
-                    $url = $context->backendUrl->withPath('/:/timeline/')->withQuery(http_build_query([
-                        'ratingKey' => $logContext['remote']['id'],
-                        'key' => '/library/metadata/' . $logContext['remote']['id'],
-                        'identifier' => 'com.plexapp.plugins.library',
-                        'state' => 'stopped',
-                        'time' => $entity->getPlayProgress(),
-                        // -- Without duration & client identifier plex ignore watch progress update.
-                        'duration' => ag($remoteData, 'duration', 0),
-                        'X-Plex-Client-Identifier' => md5('WatchState/' . getAppVersion())
-                    ]));
-                }
+                // -- it seems /:/timeline/ allow us to update external user progress, while /:/progress/ does not.
+                $url = $context->backendUrl->withPath('/:/timeline/')->withQuery(http_build_query([
+                    'ratingKey' => $logContext['remote']['id'],
+                    'key' => '/library/metadata/' . $logContext['remote']['id'],
+                    'identifier' => 'com.plexapp.plugins.library',
+                    'state' => 'stopped',
+                    'time' => $entity->getPlayProgress(),
+                    // -- Without duration & client identifier plex ignore watch progress update.
+                    'duration' => ag($remoteData, 'duration', 0),
+                    'X-Plex-Client-Identifier' => md5('WatchState/' . getAppVersion())
+                ]));
 
                 $logContext['remote']['url'] = (string)$url;
 

frontend/yarn.lock

@@ -669,10 +669,6 @@ public function fromRequest(array $config, iRequest $request): array
             $config = ag_set($config, 'options.' . Options::PLEX_USER_PIN, $val);
         }
 
-        if (null !== ($val = $params->get('options.' . Options::PLEX_USE_OLD_PROGRESS_ENDPOINT))) {
-            $config = ag_set($config, 'options.' . Options::PLEX_USE_OLD_PROGRESS_ENDPOINT, (bool)$val);
-        }
-
         if (null !== ($userId = ag($config, 'user')) && !is_int($userId)) {
             $config = ag_set($config, 'user', (int)$userId);
         }

src/Backends/Plex/Action/Progress.php

@@ -292,7 +292,9 @@ protected function process(iInput $input, iOutput $output): int
 
         unset($backend);
 
-        $this->logger->notice("SYSTEM: Getting users list from '{backends}'.", [
+        $this->logger->notice(
+            "SYSTEM: Getting users list from '{backends}'.",
+            [
                 'backends' => join(', ', array_map(fn($backend) => $backend['name'], $backends))
             ]
         );
@@ -309,6 +311,7 @@ protected function process(iInput $input, iOutput $output): int
 
             try {
                 foreach ($client->getUsersList(['tokens' => true]) as $user) {
+                    /** @var array $info */
                     $info = $backend;
                     $info['token'] = ag($user, 'token', ag($backend, 'token'));
                     $info['user'] = ag($user, 'id', ag($info, 'user'));
@@ -370,9 +373,12 @@ protected function process(iInput $input, iOutput $output): int
                 'memory' => getMemoryUsage(),
             ]);
             $perUserCache = perUserCacheAdapter($userName);
-            $perUserMapper = perUserMapper($this->mapper, $userName)
+            $perUserMapper = $this->mapper->withDB(perUserDb($userName))
                 ->withCache($perUserCache)
-                ->withLogger($this->logger)->loadData();
+                ->withLogger($this->logger)
+                ->withOptions(array_replace_recursive($this->mapper->getOptions(), [Options::ALT_NAME => $userName]))
+                ->loadData();
+
             $this->logger->info("SYSTEM: loading of '{user}' mapper data completed using '{memory}' of memory.", [
                 'user' => $userName,
                 'memory' => getMemoryUsage(),
@@ -432,21 +438,20 @@ protected function process(iInput $input, iOutput $output): int
 
             foreach ($changes as $b => $changed) {
                 $count = count($changed);
-                $this->logger->notice("SYSTEM: Changes detected for '{name}: {backend}' are '{changes}'.", [
-                    'name' => $displayName,
-                    'backend' => $b,
-                    'changes' => $count,
-                    'items' => array_map(
-                        fn(iState $i) => [
-                            'title' => $i->getName(),
-                            'state' => $i->isWatched() ? 'played' : 'unplayed',
-                            'meta' => $i->isSynced(array_keys($list)),
-                        ],
-                        $changed
-                    )
-                ]);
-
                 if ($count >= 1) {
+                    $this->logger->notice("SYSTEM: Changes detected for '{name}: {backend}' are '{changes}'.", [
+                        'name' => $displayName,
+                        'backend' => $b,
+                        'changes' => $count,
+                        'items' => array_map(
+                            fn(iState $i) => [
+                                'title' => $i->getName(),
+                                'state' => $i->isWatched() ? 'played' : 'unplayed',
+                                'meta' => $i->isSynced(array_keys($list)),
+                            ],
+                            $changed
+                        )
+                    ]);
                     /** @var iClient $client */
                     $client = $list[$b]['class'];
                     $client->updateState($changed, $this->queue);
@@ -470,13 +475,13 @@ protected function process(iInput $input, iOutput $output): int
                 ],
             ]);
 
-            // -- commit changes
+            // -- Release memory.
             if (false === $input->getOption('dry-run')) {
                 $perUserMapper->commit();
+            } else {
+                $perUserMapper->reset();
             }
 
-            // -- Release memory.
-            $perUserMapper->reset();
             $this->logger->info("SYSTEM: Memory usage after reset '{memory}'.", [
                 'memory' => getMemoryUsage(),
             ]);
@@ -791,9 +796,7 @@ private function generate_users_list(array $users, bool $includeMainUser, array
                                 }
 
                                 // Ensure $matchedUser['client_data']['options'] is an array
-                                if (!isset($matchedUser['client_data']['options']) || !is_array(
-                                        $matchedUser['client_data']['options']
-                                    )) {
+                                if (!isset($matchedUser['client_data']['options']) || !is_array($matchedUser['client_data']['options'])) {
                                     $matchedUser['client_data']['options'] = [];
                                 }