.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 99a77062e34007a7d8f5daccfac5b2619afe7244..8c518dd9eeb13ed328e4990ab248205c2365b323 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,11 +2,18 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="352ce63a-b52a-41a2-979b-becda7920939" name="Default" comment=".">
-      <change afterPath="$PROJECT_DIR$/scripts/lib/ssh.php" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/scripts/tmdb.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/lib.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/lib.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/media.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/media.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/music.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/music.php" 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/domoticz.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/domoticz.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/harmony.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/harmony.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/insteon.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/insteon.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/scripts/lib/redis.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/redis.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/servers/cron.php" beforeDir="false" afterPath="$PROJECT_DIR$/servers/cron.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/remoteinfos.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/remoteinfos.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/ssh.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/ssh.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/tmdb.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/tmdb.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/servers/domoticz.php" beforeDir="false" afterPath="$PROJECT_DIR$/servers/domoticz.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/servers/insteon.php" beforeDir="false" afterPath="$PROJECT_DIR$/servers/insteon.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/servers/ssh.php" beforeDir="false" afterPath="$PROJECT_DIR$/servers/ssh.php" afterDir="false" />
@@ -45,47 +52,47 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/servers/insteon.php">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/scripts/tmdb.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="204">
-              <caret line="24" column="22" selection-start-line="24" selection-start-column="22" selection-end-line="24" selection-end-column="22" />
+            <state relative-caret-position="34">
+              <caret line="2" selection-start-line="2" selection-start-column="2" selection-end-line="2" selection-end-column="25" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/servers/domoticz.php">
+        <entry file="file://$PROJECT_DIR$/scripts/lib/playing.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-183">
-              <caret line="14" column="59" selection-start-line="14" selection-start-column="59" selection-end-line="14" selection-end-column="59" />
+            <state relative-caret-position="153">
+              <caret line="9" column="9" selection-start-line="9" selection-start-column="9" selection-end-line="9" selection-end-column="9" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/servers/ssh.php">
+        <entry file="file://$PROJECT_DIR$/scripts/lib/redis.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="293">
-              <caret line="32" column="47" selection-start-line="32" selection-start-column="47" selection-end-line="32" selection-end-column="47" />
+            <state relative-caret-position="255">
+              <caret line="15" column="19" selection-start-line="15" selection-start-column="19" selection-end-line="15" selection-end-column="19" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/servers/cron.php">
+        <entry file="file://$PROJECT_DIR$/vendor/predis/predis/src/Command/StringSet.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="5" column="25" selection-start-line="5" selection-start-column="25" selection-end-line="5" selection-end-column="25" />
+            <state relative-caret-position="187">
+              <caret line="18" column="29" selection-start-line="18" selection-start-column="29" selection-end-line="18" selection-end-column="29" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/scripts/lib/lib.php">
+        <entry file="file://$PROJECT_DIR$/vendor/predis/predis/src/Command/Command.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1826">
-              <caret line="375" selection-start-line="375" selection-end-line="375" />
+            <state relative-caret-position="187">
+              <caret line="18" column="15" selection-start-line="18" selection-start-column="15" selection-end-line="18" selection-end-column="15" />
             </state>
           </provider>
         </entry>
@@ -93,47 +100,44 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/scripts/lib/ssh.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="211">
-              <caret line="42" column="101" selection-start-line="42" selection-start-column="101" selection-end-line="42" selection-end-column="101" />
+            <state relative-caret-position="629">
+              <caret line="37" column="62" selection-start-line="37" selection-start-column="62" selection-end-line="37" selection-end-column="62" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/scripts/lib/insteon.php">
+        <entry file="file://$PROJECT_DIR$/scripts/cron/cron.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="197">
-              <caret line="37" selection-start-line="37" selection-end-line="44" selection-end-column="52" />
+            <state relative-caret-position="325">
+              <caret line="303" column="45" lean-forward="true" selection-start-line="303" selection-start-column="45" selection-end-line="303" selection-end-column="45" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/scripts/lib/redis.php">
+        <entry file="file://$PROJECT_DIR$/scripts/lib/harmony.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="306">
-              <caret line="57" column="45" selection-start-line="57" selection-start-column="45" selection-end-line="57" selection-end-column="45" />
-              <folding>
-                <element signature="e#7#25#0#PHP" expanded="true" />
-              </folding>
+            <state relative-caret-position="119">
+              <caret line="7" column="24" selection-start-line="7" selection-start-column="24" selection-end-line="7" selection-end-column="24" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/scripts/lib/tmdb.php">
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/scripts/freeboxchannel.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="143">
-              <caret line="142" selection-start-line="142" selection-end-line="142" />
+            <state relative-caret-position="272">
+              <caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/scripts/cron/cron.php">
+        <entry file="file://$PROJECT_DIR$/scripts/transcode.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="187">
-              <caret line="11" column="22" selection-start-line="11" selection-start-column="22" selection-end-line="11" selection-end-column="22" />
+            <state relative-caret-position="17">
+              <caret line="1" selection-start-line="1" selection-end-line="1" selection-end-column="26" />
             </state>
           </provider>
         </entry>
@@ -153,10 +157,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>hideMaskTimeout</find>
-      <find>bureau/plasma/on</find>
-      <find>#mas</find>
-      <find>$shareroot</find>
       <find>.music</find>
       <find>cronSeen</find>
       <find>8084</find>
@@ -183,6 +183,10 @@
       <find>setex(</find>
       <find>set_time_limit</find>
       <find>ssh</find>
+      <find>matin</find>
+      <find>tvShowLibra</find>
+      <find>connectRedis()-&gt;</find>
+      <find>tmdb.</find>
     </findStrings>
     <replaceStrings>
       <replace />
@@ -213,7 +217,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/config/bureau.php" />
         <option value="$PROJECT_DIR$/config/chambre.php" />
         <option value="$PROJECT_DIR$/config/cuisine.php" />
         <option value="$PROJECT_DIR$/config/entree.php" />
@@ -232,10 +235,7 @@
         <option value="$PROJECT_DIR$/servers/stopserver" />
         <option value="$PROJECT_DIR$/.gitignore" />
         <option value="$PROJECT_DIR$/scripts/lib/ecomode.php" />
-        <option value="$PROJECT_DIR$/scripts/lib/harmony.php" />
         <option value="$PROJECT_DIR$/scripts/raspberrycast.php" />
-        <option value="$PROJECT_DIR$/scripts/lib/remoteinfos.php" />
-        <option value="$PROJECT_DIR$/scripts/lib/scenes.php" />
         <option value="$PROJECT_DIR$/config/global.php" />
         <option value="$PROJECT_DIR$/scripts/jarvis.php" />
         <option value="$PROJECT_DIR$/scripts/lib/jarvis.php" />
@@ -243,27 +243,31 @@
         <option value="$PROJECT_DIR$/tools/jarvis/commands" />
         <option value="$APPLICATION_CONFIG_DIR$/Composer Log/Composer Log.composerLog" />
         <option value="$PROJECT_DIR$/composer.json" />
-        <option value="$PROJECT_DIR$/config/media.php" />
-        <option value="$PROJECT_DIR$/config/music.php" />
         <option value="$PROJECT_DIR$/scripts/sections.php" />
         <option value="$PROJECT_DIR$/scripts/seen.php" />
         <option value="$PROJECT_DIR$/scripts/lib/medialibrary.php" />
         <option value="$PROJECT_DIR$/scripts/lib/mediarasp.php" />
-        <option value="$PROJECT_DIR$/scripts/lib/state.php" />
-        <option value="$PROJECT_DIR$/scripts/lib/tmdb.php" />
-        <option value="$PROJECT_DIR$/scripts/cron/cron.php" />
         <option value="$PROJECT_DIR$/config/tv.php" />
         <option value="$PROJECT_DIR$/servers/startdaemon" />
         <option value="$PROJECT_DIR$/servers/stopdaemon" />
-        <option value="$PROJECT_DIR$/scripts/lib/domoticz.php" />
-        <option value="$PROJECT_DIR$/servers/domoticz.php" />
-        <option value="$PROJECT_DIR$/scripts/lib/redis.php" />
         <option value="$PROJECT_DIR$/servers/cron.php" />
         <option value="$PROJECT_DIR$/scripts/lib/lib.php" />
+        <option value="$PROJECT_DIR$/scripts/lib/scenes.php" />
+        <option value="$PROJECT_DIR$/servers/insteon.php" />
         <option value="$PROJECT_DIR$/scripts/lib/insteon.php" />
-        <option value="$PROJECT_DIR$/scripts/lib/ssh.php" />
+        <option value="$PROJECT_DIR$/servers/domoticz.php" />
+        <option value="$PROJECT_DIR$/scripts/lib/domoticz.php" />
         <option value="$PROJECT_DIR$/servers/ssh.php" />
-        <option value="$PROJECT_DIR$/servers/insteon.php" />
+        <option value="$PROJECT_DIR$/scripts/lib/ssh.php" />
+        <option value="$PROJECT_DIR$/scripts/lib/state.php" />
+        <option value="$PROJECT_DIR$/config/music.php" />
+        <option value="$PROJECT_DIR$/config/media.php" />
+        <option value="$PROJECT_DIR$/scripts/lib/remoteinfos.php" />
+        <option value="$PROJECT_DIR$/scripts/cron/cron.php" />
+        <option value="$PROJECT_DIR$/scripts/lib/redis.php" />
+        <option value="$PROJECT_DIR$/scripts/lib/tmdb.php" />
+        <option value="$PROJECT_DIR$/scripts/tmdb.php" />
+        <option value="$PROJECT_DIR$/scripts/lib/harmony.php" />
       </list>
     </option>
   </component>
@@ -402,9 +406,9 @@
       <path value="$PROJECT_DIR$/vendor/predis/predis" />
     </include_path>
   </component>
-  <component name="ProjectFrameBounds">
-    <option name="x" value="1233" />
-    <option name="y" value="102" />
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="956" />
+    <option name="y" value="114" />
     <option name="width" value="1436" />
     <option name="height" value="771" />
   </component>
@@ -487,6 +491,7 @@
     <property name="aspect.path.notification.shown" value="true" />
     <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1553247665857" />
     <property name="dumpAutoload T:/Drive/Works/home/composer.json" value="--no-interaction --ansi --verbose --optimize" />
+    <property name="editor.config.ad.shown" value="true" />
     <property name="last_opened_file_path" value="D:/Works" />
     <property name="list.type.of.created.stylesheet" value="Less" />
     <property name="nodejs_package_manager_path" value="npm" />
@@ -957,14 +962,8 @@
       <workItem from="1562187458066" duration="10928000" />
       <workItem from="1562315270549" duration="3917000" />
       <workItem from="1562430904715" duration="18334000" />
-      <workItem from="1562654595102" duration="2716000" />
-    </task>
-    <task id="LOCAL-00144" summary=".">
-      <created>1550049087023</created>
-      <option name="number" value="00144" />
-      <option name="presentableId" value="LOCAL-00144" />
-      <option name="project" value="LOCAL" />
-      <updated>1550049087023</updated>
+      <workItem from="1562654595102" duration="11549000" />
+      <workItem from="1562710631719" duration="760000" />
     </task>
     <task id="LOCAL-00145" summary=".">
       <created>1550318303606</created>
@@ -1302,11 +1301,18 @@
       <option name="project" value="LOCAL" />
       <updated>1562618964460</updated>
     </task>
-    <option name="localTasksCounter" value="193" />
+    <task id="LOCAL-00193" summary=".">
+      <created>1562657440892</created>
+      <option name="number" value="00193" />
+      <option name="presentableId" value="LOCAL-00193" />
+      <option name="project" value="LOCAL" />
+      <updated>1562657440893</updated>
+    </task>
+    <option name="localTasksCounter" value="194" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1257610000" />
+    <option name="totallyTimeSpent" value="1267203000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1318,7 +1324,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="1233" y="102" width="1436" height="771" extended-state="0" />
+    <frame x="-8" y="-8" width="2576" height="1056" extended-state="6" />
     <editor active="true" />
     <layout>
       <window_info id="Nl-Palette" order="0" />
@@ -1327,9 +1333,9 @@
       <window_info id="Designer" order="3" />
       <window_info id="UI Designer" order="4" />
       <window_info id="Favorites" order="5" sideWeight="0.4576547" side_tool="true" weight="0.22506666" />
-      <window_info active="true" content_ui="combo" id="Project" order="6" sideWeight="0.49456522" visible="true" weight="0.22311047" />
+      <window_info active="true" content_ui="combo" id="Project" order="6" sideWeight="0.49456522" visible="true" weight="0.12281399" />
       <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" sideWeight="0.48251194" visible="true" weight="0.30444205" />
+      <window_info anchor="bottom" id="Find" order="1" sideWeight="0.48251194" weight="0.30444205" />
       <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4674086" weight="0.3217768" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
@@ -1337,7 +1343,7 @@
       <window_info anchor="bottom" id="TODO" order="6" sideWeight="0.49920508" weight="0.32936078" />
       <window_info anchor="bottom" id="Version Control" order="7" sideWeight="0.49801272" weight="0.32936078" />
       <window_info anchor="bottom" id="Terminal" order="8" sideWeight="0.44395867" weight="0.2383532" />
-      <window_info anchor="bottom" id="File Transfer" order="9" sideWeight="0.43759936" visible="true" weight="0.2523511" />
+      <window_info anchor="bottom" id="File Transfer" order="9" sideWeight="0.43759936" visible="true" weight="0.1744312" />
       <window_info anchor="bottom" id="Database Changes" order="10" show_stripe_button="false" />
       <window_info anchor="bottom" id="Docker" order="11" show_stripe_button="false" />
       <window_info anchor="bottom" id="Messages" order="12" />
@@ -1352,9 +1358,9 @@
       <window_info anchor="right" id="Palette&#9;" order="7" />
       <window_info anchor="right" id="Capture Analysis" order="8" />
       <window_info anchor="right" id="Theme Preview" order="9" />
-      <window_info anchor="right" id="Remote Host" order="10" sideWeight="0.48427674" visible="true" weight="0.09156977" />
+      <window_info anchor="right" id="Remote Host" order="10" sideWeight="0.48425198" visible="true" weight="0.14825119" />
       <window_info anchor="right" id="SciView" order="11" weight="0.3298887" />
-      <window_info anchor="right" id="Structure" order="12" sideWeight="0.5157233" side_tool="true" visible="true" weight="0.09156977" />
+      <window_info anchor="right" id="Structure" order="12" sideWeight="0.515748" side_tool="true" visible="true" weight="0.14825119" />
       <window_info anchor="right" id="Data View" order="13" />
       <window_info anchor="right" id="Maven" order="14" />
     </layout>
@@ -1390,93 +1396,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/servers/stopserver">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="51">
-          <caret line="3" column="44" selection-start-line="3" selection-start-column="44" selection-end-line="3" selection-end-column="44" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/servers/eventsource.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="153">
-          <caret line="9" column="36" selection-start-line="9" selection-start-column="36" selection-end-line="9" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/.gitignore">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="136">
-          <caret line="8" column="7" selection-start-line="8" selection-start-column="7" selection-end-line="8" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/lib/harmony.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="561">
-          <caret line="33" column="39" selection-start-line="33" selection-start-column="39" selection-end-line="33" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/mediarasp.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="153">
-          <caret line="9" column="21" selection-start-line="9" selection-start-column="21" selection-end-line="9" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/lib/ecomode.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="187">
-          <caret line="11" column="33" selection-start-line="11" selection-start-column="33" selection-end-line="11" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/harmonyactivity.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="17">
-          <caret line="1" column="26" selection-start-line="1" selection-start-column="26" selection-end-line="1" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/harmony.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="68">
-          <caret line="4" column="27" selection-start-line="4" selection-start-column="27" selection-end-line="4" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/remoteinfos.php">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/lib/remoteinfos.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2091">
-          <caret line="123" column="32" selection-start-line="123" selection-start-column="32" selection-end-line="123" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/raspberrycast.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="102">
-          <caret line="6" column="34" selection-start-line="6" selection-start-column="34" selection-end-line="6" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/index.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="85">
-          <caret line="5" column="8" selection-start-line="5" selection-start-column="8" selection-end-line="5" selection-end-column="8" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/lib/scenes.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="9452">
-          <caret line="556" column="22" selection-start-line="556" selection-start-column="22" selection-end-line="556" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/scripts/insteon.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="51">
@@ -1553,27 +1472,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/config/media.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="51">
-          <caret line="3" column="9" selection-start-line="3" selection-start-column="9" selection-end-line="3" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/config/music.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="85">
-          <caret line="5" column="31" selection-start-line="5" selection-start-column="31" selection-end-line="5" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/clearcache.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="34">
-          <caret line="2" selection-start-line="2" selection-end-line="2" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/scripts/sections.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="85">
@@ -1595,13 +1493,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/lib/state.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="221">
-          <caret line="13" column="30" selection-start-line="13" selection-start-column="30" selection-end-line="13" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/scripts/lib/medialibrary.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="170">
@@ -1651,86 +1542,200 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/lib/domoticz.php">
+    <entry file="file://$PROJECT_DIR$/scripts/lib/server.php" />
+    <entry file="file://$PROJECT_DIR$/servers/cron.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="119">
-          <caret line="7" column="1" selection-start-line="7" selection-start-column="1" selection-end-line="7" selection-end-column="1" />
+        <state relative-caret-position="85">
+          <caret line="5" column="25" selection-start-line="5" selection-start-column="25" selection-end-line="5" selection-end-column="25" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/cron/cron.php">
+    <entry file="file://$PROJECT_DIR$/scripts/lib/lib.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="187">
-          <caret line="11" column="22" selection-start-line="11" selection-start-column="22" selection-end-line="11" selection-end-column="22" />
+        <state relative-caret-position="-1826">
+          <caret line="375" selection-start-line="375" selection-end-line="375" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/lib/server.php">
-      <provider selected="true" editor-type-id="text-editor" />
+    <entry file="file://$PROJECT_DIR$/scripts/lib/scenes.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="115">
+          <caret line="31" selection-start-line="31" selection-end-line="31" selection-end-column="63" />
+        </state>
+      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/lib/tmdb.php">
+    <entry file="file://$PROJECT_DIR$/servers/insteon.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="143">
-          <caret line="142" selection-start-line="142" selection-end-line="142" />
+        <state relative-caret-position="544">
+          <caret line="36" column="36" selection-start-line="36" selection-start-column="36" selection-end-line="36" selection-end-column="36" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/lib/redis.php">
+    <entry file="file://$PROJECT_DIR$/scripts/lib/insteon.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="306">
-          <caret line="57" column="45" selection-start-line="57" selection-start-column="45" selection-end-line="57" selection-end-column="45" />
-          <folding>
-            <element signature="e#7#25#0#PHP" expanded="true" />
-          </folding>
+          <caret line="21" column="25" lean-forward="true" selection-start-line="21" selection-start-column="25" selection-end-line="21" selection-end-column="25" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/servers/cron.php">
+    <entry file="file://$PROJECT_DIR$/scripts/clearcache.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="85">
-          <caret line="5" column="25" selection-start-line="5" selection-start-column="25" selection-end-line="5" selection-end-column="25" />
+        <state relative-caret-position="34">
+          <caret line="2" selection-start-line="2" selection-end-line="2" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/scripts/lib/domoticz.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="459">
+          <caret line="27" column="5" selection-start-line="27" selection-start-column="5" selection-end-line="27" selection-end-column="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/servers/domoticz.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-183">
-          <caret line="14" column="59" selection-start-line="14" selection-start-column="59" selection-end-line="14" selection-end-column="59" />
+        <state relative-caret-position="476">
+          <caret line="28" column="45" selection-start-line="28" selection-start-column="45" selection-end-line="28" selection-end-column="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/lib/lib.php">
+    <entry file="file://$PROJECT_DIR$/servers/ssh.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1826">
-          <caret line="375" selection-start-line="375" selection-end-line="375" />
+        <state relative-caret-position="493">
+          <caret line="29" column="18" selection-start-line="29" selection-start-column="18" selection-end-line="29" selection-end-column="18" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/lib/insteon.php">
+    <entry file="file://$PROJECT_DIR$/vendor/predis/predis/src/Connection/StreamConnection.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="654">
+          <caret line="389" selection-start-line="389" selection-end-line="389" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/scripts/lib/state.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="197">
-          <caret line="37" selection-start-line="37" selection-end-line="44" selection-end-column="52" />
+        <state relative-caret-position="85">
+          <caret line="5" column="30" lean-forward="true" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$APPLICATION_PLUGINS_DIR$/php/lib/php.jar!/stubs/standard/standard_5.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="146">
+          <caret line="310" column="50" lean-forward="true" selection-start-line="310" selection-start-column="50" selection-end-line="310" selection-end-column="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$APPLICATION_PLUGINS_DIR$/php/lib/php.jar!/stubs/igbinary/igbinary.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="629">
+          <caret line="37" column="9" selection-start-line="37" selection-start-column="9" selection-end-line="37" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/config/music.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="459">
+          <caret line="27" column="5" selection-start-line="27" selection-start-column="5" selection-end-line="27" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/config/media.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="748">
+          <caret line="44" column="1" selection-start-line="44" selection-start-column="1" selection-end-line="44" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/scripts/lib/remoteinfos.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="51">
+          <caret line="3" column="23" lean-forward="true" selection-start-line="3" selection-start-column="23" selection-end-line="3" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/scripts/lib/tmdb.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="357">
+          <caret line="21" column="9" selection-start-line="21" selection-start-column="9" selection-end-line="21" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/vendor/php-tmdb/api/lib/Tmdb/Api/Tv.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="323">
+          <caret line="29" column="20" selection-start-line="29" selection-start-column="20" selection-end-line="29" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/scripts/lib/playing.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="153">
+          <caret line="9" column="9" selection-start-line="9" selection-start-column="9" selection-end-line="9" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/scripts/lib/redis.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="255">
+          <caret line="15" column="19" selection-start-line="15" selection-start-column="19" selection-end-line="15" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/vendor/predis/predis/src/Command/StringSet.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="187">
+          <caret line="18" column="29" selection-start-line="18" selection-start-column="29" selection-end-line="18" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/vendor/predis/predis/src/Command/Command.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="187">
+          <caret line="18" column="15" selection-start-line="18" selection-start-column="15" selection-end-line="18" selection-end-column="15" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/scripts/lib/ssh.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="211">
-          <caret line="42" column="101" selection-start-line="42" selection-start-column="101" selection-end-line="42" selection-end-column="101" />
+        <state relative-caret-position="629">
+          <caret line="37" column="62" selection-start-line="37" selection-start-column="62" selection-end-line="37" selection-end-column="62" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/servers/ssh.php">
+    <entry file="file://$PROJECT_DIR$/scripts/transcode.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
-          <caret line="32" column="47" selection-start-line="32" selection-start-column="47" selection-end-line="32" selection-end-column="47" />
+        <state relative-caret-position="17">
+          <caret line="1" selection-start-line="1" selection-end-line="1" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/servers/insteon.php">
+    <entry file="file://$PROJECT_DIR$/scripts/tmdb.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="34">
+          <caret line="2" selection-start-line="2" selection-start-column="2" selection-end-line="2" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/scripts/cron/cron.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="325">
+          <caret line="303" column="45" lean-forward="true" selection-start-line="303" selection-start-column="45" selection-end-line="303" selection-end-column="45" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/scripts/lib/harmony.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="119">
+          <caret line="7" column="24" selection-start-line="7" selection-start-column="24" selection-end-line="7" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/scripts/freeboxchannel.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="204">
-          <caret line="24" column="22" selection-start-line="24" selection-start-column="22" selection-end-line="24" selection-end-column="22" />
+        <state relative-caret-position="272">
+          <caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
         </state>
       </provider>
     </entry>

diff --git a/config/media.php b/config/media.php
index df304b593671e95053ed3a1fb521e4886fd23949..c3864a397acf8bd3440b74965e33c573d3f71d4a 100644 (file)
--- a/config/media.php
+++ b/config/media.php
@@ -13,27 +13,35 @@ if ($device == 'salon' || $device == 'bureau') {
 }
 
 $tvshows = getTVShows();
-$shortcuts['sub-seriestv'] = $tvshows['shortcuts'];
-$shortcuts = array_merge($shortcuts, $tvshows['subs']);
-profile('Got TV Shows', __FILE__, __LINE__);
+if (is_array($tvshows)) {
+    $shortcuts['sub-seriestv'] = $tvshows['shortcuts'];
+    $shortcuts = array_merge($shortcuts, $tvshows['subs']);
+    profile('Got TV Shows', __FILE__, __LINE__);
+}
 
 $movies = getMovies();
-$shortcuts['sub-movies'] = $movies['shortcuts'];
-$shortcuts = array_merge($shortcuts, $movies['subs']);
-profile('Got movies', __FILE__, __LINE__);
+if (is_array($movies)) {
+    $shortcuts['sub-movies'] = $movies['shortcuts'];
+    $shortcuts = array_merge($shortcuts, $movies['subs']);
+    profile('Got movies', __FILE__, __LINE__);
+}
 
 $recent = getMediaRecentAdded();
-$shortcuts['sub-mediarecent'] = $recent['shortcuts'];
-$shortcuts = array_merge($shortcuts, $recent['subs']);
-profile('Got recents', __FILE__, __LINE__);
+if (is_array($recent)) {
+    $shortcuts['sub-mediarecent'] = $recent['shortcuts'];
+    $shortcuts = array_merge($shortcuts, $recent['subs']);
+    profile('Got recents', __FILE__, __LINE__);
+}
 
-foreach ($media as $id => $mediagroup) {
-    if ($id == 'x' && !isset($_GET['x'])) {
-        continue;
+if(is_array($media)) {
+    foreach ($media as $id => $mediagroup) {
+        if ($id == 'x' && !isset($_GET['x'])) {
+            continue;
+        }
+        $parentId = 'media-' . $id;
+        $shortcuts['media'][] = array('label' => $mediagroup['name'], 'type' => 'sub', 'sub' => $parentId);
+        $shortcuts = array_merge($shortcuts, getMediaFolderShortcuts($mediagroup, $parentId));
     }
-    $parentId = 'media-' . $id;
-    $shortcuts['media'][] = array('label' => $mediagroup['name'], 'type' => 'sub', 'sub' => $parentId);
-    $shortcuts = array_merge($shortcuts, getMediaFolderShortcuts($mediagroup, $parentId));
 }
 
 function getMediaFolderShortcuts($mediagroup, $parentId)

diff --git a/config/music.php b/config/music.php
index 1776f8185917d410d27d761b748bbda0666959bf..512f04d50be727dec44eb3fbf7a07e674e7e8ea7 100644 (file)
--- a/config/music.php
+++ b/config/music.php
@@ -9,108 +9,110 @@ profile('Got podcasts', __FILE__, __LINE__);
 
 function squeezeFavorites($favorites, &$shortcuts)
 {
-       foreach ($favorites as $s) {
-               if ($s['name'] == 'Radios') {
-                       $label = 'Radios';
-                       $key = 'sub-radio';
-               } else if ($s['name'] == 'Playlists') {
-                       $label = 'Musique';
-                       $key = 'sub-playlists';
-               } else if ($s['name'] == 'Ambiances') {
-                       $label = 'Ambiance';
-                       $key = 'sub-ambiance';
-               } else {
-                       continue;
-               }
-               squeezeSubitems($s, $key, $label, $shortcuts);
-       }
+    if (is_array($favorites)) {
+        foreach ($favorites as $s) {
+            if ($s['name'] == 'Radios') {
+                $label = 'Radios';
+                $key = 'sub-radio';
+            } else if ($s['name'] == 'Playlists') {
+                $label = 'Musique';
+                $key = 'sub-playlists';
+            } else if ($s['name'] == 'Ambiances') {
+                $label = 'Ambiance';
+                $key = 'sub-ambiance';
+            } else {
+                continue;
+            }
+            squeezeSubitems($s, $key, $label, $shortcuts);
+        }
+    }
 }
 
 function squeezeSubitems($s, $key, $label, &$shortcuts)
 {
-       global $allmusics;
+    global $allmusics;
 
-       $t = array();
-       foreach ($s['subitems'] as $subitem) {
-               if ($subitem['hasitems']) {
-                       $id = $key . '-' . md5($subitem['name']);
-                       $t[] = array('label' => $subitem['name'], 'type' => 'sub', 'sub' => $id);
-                       squeezeSubitems($subitem, $id, $subitem['name'], $shortcuts);
-                       continue;
-               } else {
-                       $e = explode('.', $subitem['id']);
-                       array_shift($e);
-                       $id = $subitem['id'];
-                       $type = 'squeeze';
-                       $commands = ['favorites playlist play item_id:' . $id, 'playlist repeat 2', 'playlist shuffle 1'];
-                       if ($s['name'] == 'Ambiances') {
-                               $type .= '_ambiance';
-                               array_unshift($commands, 'sync -');
-                       }
-                       $a = array('type' => $type, 'commands' => $commands, 'label' => $subitem['name']);
+    $t = array();
+    foreach ($s['subitems'] as $subitem) {
+        if ($subitem['hasitems']) {
+            $id = $key . '-' . md5($subitem['name']);
+            $t[] = array('label' => $subitem['name'], 'type' => 'sub', 'sub' => $id);
+            squeezeSubitems($subitem, $id, $subitem['name'], $shortcuts);
+            continue;
+        } else {
+            $e = explode('.', $subitem['id']);
+            array_shift($e);
+            $id = $subitem['id'];
+            $type = 'squeeze';
+            $commands = ['favorites playlist play item_id:' . $id, 'playlist repeat 2', 'playlist shuffle 1'];
+            if ($s['name'] == 'Ambiances') {
+                $type .= '_ambiance';
+                array_unshift($commands, 'sync -');
+            }
+            $a = array('type' => $type, 'commands' => $commands, 'label' => $subitem['name']);
 
-                       $allmusics[$subitem['name']] = $a;
-                       $t[] = $a;
-               }
-       }
-       $shortcuts[$key] = array_merge([['type' => 'back', 'label' => $label]], $t);
+            $allmusics[$subitem['name']] = $a;
+            $t[] = $a;
+        }
+    }
+    $shortcuts[$key] = array_merge([['type' => 'back', 'label' => $label]], $t);
 }
 
 function podcastDir($podcasts, $label, $key, &$shortcuts)
 {
-       global $allmusics;
+    global $allmusics;
 
-       $k = 'sub-' . $key;
-       $t = [];
+    $k = 'sub-' . $key;
+    $t = [];
 
-       $hasDir = false;
-       if (!is_array($podcasts)) {
-               return;
-       }
-       foreach ($podcasts as $subitem) {
-               if ($subitem['hasitems']) {
-                       if (count($subitem['subitems']) == 0) {
+    $hasDir = false;
+    if (!is_array($podcasts)) {
+        return;
+    }
+    foreach ($podcasts as $subitem) {
+        if ($subitem['hasitems']) {
+            if (count($subitem['subitems']) == 0) {
 
-                       } elseif (count($subitem['subitems']) == 1) {
-                               $t[] = audioElement($subitem['subitems'][0], 'podcasts');
-                       } else {
-                               $subname = $subitem['name'] ? $subitem['name'] : $subitem['title'];
-                               $subkey = $key . '-' . str_replace('.', '_', $subitem['id']);
-                               $t[] = ['type' => 'sub', 'label' => $subname, 'sub' => $subkey];
-                               podcastDir($subitem['subitems'], $subname, $subkey, $shortcuts);
-                               $hasDir = true;
-                       }
-               } else {
-                       $t[] = audioElement($subitem, 'podcasts');
-               }
-       }
+            } elseif (count($subitem['subitems']) == 1) {
+                $t[] = audioElement($subitem['subitems'][0], 'podcasts');
+            } else {
+                $subname = $subitem['name'] ? $subitem['name'] : $subitem['title'];
+                $subkey = $key . '-' . str_replace('.', '_', $subitem['id']);
+                $t[] = ['type' => 'sub', 'label' => $subname, 'sub' => $subkey];
+                podcastDir($subitem['subitems'], $subname, $subkey, $shortcuts);
+                $hasDir = true;
+            }
+        } else {
+            $t[] = audioElement($subitem, 'podcasts');
+        }
+    }
 
-       $shortcuts[$k] = array_merge([['type' => 'back', 'label' => $label]], $t);
+    $shortcuts[$k] = array_merge([['type' => 'back', 'label' => $label]], $t);
 
 }
 
 function audioElement($subitem, $app = 'favorites')
 {
-       global $allmusics;
-       $subname = isset($subitem['name']) && $subitem['name'] ? $subitem['name'] : $subitem['title'];
-       $e = explode('.', $subitem['id']);
-       array_shift($e);
-       $id = $subitem['id'];
-       $a = array('type' => 'squeeze', 'commands' => array($app . ' playlist play item_id:' . $id, 'playlist shuffle 1'), 'label' => $subname);
-       $allmusics[$subitem['title']] = $a;
-       return $a;
+    global $allmusics;
+    $subname = isset($subitem['name']) && $subitem['name'] ? $subitem['name'] : $subitem['title'];
+    $e = explode('.', $subitem['id']);
+    array_shift($e);
+    $id = $subitem['id'];
+    $a = array('type' => 'squeeze', 'commands' => array($app . ' playlist play item_id:' . $id, 'playlist shuffle 1'), 'label' => $subname);
+    $allmusics[$subitem['title']] = $a;
+    return $a;
 }
 
 
 $shortcuts['music'] = [
-       ['type' => 'volume', 'volume' => '3%', 'increase' => '+', 'label' => '<i class="fa fa-volume-up"></i>'],
-       ['type' => 'volume', 'volume' => '3%', 'increase' => '-', 'label' => '<i class="fa fa-volume-down"></i>'],
-       ['type' => 'light', 'scene' => 'home/music/synchro/soiree', 'label' => 'Synchro Soirée'],
-       ['type' => 'sub', 'label' => 'Radios', 'sub' => 'radio'],
-       ['type' => 'sub', 'label' => 'Musique', 'sub' => 'playlists'],
-       ['type' => 'sub', 'label' => 'Ambiance', 'sub' => 'ambiance'],
+    ['type' => 'volume', 'volume' => '3%', 'increase' => '+', 'label' => '<i class="fa fa-volume-up"></i>'],
+    ['type' => 'volume', 'volume' => '3%', 'increase' => '-', 'label' => '<i class="fa fa-volume-down"></i>'],
+    ['type' => 'light', 'scene' => 'home/music/synchro/soiree', 'label' => 'Synchro Soirée'],
+    ['type' => 'sub', 'label' => 'Radios', 'sub' => 'radio'],
+    ['type' => 'sub', 'label' => 'Musique', 'sub' => 'playlists'],
+    ['type' => 'sub', 'label' => 'Ambiance', 'sub' => 'ambiance'],
 ];
 
 if ($podcasts !== false) {
-       $shortcuts['music'][] = ['type' => 'sub', 'label' => 'Podcasts', 'sub' => 'podcasts'];
+    $shortcuts['music'][] = ['type' => 'sub', 'label' => 'Podcasts', 'sub' => 'podcasts'];
 }
\ No newline at end of file

diff --git a/scripts/cron/cron.php b/scripts/cron/cron.php
index 708fdb5e667a11db05946e246018acb72781d6f0..a8e04c76b0d78fb2d2077d69b19fc0897771222c 100644 (file)
--- a/scripts/cron/cron.php
+++ b/scripts/cron/cron.php
@@ -110,7 +110,6 @@ function cronMediaLibrary($cronmin)
     $media = array();
     $shareroot = '/volume1/Share';
 
-    $tmdbclient = getTmbdClient();
 
     foreach ($directories as $name => $directory) {
         $dir = $shareroot . '/Videos/' . $directory['dir'];

diff --git a/scripts/lib/domoticz.php b/scripts/lib/domoticz.php
index 24269a299a81db8dc266e53d86b377ccf1c9f4f4..c1bb9893847fac9eeb43595d2108bbe1126176d5 100644 (file)
--- a/scripts/lib/domoticz.php
+++ b/scripts/lib/domoticz.php
@@ -16,14 +16,16 @@ function domoticzCmd($command, $priority = false)
 {
     $redis = connectRedis();
     $queue_name = 'domoticz_queue';
-    if ($priority) {
-        $queue_name .= '_priority';
-    }
+
     $queue = $redis->get($queue_name);
     if (!is_array($queue)) {
         $queue = [];
     }
-    $queue[] = $command;
+    if($priority){
+        array_unshift($queue,$command);
+    }else{
+        array_push($queue,$command);
+    }
     $redis->igbset($queue_name, $queue);
     $redis->publish('domoticz_event', 'handle_queue');
 }
\ No newline at end of file

diff --git a/scripts/lib/harmony.php b/scripts/lib/harmony.php
index f60c577126bd85098eab4bde58a85f5cd023cc50..fcfa452e4dbefa1776f3e7b39273bef224b7357c 100644 (file)
--- a/scripts/lib/harmony.php
+++ b/scripts/lib/harmony.php
@@ -5,7 +5,7 @@ function harmonyRequest($uri, $method = 'GET', $hub = 'salon')
 {
     global $harmonyClient;
 
-    $ip = '192.168.1.' . (getState('device_salon_awake') ? '66' : '69');
+    $ip = '192.168.1.66';
 
     $uri = 'http://' . $ip . ':8282/hubs/' . $hub . '/' . ltrim($uri, '/');
 

diff --git a/scripts/lib/insteon.php b/scripts/lib/insteon.php
index 654d1fb26119d8a3517de58021f04ce1cfdb228b..5946c65dcdba124beb429ad4542be3651609635c 100644 (file)
--- a/scripts/lib/insteon.php
+++ b/scripts/lib/insteon.php
@@ -5,80 +5,81 @@ $insteonAuth = array('t1Kx8wuNWG', 'NA4Hq3v9cM');
 $insteonCommandTimeout = 15;
 $insteonHasKnocked = false;
 
-function insteonKnock()
+function insteonCommand($command)
 {
-       global $insteonHasKnocked;
-       $insteonHasKnocked = true;
-       __insteonCommand('1cjdW20oprxzHDZ.htm');
+    $redis = connectRedis();
+    $queue = $redis->igbget('insteon_queue');
+    if (!is_array($queue)) {
+        $queue = [];
+    }
+    $queue[] = $command;
+    $redis->igbset('insteon_queue', $queue);
+    $redis->publish('insteon_event', 'handle_queue');
 }
 
-function runInsteonCommand($command, $attemps = 3)
+function runInsteonCommand($command, $attempts = 3)
 {
-       if ($attemps <= 0) {
-               return;
-       }
+    if ($attempts <= 0) {
+        return;
+    }
 
-       insteonClearBuffer();
-       echo "\n" . '-- Command ' . $command . ' --' . "\n";
-       echo "command : " . _insteonCommand($command) . "\n";
-       for ($i = 1; $i <= 5; $i++) {
-               usleep(1000000 * 0.1);
-               $buff = insteonBuffer();
-               echo $buff . "\n";
-               if (stristr($buff, '0250') || stristr($buff, '0258')) {
-                       insteonClearBuffer();
-                       return;
-               }
-       }
-       runInsteonCommand($command, $attemps - 1);
+    insteonClearBuffer();
+    echo "\n" . '-- Command ' . $command . ' attempt #' . $attempts . ' --' . "\n";
+    echo "command : " . _insteonCommand($command) . "\n";
+    for ($i = 1; $i <= 5; $i++) {
+        usleep(1000000 * 0.1);
+        $buff = insteonBuffer();
+        echo $buff . "\n";
+        if (stristr($buff, '0250') || stristr($buff, '0258')) {
+            insteonClearBuffer();
+            return;
+        }
+    }
+    runInsteonCommand($command, $attempts - 1);
 }
 
-function insteonCommand($command)
+function _insteonCommand($command)
 {
-       $redis = connectRedis();
-       $queue = $redis->get('insteon_queue');
-       if (!is_array($queue)) {
-               $queue = [];
-       }
-       $queue[] = $command;
-       $redis->igbset('insteon_queue', $queue);
-       $redis->publish('insteon_event','handle_queue');
+    global $insteonHasKnocked;
+    if (!$insteonHasKnocked) {
+        insteonKnock();
+    }
+    return __insteonCommand($command);
 }
 
-function _insteonCommand($command)
+function insteonKnock()
 {
-       global $insteonHasKnocked;
-       if (!$insteonHasKnocked) {
-               insteonKnock();
-       }
-       return __insteonCommand($command);
+    global $insteonHasKnocked;
+    $insteonHasKnocked = true;
+    __insteonCommand('1cjdW20oprxzHDZ.htm');
 }
 
+
 function __insteonCommand($command)
 {
-       global $insteonBaseURL, $insteonAuth, $insteonCommandTimeout;
-       return getUrlContent($insteonBaseURL . '/' . $command, $insteonCommandTimeout, $insteonAuth);
+    global $insteonBaseURL, $insteonAuth, $insteonCommandTimeout;
+    return getUrlContent($insteonBaseURL . '/' . $command, $insteonCommandTimeout, $insteonAuth);
 }
 
 function insteonClearBuffer()
 {
-       return _insteonCommand('1?XB=M=1');
+    return _insteonCommand('1?XB=M=1');
 }
 
 function _insteonBufferEmpty()
 {
-       return trim(insteonBuffer(), '0') === '';
+    return trim(insteonBuffer(), '0') === '';
 }
 
 function insteonBuffer()
 {
-       global $insteonHasKnocked;
-       $x = _insteonCommand('buffstatus.xml');
-       if ($x !== false && is_object($x)) {
-               $xml = simplexml_load_string($x);
-               return (string)($xml->BS);
-       } else {
-               $insteonHasKnocked = false;
-               return '';
-       }
+    global $insteonHasKnocked;
+    $x = _insteonCommand('buffstatus.xml');
+    if ($x !== false && is_object($x)) {
+        $xml = simplexml_load_string($x);
+        return (string)($xml->BS);
+    } else {
+        $insteonHasKnocked = false;
+        return '';
+    }
 }
\ No newline at end of file

diff --git a/scripts/lib/redis.php b/scripts/lib/redis.php
index a5540a9aa65669dc686dae83d43e3d6574b9de6e..f1455449611b7e5078da4bf057802414e82fe2e4 100644 (file)
--- a/scripts/lib/redis.php
+++ b/scripts/lib/redis.php
@@ -1,8 +1,6 @@
 <?php
 
 use Predis\Client;
-use Predis\PubSub\DispatcherLoop;
-
 
 class StringSetIb
     extends Predis\Command\StringSet
@@ -32,7 +30,7 @@ class StringGetIb
 
     public function parseResponse($data)
     {
-        return igbinary_unserialize($data);
+        return @igbinary_unserialize($data);
     }
 }
 
@@ -74,9 +72,10 @@ function redisEventListener($channel, $callback)
     // Create a dispatcher loop instance and attach a bunch of callbacks.
     $dispatcher = new Predis\PubSub\DispatcherLoop($pubsub);
 
-    $dispatcher->attachCallback($channel, $events = new class($callback)
+    $events = new class($callback)
     {
         protected $_callback;
+        protected $_running = false;
 
         public function __construct($callback)
         {
@@ -86,16 +85,24 @@ function redisEventListener($channel, $callback)
         public function __invoke($payload)
         {
             if ($payload == 'handle_queue') {
+                usleep(0.1 * 1000000);
+                if ($this->_running) {
+                    return;
+                }
+                $this->_running = true;
                 call_user_func($this->_callback);
+                $this->_running = false;
             }
         }
-    }
-    );
+    };
+
+    $dispatcher->attachCallback($channel, $events);
+
     try {
-        echo 'Run dispatcher';
+        echo 'Run dispatcher' . "\n";
         $dispatcher->run();
     } catch (Exception $e) {
-        echo 'Error while running dispatcher : ' . $e->getMessage();
+        echo 'Error while running dispatcher : ' . $e->getMessage() . "\n";
         redisEventListener($channel, $callback);
     }
 }

diff --git a/scripts/lib/ssh.php b/scripts/lib/ssh.php
index 04b064c5b2da262e551a01b891b92207a500e275..6c6c9ce499fdb9fe5c92356a7fdf99366c444ae9 100644 (file)
--- a/scripts/lib/ssh.php
+++ b/scripts/lib/ssh.php
@@ -35,14 +35,15 @@ function getSSHInstance($device = null, $sudo = false)
 
 function sshCommand($command, $device = null, $blocking = true, $sudo = false)
 {
-    $redis = connectRedis();
-    $queue = $redis->get('ssh_queue');
-    if (!is_array($queue)) {
-        $queue = [];
-    }
-    $queue[] = ['command' => $command, 'device' => $device, 'blocking' => $blocking, 'sudo' => $sudo];
-    $redis->igbset('ssh_queue', $queue);
-    $redis->publish('ssh_event', 'handle_queue');
+    return sshRunCommand($command, $device, $blocking, $sudo);
+//    $redis = connectRedis();
+//    $queue = $redis->get('ssh_queue');
+//    if (!is_array($queue)) {
+//        $queue = [];
+//    }
+//    $queue[] = ['command' => $command, 'device' => $device, 'blocking' => $blocking, 'sudo' => $sudo];
+//    $redis->igbset('ssh_queue', $queue);
+//    $redis->publish('ssh_event', 'handle_queue');
 }
 
 function sshRunCommand($command, $device = null, $blocking = true, $sudo = false)

diff --git a/scripts/lib/tmdb.php b/scripts/lib/tmdb.php
index 1e3edff959da4f367c35333ef0788844388357f3..fe51e375595b565ea214584a1486e604f103188c 100644 (file)
--- a/scripts/lib/tmdb.php
+++ b/scripts/lib/tmdb.php
@@ -62,14 +62,13 @@ function getMediaRecentAdded()
     return _getMediaRecentAdded();
 }
 
-function _getTVShows($force = false)
+function _getTVShows($force = false, $forceapi = false)
 {
     if ($force) {
         global $directories;
-        $library = new tvShowLibrary($directories);
+        $library = new tvShowLibrary($directories, $forceapi);
         $res = $library->getShortcuts();
         connectRedis()->igbset('medialibrary.tvshows', $res);
-
         return $res;
     }
     $res = connectRedis()->igbget('medialibrary.tvshows');
@@ -84,11 +83,11 @@ function getMovies()
     return _getMovies();
 }
 
-function _getMovies($force = false)
+function _getMovies($force = false, $forceapi = false)
 {
     if ($force) {
         global $directories;
-        $library = new moviesLibrary($directories);
+        $library = new moviesLibrary($directories, $force);
         $res = $library->getShortcuts();
         connectRedis()->igbset('medialibrary.movies', $res);
         return $res;
@@ -112,9 +111,11 @@ class tvShowLibrary extends mediaLibrary
 {
 
     protected $tvShows = [];
+    protected $force = false;
 
-    public function __construct($directories)
+    public function __construct($directories, $force = false)
     {
+        $this->force = $force;
         foreach ($directories as $directory) {
             if ($directory['context'] != 'tvshow') {
                 continue;
@@ -140,19 +141,30 @@ class tvShowLibrary extends mediaLibrary
 
     public function getTVShowByID($id)
     {
-        $res = connectRedis()->igbget('tmdb.tv.' . $id);
+        if (!$this->force) {
+            try {
+                $res = connectRedis()->igbget('tmdb.tv.' . $id);
+            } catch (Exception $e) {
+                $res = false;
+            }
+        } else {
+            $res = false;
+        }
+
         if ($res === false) {
             $client = getTmbdClient();
 
             try {
                 $tv = $client->getTvApi()->getTvshow($id, ['language' => 'fr-FR']);
-                connectRedis()->igbset('tmdb.tv.' . $id, $tv, ['EX' => 86400]);
+                connectRedis()->igbsetex('tmdb.tv.' . $id, 86400, $tv);
                 return $tv;
             } catch (Exception $e) {
+                echo $e->getMessage();
                 return null;
             }
 
         }
+
         return $res;
     }
 
@@ -313,10 +325,12 @@ class mediaLibrary
 class moviesLibrary extends mediaLibrary
 {
     protected $movies = [];
+    protected $force = false;
 
-
-    public function __construct($directories)
+    public function __construct($directories, $force = false)
     {
+        $this->force = $force;
+
         foreach ($directories as $directory) {
             if ($directory['context'] != 'movie') {
                 continue;
@@ -439,6 +453,7 @@ class moviesLibrary extends mediaLibrary
         $genres = [];
         if (is_array($this->movies)) {
             foreach ($this->movies as $movie) {
+
                 foreach ($movie['data']['genres'] as $genre) {
                     if (!isset($genres[$genre['name']])) {
                         $genres[$genre['name']] = [];
@@ -488,7 +503,11 @@ class moviesLibrary extends mediaLibrary
 
     public function getMovieByID($id)
     {
-        $res = connectRedis()->igbget('tmdb.movie.' . $id);
+        if (!$this->force) {
+            $res = connectRedis()->igbget('tmdb.movie.' . $id);
+        } else {
+            $res = false;
+        }
         if ($res === false) {
             $client = getTmbdClient();
             try {

diff --git a/scripts/tmdb.php b/scripts/tmdb.php
new file mode 100644 (file)
index 0000000..d0d8edf
--- /dev/null
+++ b/scripts/tmdb.php
@@ -0,0 +1,6 @@
+<?php
+require_once 'import.php';
+//_getTVShows(true,true);
+//_getMovies(true);
+//_getMediaRecentAdded(true);
+//parseMoviesLibrary();
\ No newline at end of file

diff --git a/servers/domoticz.php b/servers/domoticz.php
index 2f5d1795a3d9f7147a9a5a808788ca87910358f7..2f6e5fcff8ef2d9ea068aabf420b74708826f83b 100644 (file)
--- a/servers/domoticz.php
+++ b/servers/domoticz.php
@@ -12,43 +12,28 @@ ignore_user_abort(true);
 echo 'Run home server domoticz' . "\n";
 
 $redis = connectRedis();
-redisEventListener('domoticz_event','handleDomoticzQueue');
+redisEventListener('domoticz_event', 'handleDomoticzQueue');
 
 function handleDomoticzQueue()
 {
     global $redis;
 
-    $queues = ['domoticz_queue_priority', 'domoticz_queue'];
-
-    foreach ($queues as $q) {
+    while (true) {
+        $q = 'domoticz_queue';
         $queue = $redis->igbget($q);
         if (!is_array($queue)) {
             $queue = [];
             $redis->igbset($q, $queue);
         }
         if (!count($queue)) {
-            continue;
+            echo 'End processing queue' . "\n";
+            break;
         }
 
         $command = array_shift($queue);
+        $redis->igbset($q, $queue);
         echo 'Run command ' . json_encode($command) . "\n";
         runDomoticzCommand($command);
-        doneCommand($q, $command);
         usleep(1000000 * 1.5);
     }
-}
-
-function doneCommand($q, $command)
-{
-    global $redis;
-    $queue = $redis->igbget($q);
-    $res = [];
-    foreach ($queue as $item) {
-        if ($item == $command) {
-            continue;
-        }
-        $res[] = $item;
-    }
-    $redis->igbset($q, $res);
-    echo 'Done command (' . $q . ') : ' . json_encode($command) . "\n";
 }
\ No newline at end of file

diff --git a/servers/insteon.php b/servers/insteon.php
index 39f2533beb795b18a67d577b0f4b4de7210f75ca..ed01b5a4c55b57de4b35beb0aa17f2ab87427274 100644 (file)
--- a/servers/insteon.php
+++ b/servers/insteon.php
@@ -11,40 +11,31 @@ echo 'Run home server insteon' . "\n";
 
 $redis = connectRedis();
 
-redisEventListener('insteon_event','handleInsteonQueue');
+redisEventListener('insteon_event', 'handleInsteonQueue');
 
 function handleInsteonQueue()
 {
     global $redis;
-    $queue = $redis->igbget('insteon_queue');
-    if (!is_array($queue)) {
-        $queue = [];
-        $redis->igbset('insteon_queue', $queue);
-    }
-    if (!count($queue)) {
-        if (rand(1, 25) == 3) {
-            insteonKnock();
+
+    while (true) {
+        $queue = $redis->igbget('insteon_queue');
+        if (!is_array($queue)) {
+            $queue = [];
+            $redis->igbset('insteon_queue', $queue);
         }
-        return 0.1;
-    }
-    $command = array_shift($queue);
-    echo 'Run command ' . $command . "\n";
-    runInsteonCommand($command);
-    doneCommand($command);
-    usleep(1000000 * 0.1);
-}
-
-function doneCommand($command)
-{
-    global $redis;
-    $queue = $redis->igbget('insteon_queue');
-    $res = [];
-    foreach ($queue as $item) {
-        if ($item == $command) {
-            continue;
+
+        if (!count($queue)) {
+            echo 'Queue empty ' . "\n";
+            break;
         }
-        $res[] = $item;
+
+        echo 'Handle Queue : current state ' . json_encode($queue) . "\n";
+
+        $command = array_shift($queue);
+        $redis->igbset('insteon_queue', $queue);
+        echo 'Run command ' . $command . "\n";
+        runInsteonCommand($command);
+        usleep(1000000 * 0.5);
     }
-    $redis->igbset('insteon_queue', $res);
-    echo 'Done command : ' . $command . "\n";
+    echo 'End of handling queue'."\n";
 }
\ No newline at end of file

diff --git a/servers/ssh.php b/servers/ssh.php
index 09c14cc6d86dadc3eb04d087517229a583dbe8a3..9ed18a49119e1a8ca1d863ebb7e5aebdb172cea4 100644 (file)
--- a/servers/ssh.php
+++ b/servers/ssh.php
@@ -10,26 +10,29 @@ ignore_user_abort(true);
 echo 'Run home server ssh' . "\n";
 
 $redis = connectRedis();
-redisEventListener('ssh_event', 'handleSSHQueues');
+redisEventListener('ssh_event', 'handleSSHQueue');
 
 $connections = [];
 
-function handleSSHQueues()
+function handleSSHQueue()
 {
     global $redis;
     $queue_name = 'ssh_queue';
-    $queue = $redis->igbget($queue_name);
-    if (!is_array($queue)) {
-        $queue = [];
+    while (true) {
+        $queue = $redis->igbget($queue_name);
+        if (!is_array($queue)) {
+            $queue = [];
+            $redis->igbset($queue_name, $queue);
+        }
+
+        if (!count($queue)) {
+            echo 'End processing queue' . "\n";
+            break;
+        }
+
+        $command = array_shift($queue);
         $redis->igbset($queue_name, $queue);
+        echo 'Run command ' . json_encode($command) . "\n";
+        sshRunCommand($command['command'], $command['device'], $command['blocking'], $command['sudo']);
     }
-
-    if (!count($queue)) {
-        return;
-    }
-
-    $command = array_shift($queue);
-    $redis->igbset($queue_name, $queue);
-    echo 'Run command ' . json_encode($command) . "\n";
-    sshRunCommand($command['command'], $command['device'], $command['blocking'], $command['sudo']);
 }
\ No newline at end of file