From: Vincent <vincent@enhydra.fr>
Date: Sun, 15 Nov 2020 10:48:41 +0000 (+0100)
Subject: .
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=a7eaf9ef35e718e5c1038058dd59b4ba1e0d5819;p=tortuga-home.git

.
---

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index cc69433..85a4ef3 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,6 +5,7 @@
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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$/scripts/lib/squeezebox.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/squeezebox.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/squeeze.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/squeeze.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/servers/logcat.php" beforeDir="false" afterPath="$PROJECT_DIR$/servers/logcat.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -900,14 +901,7 @@
       <workItem from="1605087787424" duration="33487000" />
       <workItem from="1605261347643" duration="1199000" />
       <workItem from="1605342171398" duration="4613000" />
-      <workItem from="1605355486465" duration="18135000" />
-    </task>
-    <task id="LOCAL-00349" summary=".">
-      <created>1603276030272</created>
-      <option name="number" value="00349" />
-      <option name="presentableId" value="LOCAL-00349" />
-      <option name="project" value="LOCAL" />
-      <updated>1603276030273</updated>
+      <workItem from="1605355486465" duration="18836000" />
     </task>
     <task id="LOCAL-00350" summary=".">
       <created>1603559422652</created>
@@ -1245,7 +1239,14 @@
       <option name="project" value="LOCAL" />
       <updated>1605433424911</updated>
     </task>
-    <option name="localTasksCounter" value="398" />
+    <task id="LOCAL-00398" summary=".">
+      <created>1605436590375</created>
+      <option name="number" value="00398" />
+      <option name="presentableId" value="LOCAL-00398" />
+      <option name="project" value="LOCAL" />
+      <updated>1605436590375</updated>
+    </task>
+    <option name="localTasksCounter" value="399" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1291,12 +1292,12 @@
       <screen x="0" y="0" width="1707" height="920" />
     </state>
     <state x="740" y="229" key="#com.jetbrains.php.refactoring.extractMethod.PhpExtractMethodDialog#function0/0.0.1707.920@0.0.1707.920" timestamp="1604146905948" />
-    <state x="198" y="0" width="737" height="502" key="CommitChangelistDialog2" timestamp="1605433420626">
+    <state x="198" y="0" width="737" height="502" key="CommitChangelistDialog2" timestamp="1605436587344">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="132" y="0" width="737" height="502" key="CommitChangelistDialog2/0.0.1707.920@0.0.1707.920" timestamp="1605086955514" />
     <state x="701" y="75" key="CommitChangelistDialog2/0.0.1920.1160@0.0.1920.1160" timestamp="1605188136787" />
-    <state x="198" y="0" width="745" height="567" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1605433420626" />
+    <state x="198" y="0" width="745" height="567" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1605436587344" />
     <state x="952" y="244" key="FileChooserDialogImpl" timestamp="1605104496549">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
@@ -1316,6 +1317,10 @@
       <screen x="0" y="0" width="1707" height="920" />
     </state>
     <state width="498" height="446" key="SwitcherDM/0.0.1707.920@0.0.1707.920" timestamp="1604228166964" />
+    <state x="872" y="240" key="Vcs.Push.Dialog.v2" timestamp="1605436593809">
+      <screen x="0" y="0" width="2560" height="1040" />
+    </state>
+    <state x="872" y="240" key="Vcs.Push.Dialog.v2/0.0.2560.1040@0.0.2560.1040" timestamp="1605436593809" />
     <state x="295" y="0" width="1290" height="907" key="dock-window-1" timestamp="1603274697406">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
diff --git a/scripts/cron/cron.php b/scripts/cron/cron.php
index d719cd3..4d20347 100644
--- a/scripts/cron/cron.php
+++ b/scripts/cron/cron.php
@@ -65,8 +65,8 @@ function cronShield($cronmin)
         }
     }
     if ($cronmin % 10 === 0) {
-        setState('maskShieldSalonWakeup', false);
-        setState('maskShieldBureauWakeup', false);
+        setState('maskShieldSalonWakeup', '0');
+        setState('maskShieldBureauWakeup', '0');
     }
     //`curl 'http://192.168.13.60:9000/plugins/Extensions/settings/plugins/CastBridge/settings/basic.html?playerid=b8%3A27%3Aeb%3Af6%3A1d%3A30' -H 'User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:83.0) Gecko/20100101 Firefox/83.0' -H 'Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8' -H 'Accept-Language: fr-FR,en;q=0.5' --compressed -H 'Content-Type: application/x-www-form-urlencoded' -H 'Origin: http://192.168.13.60:9000' -H 'Connection: keep-alive' -H 'Referer: http://192.168.13.60:9000/plugins/Extensions/settings/plugins/CastBridge/settings/basic.html?playerid=b8%3A27%3Aeb%3Af6%3A1d%3A30' -H 'Cookie: Squeezebox-player=b8%3A27%3Aeb%3Af6%3A1d%3A30; Squeezebox-enableHiDPI=1; Squeezebox-expandPlayerControl=true; Squeezebox-expanded-MY_MUSIC=0; Squeezebox-expanded-RADIO=1; Squeezebox-expanded-PLUGIN_MY_APPS_MODULE_NAME=1; Squeezebox-expanded-FAVORITES=1; Squeezebox-expanded-PLUGINS=0; Squeezebox-playersettings=null; Squeezebox-advancedsettings=plugins/CastBridge/settings/basic.html%3F; Squeezebox-expanded-activePlugins=1; Squeezebox-expanded-inactivePlugins=1; Squeezebox-expanded-otherPlugins0=1' -H 'Upgrade-Insecure-Requests: 1' --data-raw 'saveSettings=1&useAJAX=0&page=PLUGIN_CASTBRIDGE&playerid=b8%3A27%3Aeb%3Af6%3A1d%3A30&player=b8%3A27%3Aeb%3Af6%3A1d%3A30&autorun=on&bin=squeeze2cast-armv6hf&opts=&debugs=&log_limit=-1&configfile=castbridge.xml&autosave=on&upnp_socket=%3F&xmlparams=1&prevseldevice=.common.&seldevice=.common.&codecs=aac%2Cogg%2Cops%2Cogf%2Cflc%2Calc%2Cwav%2Caif%2Cpcm%2Cmp3&sample_rate=96000&encode_mode=thru&encode_level=&encode_bitrate=&encode_rate=&encode_size=&server=%3F&enabled=1&remove_timeout=0&volume_on_play=1&media_volume=50&send_metadata=1&send_coverart=1&enabled.79a3f5f078d67e3b25a6b3dedc624e18=1'`;
     //`curl 'http://192.168.13.60:9000/plugins/Extensions/settings/plugins/CastBridge/settings/basic.html?playerid=b8%3A27%3Aeb%3Af6%3A1d%3A30' -H 'User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:83.0) Gecko/20100101 Firefox/83.0' -H 'Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8' -H 'Accept-Language: fr-FR,en;q=0.5' --compressed -H 'Content-Type: application/x-www-form-urlencoded' -H 'Origin: http://192.168.13.60:9000' -H 'Connection: keep-alive' -H 'Referer: http://192.168.13.60:9000/plugins/Extensions/settings/plugins/CastBridge/settings/basic.html' -H 'Cookie: Squeezebox-player=b8%3A27%3Aeb%3Af6%3A1d%3A30; Squeezebox-enableHiDPI=1; Squeezebox-expandPlayerControl=true; Squeezebox-expanded-MY_MUSIC=0; Squeezebox-expanded-RADIO=1; Squeezebox-expanded-PLUGIN_MY_APPS_MODULE_NAME=1; Squeezebox-expanded-FAVORITES=1; Squeezebox-expanded-PLUGINS=0; Squeezebox-playersettings=settings/player/basic.html%3F; Squeezebox-advancedsettings=plugins/CastBridge/settings/basic.html%3F; Squeezebox-expanded-activePlugins=1; Squeezebox-expanded-inactivePlugins=1; Squeezebox-expanded-otherPlugins0=1' -H 'Upgrade-Insecure-Requests: 1' --data-raw 'saveSettings=1&useAJAX=0&page=PLUGIN_CASTBRIDGE&playerid=b8%3A27%3Aeb%3Af6%3A1d%3A30&player=b8%3A27%3Aeb%3Af6%3A1d%3A30&autorun=on&bin=squeeze2cast-armv6hf&opts=&debugs=&log_limit=-1&configfile=castbridge.xml&autosave=on&upnp_socket=%3F&xmlparams=1&prevseldevice=.common.&seldevice=.common.&codecs=aac%2Cogg%2Cops%2Cogf%2Cflc%2Calc%2Cwav%2Caif%2Cpcm%2Cmp3&sample_rate=96000&encode_mode=thru&encode_level=&encode_bitrate=&encode_rate=&encode_size=&server=%3F&enabled=1&remove_timeout=0&volume_on_play=1&media_volume=50&send_metadata=1&send_coverart=1&enabled.79a3f5f078d67e3b25a6b3dedc624e18=1&enabled.c4f32d227235313d8c59eff43a01350c=1'`;
diff --git a/scripts/lib/squeezebox.php b/scripts/lib/squeezebox.php
index 1d43a50..a56123b 100644
--- a/scripts/lib/squeezebox.php
+++ b/scripts/lib/squeezebox.php
@@ -92,16 +92,13 @@ function squeezePlayByName($musicName, $player, $volume = null, $playIfSync = tr
     }
 
     if ($player == $squeezeboxPlayers['Salon']) {
-        setState('maskShieldSalonWakeup', true);
+        setState('maskShieldSalonWakeup', '1');
         harmonyActivity('musique');
-    }
-    if ($player == $squeezeboxPlayers['Salle de bains']) {
+    } else if ($player == $squeezeboxPlayers['Salle de bains']) {
         execScene('sdb/ampli/on');
-    }
-    if ($player == $squeezeboxPlayers['Bureau']) {
-        setState('maskShieldBureauWakeup', true);
-    }
-    if ($player == $squeezeboxPlayers['Chambre']) {
+    } else if ($player == $squeezeboxPlayers['Bureau']) {
+        setState('maskShieldBureauWakeup', '1');
+    } else if ($player == $squeezeboxPlayers['Chambre']) {
         denon(true);
     }
     squeezeRequest('pause', $player);
diff --git a/scripts/squeeze.php b/scripts/squeeze.php
index 5341b25..dac3001 100644
--- a/scripts/squeeze.php
+++ b/scripts/squeeze.php
@@ -8,9 +8,12 @@ if (isset($_GET['requests'])) {
 
 if (!in_array('stop', $requests) || isset($_GET['name'])) {
     if ($_GET['player'] == 'Salon') {
+        setState('maskShieldSalonWakeup', '1');
         print_r(harmonyActivity("musique"));
     } elseif ($_GET['player'] == 'Salle de bains') {
         execScene('sdb/ampli/on');
+    } else if ($_GET['player'] === 'Bureau') {
+        setState('maskShieldBureauWakeup', '1');
     }
     setPlaying('squeezebox');
 } else {
diff --git a/servers/logcat.php b/servers/logcat.php
index b2b2ca4..5f77d73 100644
--- a/servers/logcat.php
+++ b/servers/logcat.php
@@ -21,8 +21,8 @@ $cases = [
         } else if ($device === 'bureau') {
             $state = 'maskShieldBureauWakeup';
         }
-        if (getState($state, false)) {
-            setState($state, true);
+        if (getState($state, '0') == '1') {
+            setState($state, '0');
         } else {
             shieldRunActivity($device);
         }