.

diff --git a/scripts/cron/cron.php b/scripts/cron/cron.php
index a8e04c76b0d78fb2d2077d69b19fc0897771222c..07b91ede080f12e935f8abfdcdef5bfd97defd61 100644 (file)
--- a/scripts/cron/cron.php
+++ b/scripts/cron/cron.php
@@ -22,7 +22,6 @@ function cronOneLoop($cronmin)
     }
     if ($cronmin % 5 == 0) {
         cronPing($cronmin);
-        cronSeen($cronmin);
         cronMediaLibrary($cronmin);
         cronTmdb($cronmin);
     }
@@ -68,41 +67,6 @@ function cronRooms($cronmin)
     checkPlanetarium();
 }
 
-function cronSeen($cronmin)
-{
-    global $devices;
-
-    $seen = [];
-
-    $omxdevices = ['salon', 'bureau', 'litvincent', 'litjerome', 'sdb'];
-    foreach ($omxdevices as $omxdevice) {
-        if (!isAlive($omxdevice)) {
-            continue;
-        }
-        try {
-            $res = httpRequest('http://' . $devices[$omxdevice]['host'] . ':4321/', 'post', ['action' => 'filelist']);
-        } catch (Exception $e) {
-            continue;
-        }
-        if (!$res) {
-            continue;
-        }
-        $all = json_decode($res->getBody(), true);
-        foreach ($all as $item) {
-            if ($item['seen']) {
-                $seen[str_replace('/nas/', '/volume1/Share/', $item['path'])] = true;
-            }
-        }
-    }
-
-    $cache = ROOT . '/cache/seen.json';
-    if (file_exists($cache)) {
-        $seen = array_merge($seen, json_decode(file_get_contents($cache), true));
-    }
-    file_put_contents($cache, json_encode($seen));
-    connectRedis()->igbset('mediaseen', $seen);
-}
-
 function cronMediaLibrary($cronmin)
 {
     global $directories;

diff --git a/scripts/lib/mediarasp.php b/scripts/lib/mediarasp.php
index fbcd43668452fcc4925e406097b20f118d9d972e..e2895e0ddf1837b0a804f1255d2d3a98abbbc4b3 100644 (file)
--- a/scripts/lib/mediarasp.php
+++ b/scripts/lib/mediarasp.php
@@ -269,6 +269,7 @@ function mediaRaspPlayMovie($movie, $device = null)
 
     }
 
+    addSeen($movie);
     $res = VLCPlay($movie, $device);
     mediaRaspPostPlay($device);
 
@@ -276,6 +277,31 @@ function mediaRaspPlayMovie($movie, $device = null)
     return $res;
 }
 
+function addSeen($movie)
+{
+    $redis = connectRedis();
+
+    try {
+        $seen = $redis->igbget('mediaseen');
+    } catch (Exception $e) {
+        $seen = [];
+    }
+
+    if (!is_array($seen)) {
+        $seen = [];
+    }
+
+    $cacheFile = ROOT . '/cache/seen.json';
+    if (!count($seen)) {
+        $seen = json_decode(file_get_contents($cacheFile));
+    }
+
+    $seen[str_replace('/nas/', '/volume1/Share/', $movie)] = true;
+    $redis->igbset('mediaseen', $seen);
+
+    file_put_contents($cacheFile, json_encode($seen));
+}
+
 function mediaRaspCommons($device)
 {
     global $squeezeboxPlayers;