From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Tue, 12 Mar 2024 15:37:26 +0000 (+0100)
Subject: .
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=87ef02eff21670b84927f1a1823498bc9e747a1e;p=tortuga-home.git

.
---

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 48761f9..a79c8e0 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,17 +5,10 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="352ce63a-b52a-41a2-979b-becda7920939" name="Default" comment=".">
-      <change beforePath="$PROJECT_DIR$/.docker/config/monit/conf.d/home" beforeDir="false" afterPath="$PROJECT_DIR$/.docker/config/monit/conf.d/home" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.docker/update" beforeDir="false" afterPath="$PROJECT_DIR$/.docker/update" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/bin/healthcheck" beforeDir="false" afterPath="$PROJECT_DIR$/bin/healthcheck" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/bin/restart-logcat" beforeDir="false" afterPath="$PROJECT_DIR$/bin/restart-logcat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/bin/restarthome" beforeDir="false" afterPath="$PROJECT_DIR$/bin/restarthome" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/cron/cron.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/cron/cron.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/servers/domoticz.php" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/servers/hue.php" beforeDir="false" afterPath="$PROJECT_DIR$/servers/hue.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/servers/insteon.php" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/servers/squeezebox.php" beforeDir="false" afterPath="$PROJECT_DIR$/servers/squeezebox.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/squeezebox.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/squeezebox.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/velib.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/velib.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -1309,7 +1302,9 @@
       <workItem from="1707323806669" duration="1110000" />
       <workItem from="1708089220716" duration="1619000" />
       <workItem from="1708442844514" duration="418000" />
-      <workItem from="1709114228146" duration="2209000" />
+      <workItem from="1709114228146" duration="2292000" />
+      <workItem from="1709117286043" duration="1376000" />
+      <workItem from="1710247312163" duration="986000" />
     </task>
     <task id="LOCAL-00502" summary=".">
       <created>1641726946298</created>
@@ -1654,12 +1649,23 @@
       <option name="project" value="LOCAL" />
       <updated>1687259667913</updated>
     </task>
-    <option name="localTasksCounter" value="608" />
+    <option name="localTasksCounter" value="609" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="3" />
   </component>
+  <component name="Vcs.Log.History.Properties">
+    <option name="COLUMN_ID_ORDER">
+      <list>
+        <option value="Default.Root" />
+        <option value="Default.Author" />
+        <option value="Default.Date" />
+        <option value="Default.Subject" />
+        <option value="Space.CommitStatus" />
+      </list>
+    </option>
+  </component>
   <component name="Vcs.Log.Tabs.Properties">
     <option name="TAB_STATES">
       <map>
diff --git a/bin/healthcheck b/bin/healthcheck
index b7218ff..d2b842f 100644
--- a/bin/healthcheck
+++ b/bin/healthcheck
@@ -15,8 +15,8 @@ foreach ($heartbeats as $h) {
 }
 $diff = time() - $mintime;
 
-if ($diff > 120) {
-    if ($diff > 300) {
+if ($diff > 300) {
+    if ($diff > 600) {
         echo 'Need to restart container.';
         exit(1);
     } else {
diff --git a/scripts/lib/squeezebox.php b/scripts/lib/squeezebox.php
index b836749..45af8f0 100644
--- a/scripts/lib/squeezebox.php
+++ b/scripts/lib/squeezebox.php
@@ -134,29 +134,39 @@ function squeezePlayByName($musicName, $player, $volume = null, $playIfSync = tr
         return;
     }
 
+    $player = _player($player);
+
+    $sdb=$player === 'Salle de bains' || $player == $squeezeboxPlayers['Salle de bains'];
+    $wc=$player === 'WC' || $player == $squeezeboxPlayers['WC'];
+
     $currentMusicKey = 'squeezeplaybyname_' . $player;
     $currentMusic = getState($currentMusicKey, '');
 
-
     global $allmusics;
     $m = $allmusics[$musicName];
 
-    squeezeRequest('pause', $player);
-
-    if ($currentMusic !== $musicName) {
-        setState($currentMusicKey, $musicName);
+    if($wc) {
+        squeezeRequest('pause', $player);
+        if ($currentMusic !== $musicName) {
+            setState($currentMusicKey, $musicName);
+            foreach ($m['commands'] as $command) {
+                echo $player . ':' . $command . '<br />';
+                squeezeRequest($command, $player);
+            }
+        } else {
+            squeezeRequest('button jump_fwd', $player);
+        }
+    }else{
+        squeezeRequest('pause', $player);
         foreach ($m['commands'] as $command) {
             echo $player . ':' . $command . '<br />';
             squeezeRequest($command, $player);
         }
-    } else {
-        squeezeRequest('button jump_fwd', $player);
     }
 
-    $player = _player($player);
     $player = _squeezePlay($player, $volume);
 
-    if ($player === 'Salle de bains' || $player == $squeezeboxPlayers['Salle de bains']) {
+    if ($sdb) {
         hotwaterCheckMode();
         sleep(3);
         hotwaterCheckMode();
diff --git a/scripts/lib/velib.php b/scripts/lib/velib.php
index 7e17f18..5fb35c5 100644
--- a/scripts/lib/velib.php
+++ b/scripts/lib/velib.php
@@ -13,10 +13,10 @@ function velibStations($force = false)
 
     if ($force || !file_exists($cache) || filemtime($cache) < (time() - $limit)) {
         $allcache = __DIR__ . '/../../cache/velib.all.json';
-        $ffversion = rand('105', '116');
-        $thversion = rand('1', '100');
+        $ffversion = rand('105', '124');
+        $thversion = rand('1', '150');
 
-        `curl 'https://velib-metropole-opendata.smoove.pro/opendata/Velib_Metropole/station_status.json' -H 'User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv$ffversion.0) Gecko/20100101 Firefox/$ffversion.0 TortugaHome/$thversion.0' --output $allcache`;
+        `curl --max-time 10 'https://velib-metropole-opendata.smoove.pro/opendata/Velib_Metropole/station_status.json' -H 'User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv$ffversion.0) Gecko/20100101 Firefox/$ffversion.0 TortugaHome/$thversion.0' --output $allcache`;
         $alldata = json_decode(file_get_contents($allcache), true);
 
         $stations = ['Cadet' => '9101', 'Bleue' => '9113', 'Folies bergères' => '9011', 'Square Montholon' => '9009', 'Le Pelletier' => '9014'];