From: Vincent Date: Sun, 20 Oct 2019 19:00:30 +0000 (+0200) Subject: . X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=1f08205d1f8fa1c2bf84d8c4810a748ea28eb09f;p=tortuga-home.git . --- diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 6363606..177de90 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -3,7 +3,10 @@ - + + + + diff --git a/scripts/lib/mediarasp.php b/scripts/lib/mediarasp.php index ae2365a..e03c1ec 100644 --- a/scripts/lib/mediarasp.php +++ b/scripts/lib/mediarasp.php @@ -24,7 +24,6 @@ function remoteCmd($cmd, $device) } else if ($device == 'bureau') { execScene('bureau/auto'); } - return; } else if ($cmd == 'light-down') { if ($device == 'salon') { diff --git a/scripts/lib/tmdb.php b/scripts/lib/tmdb.php index 5be9dc9..ea55197 100644 --- a/scripts/lib/tmdb.php +++ b/scripts/lib/tmdb.php @@ -68,7 +68,7 @@ function _getTVShows($force = false, $forceapi = false) global $directories; $library = new tvShowLibrary($directories, $forceapi); $res = $library->getShortcuts(); - connectRedis()->igbset('medialibrary.tvshows', $res); + connectRedis()->igbsetex('medialibrary.tvshows',259200, $res); return $res; } $res = connectRedis()->igbget('medialibrary.tvshows'); @@ -89,7 +89,7 @@ function _getMovies($force = false, $forceapi = false) global $directories; $library = new moviesLibrary($directories, $force); $res = $library->getShortcuts(); - connectRedis()->igbset('medialibrary.movies', $res); + connectRedis()->igbsetex('medialibrary.movies',259200 , $res); return $res; } $res = connectRedis()->igbget('medialibrary.movies'); @@ -159,7 +159,7 @@ class tvShowLibrary extends mediaLibrary try { $tv = $client->getTvApi()->getTvshow($id, ['language' => 'fr-FR']); - connectRedis()->igbset('tmdb.tv.' . $id, $tv); + connectRedis()->igbsetex('tmdb.tv.' . $id,259200, $tv); return $tv; } catch (Exception $e) { echo $e->getMessage(); @@ -518,7 +518,7 @@ class moviesLibrary extends mediaLibrary $client = getTmbdClient(); try { $movie = $client->getMoviesApi()->getMovie($id, ['language' => 'fr-FR']); - connectRedis()->igbset('tmdb.movie.' . $id, $movie); + connectRedis()->igbsetex('tmdb.movie.' . $id,259200, $movie); return $movie; } catch (Exception $e) { return null; diff --git a/scripts/remotecmd.php b/scripts/remotecmd.php index d270924..fd19c3e 100644 --- a/scripts/remotecmd.php +++ b/scripts/remotecmd.php @@ -13,6 +13,9 @@ if (!isset($_GET['device'])) { // We first try to send it to salon raspberry before sending a less robust ir command if (!remoteCmd($cmd, $_GET['device'])) { if ($_GET['device'] == 'salon') { + echo 'run '.$cmd.' with harmony'; harmonyRequest('commands/' . $cmd, 'POST'); - } + }else{ + echo 'ok'; + } } \ No newline at end of file diff --git a/scripts/tmdb.php b/scripts/tmdb.php index e41c600..3edcb3e 100644 --- a/scripts/tmdb.php +++ b/scripts/tmdb.php @@ -1,6 +1,6 @@