]> _ Git - tortuga-home.git/commitdiff
.
authorVincent <vincent@enhydra.fr>
Mon, 8 Jul 2019 20:49:23 +0000 (22:49 +0200)
committerVincent <vincent@enhydra.fr>
Mon, 8 Jul 2019 20:49:23 +0000 (22:49 +0200)
25 files changed:
.idea/deployment.xml
.idea/home.iml
.idea/php.xml
.idea/webServers.xml [deleted file]
.idea/workspace.xml
composer.json
composer.lock
config/media.php
config/music.php
config/tv.php
scripts/cron/cron.php
scripts/lib/domoticz.php
scripts/lib/insteon.php
scripts/lib/lib.php
scripts/lib/medialibrary.php
scripts/lib/mediarasp.php
scripts/lib/redis.php
scripts/lib/state.php
scripts/lib/tmdb.php
scripts/sections.php
scripts/seen.php
servers/domoticz.php
servers/insteon.php
servers/startdaemon
servers/stopdaemon

index 5ec79597c1f88da1a5d0d39883bb7a0f4d791bab..675857756c5d26662ae050f1e69586bfce4aaae4 100644 (file)
@@ -9,13 +9,6 @@
           </mappings>
         </serverdata>
       </paths>
-      <paths name="home.tortuga.enhydra.fr (project level)">
-        <serverdata>
-          <mappings>
-            <mapping deploy="/" local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
     </serverData>
     <option name="myAutoUpload" value="ALWAYS" />
   </component>
index 81fd18d324cb36168d7eb8428b5dbad46ed38548..fcf00d7f2be2faeb0c34c9d0e3a1a2b15a2a754e 100644 (file)
@@ -16,6 +16,7 @@
       <excludeFolder url="file://$MODULE_DIR$/vendor/kevinrob/guzzle-cache-middleware" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/monolog/monolog" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/php-tmdb/api" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/predis/predis" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/psr/container" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/psr/http-message" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/psr/log" />
index 8c39fd67c2c170725faa7c5f8dc299aa153b37ba..6907af9a22b7538f2b7570bfb58ae10902175c9e 100644 (file)
       <path value="T:/CloudStation/Drive/Works/home/vendor/symfony/contracts" />
       <path value="$PROJECT_DIR$/vendor/symfony/contracts" />
       <path value="$PROJECT_DIR$/vendor/symfony/event-dispatcher-contracts" />
+      <path value="$PROJECT_DIR$/vendor/predis/predis" />
     </include_path>
   </component>
   <component name="PhpProjectSharedConfiguration" php_language_level="7.3" />
diff --git a/.idea/webServers.xml b/.idea/webServers.xml
deleted file mode 100644 (file)
index bf4dc1f..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="WebServers">
-    <option name="servers">
-      <webServer id="b492f0ef-a985-4be7-8764-c09fce0cd62f" name="home.tortuga.enhydra.fr (project level)" url="http://home.tortuga.enhydra.fr">
-        <fileTransfer host="home.tortuga.enhydra.fr" port="22122" rootFolder="/var/www/home" accessType="SFTP">
-          <advancedOptions>
-            <advancedOptions dataProtectionLevel="Private" />
-          </advancedOptions>
-          <option name="port" value="22122" />
-        </fileTransfer>
-      </webServer>
-    </option>
-  </component>
-</project>
\ No newline at end of file
index c6152f3f37ad994a9c3349b466d10be2e64e4b08..975a45af4a77e5c03395eed65c222d9b8e75da5d 100644 (file)
@@ -2,9 +2,31 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="352ce63a-b52a-41a2-979b-becda7920939" name="Default" comment=".">
-      <change afterPath="$PROJECT_DIR$/servers/ssh.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/deployment.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/deployment.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/home.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/home.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/php.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/php.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/webServers.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/composer.json" beforeDir="false" afterPath="$PROJECT_DIR$/composer.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/composer.lock" beforeDir="false" afterPath="$PROJECT_DIR$/composer.lock" 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$/config/tv.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/tv.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/insteon.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/insteon.php" 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$/scripts/lib/medialibrary.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/medialibrary.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/mediarasp.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/mediarasp.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$/scripts/lib/state.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/state.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$/scripts/sections.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/sections.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/seen.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/seen.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/startdaemon" beforeDir="false" afterPath="$PROJECT_DIR$/servers/startdaemon" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/servers/stopdaemon" beforeDir="false" afterPath="$PROJECT_DIR$/servers/stopdaemon" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/scripts/lib/jarvis.php">
+        <entry file="file://$PROJECT_DIR$/servers/insteon.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 relative-caret-position="113">
+              <caret line="13" selection-start-line="13" selection-end-line="14" selection-end-column="37" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/servers/domoticz.php">
+        <entry file="file://$PROJECT_DIR$/servers/startdaemon">
           <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret selection-end-line="19" selection-end-column="1" />
+            <state relative-caret-position="17">
+              <caret line="1" column="43" lean-forward="true" selection-start-line="1" selection-start-column="43" selection-end-line="1" selection-end-column="43" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="jar://$APPLICATION_PLUGINS_DIR$/php/lib/php.jar!/stubs/json/json.php">
+        <entry file="file://$PROJECT_DIR$/servers/stopdaemon">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="68">
-              <caret line="117" column="40" selection-start-line="117" selection-start-column="40" selection-end-line="117" selection-end-column="40" />
+            <state relative-caret-position="34">
+              <caret line="2" column="11" lean-forward="true" selection-start-line="2" selection-start-column="11" selection-end-line="2" selection-end-column="11" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/scripts/jarvis.php">
+        <entry file="file://$PROJECT_DIR$/vendor/predis/predis/src/Client.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="119">
-              <caret line="7" column="15" selection-start-line="7" selection-start-column="15" selection-end-line="7" selection-end-column="15" />
+            <state relative-caret-position="220">
+              <caret line="384" column="20" lean-forward="true" selection-start-line="384" selection-start-column="20" selection-end-line="384" selection-end-column="20" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/tools/jarvis/commands">
+        <entry file="file://$PROJECT_DIR$/config/tv.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="374">
-              <caret line="22" column="15" selection-start-line="22" selection-start-column="15" selection-end-line="22" selection-end-column="15" />
+            <state relative-caret-position="255">
+              <caret line="15" selection-start-line="15" selection-end-line="15" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/servers/ssh.php">
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/servers/domoticz.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="391">
-              <caret line="23" selection-start-line="23" selection-end-line="23" />
+            <state relative-caret-position="594">
+              <caret line="41" column="28" selection-start-line="41" selection-start-column="28" selection-end-line="41" selection-end-column="28" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/composer.json">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/scripts/lib/insteon.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 relative-caret-position="594">
+              <caret line="44" column="4" selection-start-line="44" selection-start-column="4" selection-end-line="44" selection-end-column="52" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/tools/jarvis/console.php">
+        <entry file="file://$PROJECT_DIR$/scripts/lib/redis.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="340">
-              <caret line="20" column="18" selection-start-line="20" selection-start-column="18" selection-end-line="20" selection-end-column="18" />
+            <state relative-caret-position="407">
+              <caret line="46" column="17" selection-start-line="46" selection-start-column="17" selection-end-line="46" selection-end-column="17" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/scripts/remotecmd.php">
+        <entry file="file://$PROJECT_DIR$/scripts/lib/domoticz.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="221">
-              <caret line="13" column="10" selection-start-line="13" selection-start-column="10" selection-end-line="13" selection-end-column="10" />
+            <state relative-caret-position="119">
+              <caret line="7" column="1" lean-forward="true" selection-start-line="7" selection-start-column="1" selection-end-line="7" selection-end-column="1" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/scripts/lib/mediarasp.php">
+        <entry file="file://$PROJECT_DIR$/scripts/cron/cron.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="51">
-              <caret line="175" column="27" selection-start-line="175" selection-start-column="27" selection-end-line="175" selection-end-column="27" />
+            <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>
           </provider>
         </entry>
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>cronWeather</find>
-      <find>deshumidificateur</find>
-      <find>hide</find>
       <find>#mask</find>
       <find>hideMaskTimeout</find>
       <find>bureau/plasma/on</find>
       <find>domoticzCmd</find>
       <find>domoticz</find>
       <find>jarvis</find>
+      <find>connectRedis()</find>
+      <find>setex(</find>
+      <find>set_time_limit</find>
     </findStrings>
     <replaceStrings>
       <replace />
       <dir>Y:\Works\home</dir>
       <dir>D:\CloudStation\Works\home</dir>
       <dir>T:\CloudStation\Drive\Works\home</dir>
+      <dir>T:\Drive\Works\home\scripts</dir>
       <dir>T:\Drive\Works\home</dir>
     </dirStrings>
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/scripts/ecomode.php" />
-        <option value="$PROJECT_DIR$/scripts/pop.php" />
-        <option value="$PROJECT_DIR$/scripts/lib/traffic.php" />
-        <option value="$PROJECT_DIR$/scripts/lib/heartbeats.php" />
-        <option value="$PROJECT_DIR$/scripts/lib/squeezebox.php" />
         <option value="$PROJECT_DIR$/scripts/domoticz_device_event.php" />
         <option value="$PROJECT_DIR$/js/home.js" />
         <option value="$PROJECT_DIR$/config/bureau.php" />
         <option value="$PROJECT_DIR$/config/bureausun.php" />
         <option value="$PROJECT_DIR$/scripts/lib/http.php" />
         <option value="$PROJECT_DIR$/style/style.less" />
-        <option value="$PROJECT_DIR$/scripts/seen.php" />
         <option value="$PROJECT_DIR$/scripts/transcode.php" />
-        <option value="$PROJECT_DIR$/scripts/lib/state.php" />
         <option value="$PROJECT_DIR$/gradient.php" />
-        <option value="$PROJECT_DIR$/servers/stopdaemon" />
-        <option value="$PROJECT_DIR$/servers/startdaemon" />
-        <option value="$PROJECT_DIR$/config/tv.php" />
         <option value="$PROJECT_DIR$/servers/startserver" />
         <option value="$PROJECT_DIR$/servers/stopserver" />
         <option value="$PROJECT_DIR$/.gitignore" />
-        <option value="$PROJECT_DIR$/scripts/cron/cron.php" />
         <option value="$PROJECT_DIR$/scripts/lib/ecomode.php" />
         <option value="$PROJECT_DIR$/scripts/lib/harmony.php" />
-        <option value="$PROJECT_DIR$/scripts/lib/lib.php" />
         <option value="$PROJECT_DIR$/scripts/raspberrycast.php" />
         <option value="$PROJECT_DIR$/scripts/lib/remoteinfos.php" />
-        <option value="$PROJECT_DIR$/scripts/lib/medialibrary.php" />
-        <option value="$PROJECT_DIR$/servers/insteon.php" />
-        <option value="$PROJECT_DIR$/scripts/lib/tmdb.php" />
-        <option value="$PROJECT_DIR$/scripts/lib/domoticz.php" />
         <option value="$PROJECT_DIR$/scripts/lib/scenes.php" />
-        <option value="$PROJECT_DIR$/servers/domoticz.php" />
         <option value="$PROJECT_DIR$/config/global.php" />
         <option value="$PROJECT_DIR$/scripts/jarvis.php" />
         <option value="$PROJECT_DIR$/scripts/lib/jarvis.php" />
         <option value="$PROJECT_DIR$/tools/jarvis/console.php" />
-        <option value="$PROJECT_DIR$/scripts/lib/mediarasp.php" />
         <option value="$PROJECT_DIR$/tools/jarvis/commands" />
         <option value="$PROJECT_DIR$/servers/ssh.php" />
         <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/lib.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$/scripts/lib/insteon.php" />
+        <option value="$PROJECT_DIR$/config/tv.php" />
+        <option value="$PROJECT_DIR$/scripts/lib/redis.php" />
+        <option value="$PROJECT_DIR$/servers/insteon.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" />
       </list>
     </option>
   </component>
       <path value="T:/CloudStation/Drive/Works/home/vendor/symfony/contracts" />
       <path value="$PROJECT_DIR$/vendor/symfony/contracts" />
       <path value="$PROJECT_DIR$/vendor/symfony/event-dispatcher-contracts" />
+      <path value="$PROJECT_DIR$/vendor/predis/predis" />
     </include_path>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="-4" />
-    <option name="y" value="-4" />
-    <option name="width" value="1288" />
-    <option name="height" value="548" />
+    <option name="x" value="121" />
+    <option name="y" value="79" />
+    <option name="width" value="1436" />
+    <option name="height" value="771" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true">
     <OptionsSetting value="false" id="Update" />
               <item name="home" type="b2602c69:ProjectViewProjectNode" />
               <item name="home" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="home" type="b2602c69:ProjectViewProjectNode" />
+              <item name="home" type="462c0819:PsiDirectoryNode" />
+              <item name="config" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="home" type="b2602c69:ProjectViewProjectNode" />
               <item name="home" type="462c0819:PsiDirectoryNode" />
               <item name="scripts" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="home" type="b2602c69:ProjectViewProjectNode" />
+              <item name="home" type="462c0819:PsiDirectoryNode" />
+              <item name="scripts" type="462c0819:PsiDirectoryNode" />
+              <item name="cron" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="home" type="b2602c69:ProjectViewProjectNode" />
+              <item name="home" type="462c0819:PsiDirectoryNode" />
+              <item name="scripts" type="462c0819:PsiDirectoryNode" />
+              <item name="lib" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="home" type="b2602c69:ProjectViewProjectNode" />
               <item name="home" type="462c0819:PsiDirectoryNode" />
       <workItem from="1562139612183" duration="879000" />
       <workItem from="1562187458066" duration="10928000" />
       <workItem from="1562315270549" duration="3917000" />
-      <workItem from="1562430904715" duration="9608000" />
-    </task>
-    <task id="LOCAL-00142" summary=".">
-      <created>1550049014767</created>
-      <option name="number" value="00142" />
-      <option name="presentableId" value="LOCAL-00142" />
-      <option name="project" value="LOCAL" />
-      <updated>1550049014767</updated>
+      <workItem from="1562430904715" duration="18310000" />
     </task>
     <task id="LOCAL-00143" summary=".">
       <created>1550049045334</created>
       <option name="project" value="LOCAL" />
       <updated>1562480651361</updated>
     </task>
-    <option name="localTasksCounter" value="191" />
+    <task id="LOCAL-00191" summary=".">
+      <created>1562482720839</created>
+      <option name="number" value="00191" />
+      <option name="presentableId" value="LOCAL-00191" />
+      <option name="project" value="LOCAL" />
+      <updated>1562482720839</updated>
+    </task>
+    <option name="localTasksCounter" value="192" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1246168000" />
+    <option name="totallyTimeSpent" value="1254870000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-4" y="-4" width="2576" height="1056" extended-state="6" />
-    <editor active="true" />
+    <frame x="-8" y="-8" width="2576" height="1056" extended-state="6" />
     <layout>
       <window_info id="Nl-Palette" order="0" />
       <window_info id="Image Layers" order="1" />
       <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 content_ui="combo" id="Project" order="6" sideWeight="0.49456522" visible="true" weight="0.21979332" />
+      <window_info active="true" content_ui="combo" id="Project" order="6" sideWeight="0.49456522" visible="true" weight="0.21979332" />
       <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" sideWeight="0.48251194" weight="0.30444205" />
-      <window_info active="true" anchor="bottom" id="Run" order="2" sideWeight="0.4674086" visible="true" weight="0.3217768" />
+      <window_info anchor="bottom" id="Find" order="1" sideWeight="0.48251194" visible="true" 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" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <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.485623" visible="true" weight="0.0918124" />
+      <window_info anchor="right" id="Remote Host" order="10" sideWeight="0.48598132" visible="true" weight="0.0918124" />
       <window_info anchor="right" id="SciView" order="11" weight="0.3298887" />
-      <window_info anchor="right" id="Structure" order="12" sideWeight="0.514377" side_tool="true" visible="true" weight="0.0918124" />
+      <window_info anchor="right" id="Structure" order="12" sideWeight="0.5140187" side_tool="true" visible="true" weight="0.0918124" />
       <window_info anchor="right" id="Data View" order="13" />
       <window_info anchor="right" id="Maven" order="14" />
     </layout>
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="jar://$APPLICATION_PLUGINS_DIR$/php/lib/php.jar!/stubs/redis/Redis.php">
+    <entry file="file://$PROJECT_DIR$/servers/stopdaemon.php" />
+    <entry file="file://$PROJECT_DIR$/servers/_startdaemon.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="137">
-          <caret line="342" column="7" lean-forward="true" selection-start-line="342" selection-start-column="7" selection-end-line="342" selection-end-column="7" />
+        <state relative-caret-position="85">
+          <caret line="5" column="6" selection-start-line="5" selection-start-column="1" selection-end-line="5" selection-end-column="6" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/transcode.php">
+    <entry file="file://$PROJECT_DIR$/servers/stopserver">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="34">
-          <caret line="2" column="9" selection-start-line="2" selection-start-column="9" selection-end-line="2" selection-end-column="9" />
+        <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$/scripts/import.php">
+    <entry file="file://$PROJECT_DIR$/servers/eventsource.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="221">
-          <caret line="13" selection-start-line="13" selection-end-line="13" />
+        <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$/scripts/environment.php">
+    <entry file="file://$PROJECT_DIR$/.gitignore">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="34">
-          <caret line="2" column="27" selection-start-line="2" selection-start-column="27" selection-end-line="2" selection-end-column="27" />
+        <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/squeezebox.php">
+    <entry file="file://$PROJECT_DIR$/scripts/lib/harmony.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret selection-end-line="2" selection-end-column="40" />
+        <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/lib/heartbeats.php">
+    <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="9" selection-start-line="9" selection-start-column="9" selection-end-line="9" selection-end-column="9" />
+          <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/squeeze.php">
+    <entry file="file://$PROJECT_DIR$/scripts/lib/ecomode.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="5" selection-start-column="5" selection-end-column="5" />
+        <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/lib/state.php">
+    <entry file="file://$PROJECT_DIR$/scripts/harmonyactivity.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="102">
-          <caret line="6" column="5" selection-start-line="6" selection-start-column="5" selection-end-line="6" selection-end-column="5" />
+        <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$/gradient.php">
+    <entry file="file://$PROJECT_DIR$/scripts/harmony.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="37">
-          <caret line="22" column="31" selection-start-line="22" selection-start-column="31" selection-end-line="22" selection-end-column="31" />
+        <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$/servers/stopdaemon.php" />
-    <entry file="file://$PROJECT_DIR$/servers/_startdaemon.php">
+    <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="85">
-          <caret line="5" column="6" selection-start-line="5" selection-start-column="1" selection-end-line="5" selection-end-column="6" />
+        <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$/servers/startdaemon">
+    <entry file="file://$PROJECT_DIR$/scripts/raspberrycast.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="17">
-          <caret line="1" column="142" lean-forward="true" selection-start-line="1" selection-start-column="142" selection-end-line="1" selection-end-column="142" />
+        <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$/servers/stopdaemon">
+    <entry file="file://$PROJECT_DIR$/index.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 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$/servers/startserver">
+    <entry file="file://$PROJECT_DIR$/scripts/lib/scenes.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="34">
-          <caret line="2" column="64" selection-start-line="2" selection-start-column="64" selection-end-line="2" selection-end-column="64" />
+        <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$/servers/stopserver">
+    <entry file="file://$PROJECT_DIR$/scripts/insteon.php">
       <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" />
+          <caret line="3" column="8" selection-start-line="3" selection-start-column="8" selection-end-line="3" selection-end-column="8" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/servers/eventsource.php">
+    <entry file="file://$PROJECT_DIR$/scripts/domoticz_device_event.php">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/scripts/bedroomlight.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 relative-caret-position="119">
+          <caret line="7" column="8" selection-start-line="7" selection-start-column="8" selection-end-line="7" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/config/tv.php">
+    <entry file="file://$PROJECT_DIR$/config/global.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="663">
-          <caret line="39" column="55" selection-start-line="39" selection-start-column="55" selection-end-line="39" selection-end-column="55" />
+        <state relative-caret-position="357">
+          <caret line="36" column="58" selection-start-line="36" selection-start-column="58" selection-end-line="36" selection-end-column="58" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/.gitignore">
+    <entry file="file://$PROJECT_DIR$/tools/jarvis/events">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/scripts/jarvis.php">
       <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 relative-caret-position="119">
+          <caret line="7" column="15" selection-start-line="7" selection-start-column="15" selection-end-line="7" selection-end-column="15" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/servers/cron.php">
+    <entry file="jar://$APPLICATION_PLUGINS_DIR$/php/lib/php.jar!/stubs/json/json.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="51">
-          <caret line="3" column="31" selection-start-line="3" selection-start-column="31" selection-end-line="3" selection-end-column="31" />
+        <state relative-caret-position="68">
+          <caret line="117" column="40" selection-start-line="117" selection-start-column="40" selection-end-line="117" selection-end-column="40" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/cron/cron.php">
+    <entry file="file://$PROJECT_DIR$/scripts/lib/jarvis.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="425">
-          <caret line="25" column="27" selection-start-line="25" selection-start-column="27" selection-end-line="25" selection-end-column="27" />
+        <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/harmony.php">
+    <entry file="file://$PROJECT_DIR$/tools/jarvis/console.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 relative-caret-position="340">
+          <caret line="20" column="18" selection-start-line="20" selection-start-column="18" selection-end-line="20" selection-end-column="18" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/lib/lib.php">
+    <entry file="file://$PROJECT_DIR$/scripts/remotecmd.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6409">
-          <caret line="377" column="26" selection-start-line="377" selection-start-column="26" selection-end-line="377" selection-end-column="26" />
+        <state relative-caret-position="221">
+          <caret line="13" column="10" selection-start-line="13" selection-start-column="10" selection-end-line="13" selection-end-column="10" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/mediarasp.php">
+    <entry file="file://$PROJECT_DIR$/tools/jarvis/commands">
       <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 relative-caret-position="374">
+          <caret line="22" column="15" selection-start-line="22" selection-start-column="15" selection-end-line="22" selection-end-column="15" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/lib/ecomode.php">
+    <entry file="file://$PROJECT_DIR$/servers/ssh.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 relative-caret-position="391">
+          <caret line="23" selection-start-line="23" selection-end-line="23" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/harmonyactivity.php">
+    <entry file="file://$PROJECT_DIR$/composer.json">
       <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 relative-caret-position="170">
+          <caret line="10" column="23" selection-start-line="10" selection-start-column="23" selection-end-line="10" selection-end-column="23" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/harmony.php">
+    <entry file="file://$PROJECT_DIR$/config/media.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 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$/scripts/remoteinfos.php">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/lib/remoteinfos.php">
+    <entry file="file://$PROJECT_DIR$/config/music.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 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/raspberrycast.php">
+    <entry file="file://$PROJECT_DIR$/scripts/clearcache.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 relative-caret-position="34">
+          <caret line="2" selection-start-line="2" selection-end-line="2" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/index.php">
+    <entry file="file://$PROJECT_DIR$/scripts/sections.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" />
+          <caret line="5" column="24" selection-start-line="5" selection-start-column="24" selection-end-line="5" selection-end-column="24" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/lib/scenes.php">
+    <entry file="file://$PROJECT_DIR$/scripts/seen.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 relative-caret-position="34">
+          <caret line="2" column="27" selection-start-line="2" selection-start-column="27" selection-end-line="2" selection-end-column="27" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/servers/insteon.php">
+    <entry file="file://$PROJECT_DIR$/scripts/lib/lib.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="153">
-          <caret line="9" column="38" selection-start-line="9" selection-start-column="38" selection-end-line="9" selection-end-column="38" />
+        <state relative-caret-position="205">
+          <caret line="176" column="23" selection-start-line="176" selection-start-column="23" selection-end-line="176" selection-end-column="23" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/insteon.php">
+    <entry file="file://$PROJECT_DIR$/scripts/lib/mediarasp.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="51">
-          <caret line="3" column="8" selection-start-line="3" selection-start-column="8" selection-end-line="3" selection-end-column="8" />
+        <state relative-caret-position="198">
+          <caret line="387" column="27" selection-start-line="387" selection-start-column="27" selection-end-line="387" selection-end-column="27" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/lib/insteon.php">
+    <entry file="file://$PROJECT_DIR$/scripts/lib/state.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="595">
-          <caret line="35" selection-start-line="35" selection-end-line="44" selection-end-column="1" />
+        <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/domoticz_device_event.php">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/lib/domoticz.php">
+    <entry file="file://$PROJECT_DIR$/scripts/lib/medialibrary.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="14" column="9" selection-start-line="14" selection-start-column="9" selection-end-line="14" selection-end-column="9" />
+        <state relative-caret-position="170">
+          <caret line="10" column="21" selection-start-line="10" selection-start-column="21" selection-end-line="10" selection-end-column="21" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/bedroomlight.php">
+    <entry file="file://$PROJECT_DIR$/scripts/lib/tmdb.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="119">
-          <caret line="7" column="8" selection-start-line="7" selection-start-column="8" selection-end-line="7" selection-end-column="13" />
+        <state relative-caret-position="2136">
+          <caret line="495" column="75" selection-start-line="495" selection-start-column="75" selection-end-line="495" selection-end-column="75" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/lib/medialibrary.php">
+    <entry file="file://$PROJECT_DIR$/servers/cron.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2567">
-          <caret line="151" column="1" selection-start-line="151" selection-start-column="1" selection-end-line="151" selection-end-column="1" />
+        <state relative-caret-position="85">
+          <caret line="5" column="14" selection-start-line="5" selection-end-line="5" selection-end-column="14" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/lib/tmdb.php">
+    <entry file="file://$PROJECT_DIR$/scripts/import.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="7616">
-          <caret line="448" column="9" selection-start-line="448" selection-start-column="9" selection-end-line="448" selection-end-column="9" />
+        <state relative-caret-position="153">
+          <caret line="9" column="28" lean-forward="true" selection-start-line="9" selection-start-column="28" selection-end-line="9" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/config/global.php">
+    <entry file="file://$PROJECT_DIR$/servers/startserver">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="357">
-          <caret line="36" column="58" selection-start-line="36" selection-start-column="58" selection-end-line="36" selection-end-column="58" />
+        <state relative-caret-position="34">
+          <caret line="2" column="64" selection-start-line="2" selection-start-column="64" selection-end-line="2" selection-end-column="64" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/tools/jarvis/events">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/jarvis.php">
+    <entry file="file://$PROJECT_DIR$/config/tv.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="119">
-          <caret line="7" column="15" selection-start-line="7" selection-start-column="15" selection-end-line="7" selection-end-column="15" />
+        <state relative-caret-position="255">
+          <caret line="15" selection-start-line="15" selection-end-line="15" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$APPLICATION_PLUGINS_DIR$/php/lib/php.jar!/stubs/json/json.php">
+    <entry file="file://$PROJECT_DIR$/scripts/lib/insteon.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="68">
-          <caret line="117" column="40" selection-start-line="117" selection-start-column="40" selection-end-line="117" selection-end-column="40" />
+        <state relative-caret-position="594">
+          <caret line="44" column="4" selection-start-line="44" selection-start-column="4" selection-end-line="44" selection-end-column="52" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/lib/jarvis.php">
+    <entry file="file://$PROJECT_DIR$/vendor/predis/predis/src/Client.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 relative-caret-position="220">
+          <caret line="384" column="20" lean-forward="true" selection-start-line="384" selection-start-column="20" selection-end-line="384" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/tools/jarvis/console.php">
+    <entry file="file://$PROJECT_DIR$/scripts/cron/cron.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="340">
-          <caret line="20" column="18" selection-start-line="20" selection-start-column="18" selection-end-line="20" selection-end-column="18" />
+        <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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/remotecmd.php">
+    <entry file="file://$PROJECT_DIR$/scripts/lib/redis.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="221">
-          <caret line="13" column="10" selection-start-line="13" selection-start-column="10" selection-end-line="13" selection-end-column="10" />
+        <state relative-caret-position="407">
+          <caret line="46" column="17" selection-start-line="46" selection-start-column="17" selection-end-line="46" selection-end-column="17" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/lib/mediarasp.php">
+    <entry file="file://$PROJECT_DIR$/servers/startdaemon">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="51">
-          <caret line="175" column="27" selection-start-line="175" selection-start-column="27" selection-end-line="175" selection-end-column="27" />
+        <state relative-caret-position="17">
+          <caret line="1" column="43" lean-forward="true" selection-start-line="1" selection-start-column="43" selection-end-line="1" selection-end-column="43" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/tools/jarvis/commands">
+    <entry file="file://$PROJECT_DIR$/servers/stopdaemon">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="22" column="15" selection-start-line="22" selection-start-column="15" selection-end-line="22" selection-end-column="15" />
+        <state relative-caret-position="34">
+          <caret line="2" column="11" lean-forward="true" selection-start-line="2" selection-start-column="11" selection-end-line="2" selection-end-column="11" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/servers/domoticz.php">
+    <entry file="file://$PROJECT_DIR$/scripts/lib/domoticz.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret selection-end-line="19" selection-end-column="1" />
+        <state relative-caret-position="119">
+          <caret line="7" column="1" lean-forward="true" selection-start-line="7" selection-start-column="1" selection-end-line="7" selection-end-column="1" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/servers/ssh.php">
+    <entry file="file://$PROJECT_DIR$/servers/insteon.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="391">
-          <caret line="23" selection-start-line="23" selection-end-line="23" />
+        <state relative-caret-position="113">
+          <caret line="13" selection-start-line="13" selection-end-line="14" selection-end-column="37" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/composer.json">
+    <entry file="file://$PROJECT_DIR$/servers/domoticz.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 relative-caret-position="594">
+          <caret line="41" column="28" selection-start-line="41" selection-start-column="28" selection-end-line="41" selection-end-column="28" />
         </state>
       </provider>
     </entry>
index cbe397a96b996e6b6d8cac397dd5fe8344f0528a..46af28978c417f7a1ad6d281f146c320361f36ae 100644 (file)
@@ -6,18 +6,19 @@
     }
   },
   "require": {
-    "datto/json-rpc": "^4.0.2",
-    "datto/json-rpc-http": "^3.2.0",
+    "datto/json-rpc": "^4.0.4",
+    "datto/json-rpc-http": "^3.2.1",
     "sqmk/phue": "^v1.6.1",
     "zendframework/zend-http": "^2.7.0",
     "alphayax/freebox_api_php": "^1.2.4",
     "guzzlehttp/guzzle": "^6.3.3",
     "php-tmdb/api": "^2.1.15",
-    "zendframework/zend-i18n": "^.10.x-dev",
-    "zendframework/zend-i18n-resources": "^2.7.x-dev",
-    "zendframework/zend-db": "^2.9.3",
     "zf1/zend-locale": "^1.12.20",
     "hoa/eventsource": "^3.17.01.10",
-    "woojean/php-redis-queue": "^1.0.0"
+    "woojean/php-redis-queue": "^1.0.0",
+    "predis/predis": "^1.1",
+    "zendframework/zend-db": "^2.10",
+    "zendframework/zend-i18n": "^2.9",
+    "zendframework/zend-i18n-resources": "^2.6"
   }
 }
index e55117326925c47f3e66b9d7f702b6e3fd1219e3..b09ebc63a5d74d097edecd9812f9c0f23415a436 100644 (file)
@@ -4,25 +4,26 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "9758fb71f25ec0e252ac0e49932d6fbd",
+    "content-hash": "9a9272d0b5f0d93af068be64ce3985f1",
     "packages": [
         {
             "name": "alphayax/freebox_api_php",
-            "version": "1.2.4",
+            "version": "1.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/alphayax/freebox_api_php.git",
-                "reference": "550a5f864aee3cc726b8c1a1fc2efe712ac74851"
+                "reference": "824881bd65203b5a69ac784545509f9fbf7ca821"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/alphayax/freebox_api_php/zipball/550a5f864aee3cc726b8c1a1fc2efe712ac74851",
-                "reference": "550a5f864aee3cc726b8c1a1fc2efe712ac74851",
+                "url": "https://api.github.com/repos/alphayax/freebox_api_php/zipball/824881bd65203b5a69ac784545509f9fbf7ca821",
+                "reference": "824881bd65203b5a69ac784545509f9fbf7ca821",
                 "shasum": ""
             },
             "require": {
                 "alphayax/rest": "^1.1.2",
                 "ext-curl": "*",
+                "guzzlehttp/guzzle": "~6.0",
                 "monolog/monolog": "^1.9.1",
                 "php": ">=5.5.0"
             },
             ],
             "description": "API PHP pour la Freebox",
             "keywords": [
+                "Freebox delta",
                 "Freebox revolution",
                 "api",
                 "download",
                 "freebox",
                 "rest"
             ],
-            "time": "2016-09-18T12:39:25+00:00"
+            "time": "2019-06-08T18:33:15+00:00"
         },
         {
             "name": "alphayax/rest",
         },
         {
             "name": "datto/json-rpc",
-            "version": "4.0.2",
+            "version": "4.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/datto/php-json-rpc.git",
-                "reference": "35b0d30979d229ae8991e60e260daa7407f781b4"
+                "reference": "0f4b4e574d83ecda2cd0819afddc3003f923f804"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/datto/php-json-rpc/zipball/35b0d30979d229ae8991e60e260daa7407f781b4",
-                "reference": "35b0d30979d229ae8991e60e260daa7407f781b4",
+                "url": "https://api.github.com/repos/datto/php-json-rpc/zipball/0f4b4e574d83ecda2cd0819afddc3003f923f804",
+                "reference": "0f4b4e574d83ecda2cd0819afddc3003f923f804",
                 "shasum": ""
             },
             "require": {
                 "php-json-rpc",
                 "rpc"
             ],
-            "time": "2016-02-29T20:08:22+00:00"
+            "time": "2017-09-07T03:13:57+00:00"
         },
         {
             "name": "datto/json-rpc-http",
-            "version": "3.2.0",
+            "version": "3.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/datto/php-json-rpc-http.git",
-                "reference": "1646acbf7b4f838a1e246929135f48ba0e470fe1"
+                "reference": "e53e3bd597f0bddaa95b0c577385a5f8d6444543"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/datto/php-json-rpc-http/zipball/1646acbf7b4f838a1e246929135f48ba0e470fe1",
-                "reference": "1646acbf7b4f838a1e246929135f48ba0e470fe1",
+                "url": "https://api.github.com/repos/datto/php-json-rpc-http/zipball/e53e3bd597f0bddaa95b0c577385a5f8d6444543",
+                "reference": "e53e3bd597f0bddaa95b0c577385a5f8d6444543",
                 "shasum": ""
             },
             "require": {
                 "rpc",
                 "server"
             ],
-            "time": "2017-04-20T21:09:58+00:00"
+            "time": "2017-09-12T01:08:04+00:00"
         },
         {
             "name": "doctrine/cache",
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "1.5.2",
+            "version": "1.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "9f83dded91781a01c63574e387eaa769be769115"
+                "reference": "239400de7a173fe9901b9ac7c06497751f00727a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/9f83dded91781a01c63574e387eaa769be769115",
-                "reference": "9f83dded91781a01c63574e387eaa769be769115",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/239400de7a173fe9901b9ac7c06497751f00727a",
+                "reference": "239400de7a173fe9901b9ac7c06497751f00727a",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.4.0",
                 "psr/http-message": "~1.0",
-                "ralouphie/getallheaders": "^2.0.5"
+                "ralouphie/getallheaders": "^2.0.5 || ^3.0.0"
             },
             "provide": {
                 "psr/http-message-implementation": "1.0"
             },
             "require-dev": {
+                "ext-zlib": "*",
                 "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8"
             },
+            "suggest": {
+                "zendframework/zend-httphandlerrunner": "Emit PSR-7 responses"
+            },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.5-dev"
+                    "dev-master": "1.6-dev"
                 }
             },
             "autoload": {
                 "uri",
                 "url"
             ],
-            "time": "2018-12-04T20:46:45+00:00"
+            "time": "2019-07-01T23:21:34+00:00"
         },
         {
             "name": "hoa/consistency",
         },
         {
             "name": "php-tmdb/api",
-            "version": "v2.1.15",
+            "version": "2.1.16",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-tmdb/api.git",
-                "reference": "25bf656d0f9220f962221091e7cb3561d70d7b7e"
+                "reference": "53925e50c0541b20a24f4cfc89b253b251a236c7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-tmdb/api/zipball/25bf656d0f9220f962221091e7cb3561d70d7b7e",
-                "reference": "25bf656d0f9220f962221091e7cb3561d70d7b7e",
+                "url": "https://api.github.com/repos/php-tmdb/api/zipball/53925e50c0541b20a24f4cfc89b253b251a236c7",
+                "reference": "53925e50c0541b20a24f4cfc89b253b251a236c7",
                 "shasum": ""
             },
             "require": {
                 "tvdb",
                 "wrapper"
             ],
-            "time": "2018-05-30T15:34:51+00:00"
+            "time": "2018-11-28T20:35:27+00:00"
+        },
+        {
+            "name": "predis/predis",
+            "version": "v1.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/nrk/predis.git",
+                "reference": "f0210e38881631afeafb56ab43405a92cafd9fd1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/nrk/predis/zipball/f0210e38881631afeafb56ab43405a92cafd9fd1",
+                "reference": "f0210e38881631afeafb56ab43405a92cafd9fd1",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.8"
+            },
+            "suggest": {
+                "ext-curl": "Allows access to Webdis when paired with phpiredis",
+                "ext-phpiredis": "Allows faster serialization and deserialization of the Redis protocol"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Predis\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Daniele Alessandri",
+                    "email": "suppakilla@gmail.com",
+                    "homepage": "http://clorophilla.net"
+                }
+            ],
+            "description": "Flexible and feature-complete Redis client for PHP and HHVM",
+            "homepage": "http://github.com/nrk/predis",
+            "keywords": [
+                "nosql",
+                "predis",
+                "redis"
+            ],
+            "time": "2016-06-16T16:22:20+00:00"
         },
         {
             "name": "psr/container",
         },
         {
             "name": "ralouphie/getallheaders",
-            "version": "2.0.5",
+            "version": "3.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ralouphie/getallheaders.git",
-                "reference": "5601c8a83fbba7ef674a7369456d12f1e0d0eafa"
+                "reference": "120b605dfeb996808c31b6477290a714d356e822"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/5601c8a83fbba7ef674a7369456d12f1e0d0eafa",
-                "reference": "5601c8a83fbba7ef674a7369456d12f1e0d0eafa",
+                "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822",
+                "reference": "120b605dfeb996808c31b6477290a714d356e822",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3"
+                "php": ">=5.6"
             },
             "require-dev": {
-                "phpunit/phpunit": "~3.7.0",
-                "satooshi/php-coveralls": ">=1.0"
+                "php-coveralls/php-coveralls": "^2.1",
+                "phpunit/phpunit": "^5 || ^6.5"
             },
             "type": "library",
             "autoload": {
                 }
             ],
             "description": "A polyfill for getallheaders.",
-            "time": "2016-02-11T07:05:27+00:00"
+            "time": "2019-03-08T08:55:37+00:00"
         },
         {
             "name": "rtheunissen/guzzle-log-middleware",
         },
         {
             "name": "sqmk/phue",
-            "version": "v1.6.1",
+            "version": "v1.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sqmk/Phue.git",
-                "reference": "e668f9b8bef04a73fd50178c83f15d0b87de9a66"
+                "reference": "78c7e94578d0fefe5378075bd52c23aff35a4ad3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sqmk/Phue/zipball/e668f9b8bef04a73fd50178c83f15d0b87de9a66",
-                "reference": "e668f9b8bef04a73fd50178c83f15d0b87de9a66",
+                "url": "https://api.github.com/repos/sqmk/Phue/zipball/78c7e94578d0fefe5378075bd52c23aff35a4ad3",
+                "reference": "78c7e94578d0fefe5378075bd52c23aff35a4ad3",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0"
+                "php": ">=5.6.0"
             },
             "require-dev": {
-                "mockery/mockery": "0.8.0",
-                "phpunit/phpunit": "3.7.25",
-                "squizlabs/php_codesniffer": "1.4.6"
+                "mockery/mockery": "1.0.0",
+                "phpunit/phpunit": "5.7.25",
+                "squizlabs/php_codesniffer": "3.1.1"
             },
             "suggest": {
                 "ext-curl": "Allows usage of cURL transport adapter"
                 "philips",
                 "phue"
             ],
-            "time": "2016-11-16T19:50:27+00:00"
+            "time": "2017-12-01T21:56:14+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v4.3.1",
+            "version": "v4.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "4e6c670af81c4fb0b6c08b035530a9915d0b691f"
+                "reference": "d257021c1ab28d48d24a16de79dfab445ce93398"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/4e6c670af81c4fb0b6c08b035530a9915d0b691f",
-                "reference": "4e6c670af81c4fb0b6c08b035530a9915d0b691f",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/d257021c1ab28d48d24a16de79dfab445ce93398",
+                "reference": "d257021c1ab28d48d24a16de79dfab445ce93398",
                 "shasum": ""
             },
             "require": {
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "https://symfony.com",
-            "time": "2019-05-30T16:10:05+00:00"
+            "time": "2019-06-13T11:03:18+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
         },
         {
             "name": "symfony/options-resolver",
-            "version": "v4.3.1",
+            "version": "v4.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "914e0edcb7cd0c9f494bc023b1d47534f4542332"
+                "reference": "40762ead607c8f792ee4516881369ffa553fee6f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/914e0edcb7cd0c9f494bc023b1d47534f4542332",
-                "reference": "914e0edcb7cd0c9f494bc023b1d47534f4542332",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/40762ead607c8f792ee4516881369ffa553fee6f",
+                "reference": "40762ead607c8f792ee4516881369ffa553fee6f",
                 "shasum": ""
             },
             "require": {
                 "configuration",
                 "options"
             ],
-            "time": "2019-05-10T05:38:46+00:00"
+            "time": "2019-06-13T11:01:17+00:00"
         },
         {
             "name": "woojean/php-redis-queue",
         },
         {
             "name": "zendframework/zend-db",
-            "version": "2.9.3",
+            "version": "2.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-db.git",
-                "reference": "5b4f2c42f94c9f7f4b2f456a0ebe459fab12b3d9"
+                "reference": "77022f06f6ffd384fa86d22ab8d8bbdb925a1e8e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-db/zipball/5b4f2c42f94c9f7f4b2f456a0ebe459fab12b3d9",
-                "reference": "5b4f2c42f94c9f7f4b2f456a0ebe459fab12b3d9",
+                "url": "https://api.github.com/repos/zendframework/zend-db/zipball/77022f06f6ffd384fa86d22ab8d8bbdb925a1e8e",
+                "reference": "77022f06f6ffd384fa86d22ab8d8bbdb925a1e8e",
                 "shasum": ""
             },
             "require": {
                 "phpunit/phpunit": "^5.7.25 || ^6.4.4",
                 "zendframework/zend-coding-standard": "~1.0.0",
                 "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
-                "zendframework/zend-hydrator": "^1.1 || ^2.1",
+                "zendframework/zend-hydrator": "^1.1 || ^2.1 || ^3.0",
                 "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
             },
             "suggest": {
                 "db",
                 "zf"
             ],
-            "time": "2018-04-09T13:21:36+00:00"
+            "time": "2019-02-25T11:37:45+00:00"
         },
         {
             "name": "zendframework/zend-escaper",
         },
         {
             "name": "zendframework/zend-http",
-            "version": "2.7.0",
+            "version": "2.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-http.git",
-                "reference": "78aa510c0ea64bfb2aa234f50c4f232c9531acfa"
+                "reference": "4b4983178693a8fdda53b0bbee58552e2d2b1ac0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-http/zipball/78aa510c0ea64bfb2aa234f50c4f232c9531acfa",
-                "reference": "78aa510c0ea64bfb2aa234f50c4f232c9531acfa",
+                "url": "https://api.github.com/repos/zendframework/zend-http/zipball/4b4983178693a8fdda53b0bbee58552e2d2b1ac0",
+                "reference": "4b4983178693a8fdda53b0bbee58552e2d2b1ac0",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.6 || ^7.0",
                 "zendframework/zend-loader": "^2.5.1",
-                "zendframework/zend-stdlib": "^3.1 || ^2.7.7",
+                "zendframework/zend-stdlib": "^3.2.1",
                 "zendframework/zend-uri": "^2.5.2",
                 "zendframework/zend-validator": "^2.10.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.4.1 || ^5.7.15",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.3",
                 "zendframework/zend-coding-standard": "~1.0.0",
                 "zendframework/zend-config": "^3.1 || ^2.6"
             },
+            "suggest": {
+                "paragonie/certainty": "For automated management of cacert.pem"
+            },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.7-dev",
-                    "dev-develop": "2.8-dev"
+                    "dev-master": "2.10.x-dev",
+                    "dev-develop": "2.11.x-dev"
                 }
             },
             "autoload": {
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "provides an easy interface for performing Hyper-Text Transfer Protocol (HTTP) requests",
-            "homepage": "https://github.com/zendframework/zend-http",
+            "description": "Provides an easy interface for performing Hyper-Text Transfer Protocol (HTTP) requests",
             "keywords": [
                 "ZendFramework",
                 "http",
                 "zend",
                 "zf"
             ],
-            "time": "2017-10-13T12:06:24+00:00"
+            "time": "2019-02-19T18:58:14+00:00"
         },
         {
             "name": "zendframework/zend-i18n",
-            "version": "dev-develop",
+            "version": "2.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-i18n.git",
-                "reference": "4a5fc7e1d00d36af5a72ec44cc8865212665036e"
+                "reference": "6d69af5a04e1a4de7250043cb1322f077a0cdb7f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-i18n/zipball/4a5fc7e1d00d36af5a72ec44cc8865212665036e",
-                "reference": "4a5fc7e1d00d36af5a72ec44cc8865212665036e",
+                "url": "https://api.github.com/repos/zendframework/zend-i18n/zipball/6d69af5a04e1a4de7250043cb1322f077a0cdb7f",
+                "reference": "6d69af5a04e1a4de7250043cb1322f077a0cdb7f",
                 "shasum": ""
             },
             "require": {
                 "i18n",
                 "zf"
             ],
-            "time": "2018-05-24T13:11:26+00:00"
+            "time": "2018-05-16T16:39:13+00:00"
         },
         {
             "name": "zendframework/zend-i18n-resources",
-            "version": "dev-develop",
+            "version": "2.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-i18n-resources.git",
-                "reference": "c71c35bf9b8857c2d44d2e4e75b4f3490fb3b364"
+                "reference": "3a2f5a246779f05d4fe0c47738d4d2271e484aee"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-i18n-resources/zipball/c71c35bf9b8857c2d44d2e4e75b4f3490fb3b364",
-                "reference": "c71c35bf9b8857c2d44d2e4e75b4f3490fb3b364",
+                "url": "https://api.github.com/repos/zendframework/zend-i18n-resources/zipball/3a2f5a246779f05d4fe0c47738d4d2271e484aee",
+                "reference": "3a2f5a246779f05d4fe0c47738d4d2271e484aee",
                 "shasum": ""
             },
             "require": {
                 "translations",
                 "zf"
             ],
-            "time": "2018-04-30T14:49:31+00:00"
+            "time": "2019-06-25T01:21:12+00:00"
         },
         {
             "name": "zendframework/zend-loader",
                 "zend"
             ],
             "time": "2017-07-11T23:59:06+00:00"
-        },
-        {
-            "name": "zzarbi/synology",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/zzarbi/synology.git",
-                "reference": "376fb818121869750be2ee7afef719016a8a985b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/zzarbi/synology/zipball/376fb818121869750be2ee7afef719016a8a985b",
-                "reference": "376fb818121869750be2ee7afef719016a8a985b",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "require-dev": {
-                "php": ">=5.3.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "Synology_": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Cerveaux",
-                    "email": "nicolas.cerveaux@gmail.com"
-                }
-            ],
-            "description": "Synology API interface",
-            "homepage": "https://github.com/zzarbi/synology",
-            "keywords": [
-                "nas",
-                "synology"
-            ],
-            "time": "2017-05-31T00:12:03+00:00"
         }
     ],
     "packages-dev": [],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": {
-        "zzarbi/synology": 20,
-        "zendframework/zend-i18n": 20,
-        "zendframework/zend-i18n-resources": 20
-    },
+    "stability-flags": [],
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": [],
index 1cec94054ccf1634fe608da482c7d44752f0fd88..df304b593671e95053ed3a1fb521e4886fd23949 100644 (file)
@@ -1,7 +1,7 @@
 <?php
 include 'tv.php';
 
-$media = connectRedis()->get('medialibrary');
+$media = connectRedis()->igbget('medialibrary');
 $device = config('DEVICE');
 
 $shortcuts['media'] = [['label' => 'TV', 'type' => 'sub', 'sub' => 'tv'], ['label' => 'Ajoutés récemment', 'type' => 'sub', 'sub' => 'mediarecent']];
index 81ea5870dc07e0e3877de0d8efc59a1ba43c94c4..1776f8185917d410d27d761b748bbda0666959bf 100644 (file)
@@ -1,9 +1,9 @@
 <?php
 $allmusics = array();
 
-squeezeFavorites(connectRedis()->get('squeezebox_favorites'), $shortcuts);
+squeezeFavorites(connectRedis()->igbget('squeezebox_favorites'), $shortcuts);
 profile('Got Music favorites', __FILE__, __LINE__);
-$podcasts = connectRedis()->get('squeezebox_podcasts');
+$podcasts = connectRedis()->igbget('squeezebox_podcasts');
 podcastDir($podcasts, 'Podcasts', 'podcasts', $shortcuts);
 profile('Got podcasts', __FILE__, __LINE__);
 
index 17c5f37c17bcaa029eb252c02911f6bb45a180cf..d226ab83f64130c196ea49a20899c68aaf4efdcb 100644 (file)
@@ -1,5 +1,5 @@
 <?php
-$mapdvb = connectRedis()->get('dvbchannels');
+$mapdvb = connectRedis()->igbget('dvbchannels');
 if ($mapdvb === false) {
     $mapdvb = array();
     $m3u = getUrlContent('http://192.168.1.60:9981/playlist/channels', 30, ['admin', 'hUu6UKdQX9t6']);
@@ -13,7 +13,9 @@ if ($mapdvb === false) {
             $mapdvb[$name] = str_replace('http://192.168.1.60:9981/', 'http://admin:hUu6UKdQX9t6@192.168.1.60:9981/', $line);
         }
     }
-    connectRedis()->setex('dvbchannels', 3600, $mapdvb);
+
+    connectRedis()->igbsetex('dvbchannels', 3600, $mapdvb);
+
 }
 
 
index c428dc7cd9f996392652eab02a53810255b6abab..708fdb5e667a11db05946e246018acb72781d6f0 100644 (file)
@@ -9,6 +9,7 @@ if (isset($_SERVER) && isset($_SERVER['HTTP_HOST'])) {
 
 function cronOneLoop($cronmin)
 {
+    set_time_limit(0);
     cronRooms($cronmin);
 
     if ($cronmin % 5 == 0) {
@@ -99,7 +100,7 @@ function cronSeen($cronmin)
         $seen = array_merge($seen, json_decode(file_get_contents($cache), true));
     }
     file_put_contents($cache, json_encode($seen));
-    connectRedis()->set('mediaseen', $seen);
+    connectRedis()->igbset('mediaseen', $seen);
 }
 
 function cronMediaLibrary($cronmin)
@@ -119,7 +120,7 @@ function cronMediaLibrary($cronmin)
         $media[$directory['id']] = array('name' => $name, 'items' => getMediaContents($dir, $directory['context']));
     }
 
-    connectRedis()->set('medialibrary', $media);
+    connectRedis()->igbset('medialibrary', $media);
 
     _getTVShows(true);
     _getMovies(true);
@@ -153,7 +154,7 @@ function cronSqueezeFavorites($cronmin)
 {
     $favorites = getSqueezeFavorites();
     if ($favorites !== false && count($favorites) > 0) {
-        connectRedis()->set('squeezebox_favorites', $favorites);
+        connectRedis()->igbset('squeezebox_favorites', $favorites);
     }
 }
 
@@ -285,7 +286,7 @@ function cronPodcasts($cronmin)
 {
     $podcasts = getSqueezeFavorites(0, 'podcasts');
     if ($podcasts !== false && count($podcasts) > 0) {
-        connectRedis()->set('squeezebox_podcasts', $podcasts);
+        connectRedis()->igbset('squeezebox_podcasts', $podcasts);
     }
 }
 
index a73fa2e00404b977f364d201a01fcd16400ba2d2..24269a299a81db8dc266e53d86b377ccf1c9f4f4 100644 (file)
@@ -24,5 +24,6 @@ function domoticzCmd($command, $priority = false)
         $queue = [];
     }
     $queue[] = $command;
-    $redis->set($queue_name, $queue);
+    $redis->igbset($queue_name, $queue);
+    $redis->publish('domoticz_event', 'handle_queue');
 }
\ No newline at end of file
index 6cc850d36288701617e9fa759feeb3593a58068c..654d1fb26119d8a3517de58021f04ce1cfdb228b 100644 (file)
@@ -41,7 +41,8 @@ function insteonCommand($command)
                $queue = [];
        }
        $queue[] = $command;
-       $redis->set('insteon_queue', $queue);
+       $redis->igbset('insteon_queue', $queue);
+       $redis->publish('insteon_event','handle_queue');
 }
 
 function _insteonCommand($command)
index e1f3fad8caefdcfb6febf4c752b58bb9e318f0f6..927961bbddf46b30f5b16db19f9b65ef8b7fe9b0 100644 (file)
@@ -174,7 +174,7 @@ function shortcutDir($allshortcuts)
 
     $json = json_encode($res);
 
-    connectRedis()->set('shortcuts.' . getCurrentConfig(), $json);
+    connectRedis()->igbset('shortcuts.' . getCurrentConfig(), $json);
     profile('save cache shortcuts', __FILE__, __LINE__);
 
     return 'SECTIONS = ' . $json . ';';
index 0b0514c609018add5d4d0643f15b82324ba86a13..890a2be0a91966338928ce3499398dbf21dbb564 100644 (file)
@@ -8,7 +8,7 @@ function getMediaContents($dir, $context, $seen = null)
     $results = array();
 
     if (null === $seen) {
-        $seen = connectRedis()->get('mediaseen');
+        $seen = connectRedis()->igbget('mediaseen');
 
     }
     if (!is_array($seen)) {
index 299726d0fd6e043100ad33f6dc240ac75e9427a7..fbcd43668452fcc4925e406097b20f118d9d972e 100644 (file)
@@ -365,7 +365,7 @@ function getYoutubeDLMeta($url, $isHash = false)
     } else {
         $hash = $url;
     }
-    $meta = connectRedis()->get('youtubedl.' . $hash);
+    $meta = connectRedis()->igbget('youtubedl.' . $hash);
 
     if ($meta === false && !$isHash) {
         $locale = 'en_US.UTF8';
@@ -385,7 +385,7 @@ function getYoutubeDLMeta($url, $isHash = false)
         }
 
         $meta = ['title' => trim($lines[0]), 'thumbnail' => trim($lines[1]), 'duration' => $duration];
-        connectRedis()->set('youtubedl.' . $hash, $meta);
+        connectRedis()->igbset('youtubedl.' . $hash, $meta);
     }
     return $meta;
 }
index a5637cd3bb70c6b01742895676ef5a6f9636c3c0..0fed9edc1b0f0eddd9670778bf2db9234037579e 100644 (file)
@@ -1,16 +1,61 @@
 <?php
 
+use Predis\Client;
+
+
+class StringSetIb
+    extends Predis\Command\StringSet {
+
+    protected function filterArguments(Array $arguments) {
+        $arguments[1] = igbinary_serialize($arguments[1]);
+        return $arguments;
+    }
+}
+
+class StringSetexIb
+    extends Predis\Command\StringSetExpire {
+
+    protected function filterArguments(Array $arguments) {
+        $arguments[2] = igbinary_serialize($arguments[2]);
+        return $arguments;
+    }
+}
+
+class StringGetIb
+    extends Predis\Command\StringGet {
+
+    public function parseResponse($data) {
+        return igbinary_unserialize($data);
+    }
+}
+
 /**
- * @return Redis
+ * @return Client
  */
 function connectRedis()
 {
        global $redis;
+
        if (!isset($redis)) {
-               $redis = new Redis();
-               $redis->pconnect('127.0.0.1');
-               $redis->setOption(Redis::OPT_SERIALIZER, Redis::SERIALIZER_IGBINARY);
+           $redis=getRedisClient();
+
        }
        return $redis;
 }
 
+/**
+ * @return Client
+ */
+function getRedisClient(){
+    $redis=new Client();
+    $profile = $redis->getProfile();
+
+    // If you want, you can override SET or GET just like any other command, but I
+    // think it's better to use different names for your serialization-aware commands:
+
+    $profile->defineCommand('igbset', 'StringSetIb');
+    $profile->defineCommand('igbsetex', 'StringSetexIb');
+    $profile->defineCommand('igbget', 'StringGetIb');
+    return $redis;
+}
+
index 5f5a22503435269d6dbbcc9f80bc63ef439e7e3c..f5f73b0d9b00b1dfa7f4d5d323cc18191a7243ea 100644 (file)
@@ -6,12 +6,12 @@ function setState($key, $value)
         $value = trim($value);
     }
 
-    connectRedis()->set('state_' . $key, $value);
+    connectRedis()->igbset('state_' . $key, $value);
 }
 
 function getState($key, $default = null)
 {
-    $res = connectRedis()->get('state_' . $key);
+    $res = connectRedis()->igbget('state_' . $key);
     if ($res === false) {
         return $default;
     }
index 60c7c9f41be83d412214ab0b7f31d31389b9a173..1e3edff959da4f367c35333ef0788844388357f3 100644 (file)
@@ -47,10 +47,10 @@ function _getMediaRecentAdded($force = false)
             }
         }
 
-        connectRedis()->set('medialibrary.mediarecent', $res);
+        connectRedis()->igbset('medialibrary.mediarecent', $res);
         return $res;
     }
-    $res = connectRedis()->get('medialibrary.mediarecent');
+    $res = connectRedis()->igbget('medialibrary.mediarecent');
     if ($res === false) {
         return _getMediaRecentAdded(true);
     }
@@ -68,11 +68,11 @@ function _getTVShows($force = false)
         global $directories;
         $library = new tvShowLibrary($directories);
         $res = $library->getShortcuts();
-        connectRedis()->set('medialibrary.tvshows', $res);
+        connectRedis()->igbset('medialibrary.tvshows', $res);
 
         return $res;
     }
-    $res = connectRedis()->get('medialibrary.tvshows');
+    $res = connectRedis()->igbget('medialibrary.tvshows');
     if ($res === false) {
         return _getTVShows(true);
     }
@@ -90,10 +90,10 @@ function _getMovies($force = false)
         global $directories;
         $library = new moviesLibrary($directories);
         $res = $library->getShortcuts();
-        connectRedis()->set('medialibrary.movies', $res);
+        connectRedis()->igbset('medialibrary.movies', $res);
         return $res;
     }
-    $res = connectRedis()->get('medialibrary.movies');
+    $res = connectRedis()->igbget('medialibrary.movies');
     if ($res === false) {
         return _getMovies(true);
     }
@@ -140,13 +140,13 @@ class tvShowLibrary extends mediaLibrary
 
     public function getTVShowByID($id)
     {
-        $res = connectRedis()->get('tmdb.tv.' . $id);
+        $res = connectRedis()->igbget('tmdb.tv.' . $id);
         if ($res === false) {
             $client = getTmbdClient();
 
             try {
                 $tv = $client->getTvApi()->getTvshow($id, ['language' => 'fr-FR']);
-                connectRedis()->set('tmdb.tv.' . $id, $tv, ['EX' => 86400]);
+                connectRedis()->igbset('tmdb.tv.' . $id, $tv, ['EX' => 86400]);
                 return $tv;
             } catch (Exception $e) {
                 return null;
@@ -277,7 +277,7 @@ class mediaLibrary
     protected function _seen($p)
     {
         if (null === self::$_seen) {
-            self::$_seen = connectRedis()->get('mediaseen');
+            self::$_seen = connectRedis()->igbget('mediaseen');
             if (!is_array(self::$_seen)) {
                 self::$_seen = [];
             }
@@ -488,12 +488,12 @@ class moviesLibrary extends mediaLibrary
 
     public function getMovieByID($id)
     {
-        $res = connectRedis()->get('tmdb.movie.' . $id);
+        $res = connectRedis()->igbget('tmdb.movie.' . $id);
         if ($res === false) {
             $client = getTmbdClient();
             try {
                 $movie = $client->getMoviesApi()->getMovie($id, ['language' => 'fr-FR']);
-                connectRedis()->setex('tmdb.movie.' . $id, 86400, $movie);
+                connectRedis()->igbsetex('tmdb.movie.' . $id, 86400, $movie);
                 return $movie;
             } catch (Exception $e) {
                 return null;
index f09949aaa717cdeba99b318809eeb9f7a6118dec..1a7746fca84033ec63dda2cf1a11c37122e255db 100644 (file)
@@ -3,4 +3,4 @@
 define('DISPLAYINTERFACE', false);
 require_once "import.php";
 header('Content-type: application/json');
-echo connectRedis()->get('shortcuts.' . getCurrentConfig());
\ No newline at end of file
+echo connectRedis()->igbget('shortcuts.' . getCurrentConfig());
\ No newline at end of file
index a2c55611c7aefdc27949102665cdb839863800f0..121b0a4635c851d72219a7eb0f67adcff48f942d 100644 (file)
@@ -1,3 +1,3 @@
 <?php
 require_once "import.php";
-print_r(connectRedis()->get('mediaseen'));
\ No newline at end of file
+print_r(connectRedis()->igbget('mediaseen'));
\ No newline at end of file
index 7325c13bf55a37b873ab4f07db1e3d2a5906321f..ca8cb25ef22e129765d6781cee78b54b6635c6a7 100644 (file)
@@ -1,24 +1,37 @@
 #!/usr/bin/php
 
 <?php
+
+
 require_once __DIR__ . "/../scripts/import.php";
 
 // Set time limit to indefinite execution
 set_time_limit(0);
 ignore_user_abort(true);
 
-$redis = connectRedis();
-
 echo 'Run home server domoticz' . "\n";
 
-while (true) {
-    $wait = handleDomoticzQueue();
+$redis = connectRedis();
+
+$pubsubRedis = getRedisClient();
+$pubsub = $pubsubRedis->pubSubLoop();
+// Create a dispatcher loop instance and attach a bunch of callbacks.
+$dispatcher = new Predis\PubSub\DispatcherLoop($pubsub);
 
-    if ($wait > 0) {
-        usleep($wait * 1000000);
+class EventsListener
+{
+    public function __invoke($payload)
+    {
+        if ($payload == 'handle_queue') {
+            handleDomoticzQueue();
+        }
     }
 }
 
+$dispatcher->attachCallback('domoticz_event', ($events = new EventsListener()));
+$dispatcher->run();
+
+
 function handleDomoticzQueue()
 {
     global $redis;
@@ -26,10 +39,10 @@ function handleDomoticzQueue()
     $queues = ['domoticz_queue_priority', 'domoticz_queue'];
 
     foreach ($queues as $q) {
-        $queue = $redis->get($q);
+        $queue = $redis->igbget($q);
         if (!is_array($queue)) {
             $queue = [];
-            $redis->set($q, $queue);
+            $redis->igbset($q, $queue);
         }
         if (!count($queue)) {
             continue;
@@ -39,16 +52,14 @@ function handleDomoticzQueue()
         echo 'Run command ' . json_encode($command) . "\n";
         runDomoticzCommand($command);
         doneCommand($q, $command);
-        return 1.5;
+        usleep(1000000 * 1.5);
     }
-
-    return 0.1;
 }
 
 function doneCommand($q, $command)
 {
     global $redis;
-    $queue = $redis->get($q);
+    $queue = $redis->igbget($q);
     $res = [];
     foreach ($queue as $item) {
         if ($item == $command) {
@@ -56,6 +67,6 @@ function doneCommand($q, $command)
         }
         $res[] = $item;
     }
-    $redis->set($q, $res);
+    $redis->igbset($q, $res);
     echo 'Done command (' . $q . ') : ' . json_encode($command) . "\n";
 }
\ No newline at end of file
index f1ef67f899f5b2cb4ac93338f3dc5106ac5d5d39..80369d70f33771ec4d83ea93701db914d6deb03f 100644 (file)
@@ -10,21 +10,33 @@ ignore_user_abort(true);
 echo 'Run home server insteon' . "\n";
 
 $redis = connectRedis();
-while (true) {
-    $wait = handleInsteonQueue();
 
-    if ($wait > 0) {
-        usleep($wait * 1000000);
+$pubsubRedis = getRedisClient();
+$pubsub = $pubsubRedis->pubSubLoop();
+// Create a dispatcher loop instance and attach a bunch of callbacks.
+$dispatcher = new Predis\PubSub\DispatcherLoop($pubsub);
+
+class EventsListener
+{
+    public function __invoke($payload)
+    {
+        if ($payload == 'handle_queue') {
+            handleInsteonQueue();
+        }
     }
 }
 
+$dispatcher->attachCallback('insteon_event', ($events = new EventsListener()));
+$dispatcher->run();
+
+
 function handleInsteonQueue()
 {
     global $redis;
-    $queue = $redis->get('insteon_queue');
+    $queue = $redis->igbget('insteon_queue');
     if (!is_array($queue)) {
         $queue = [];
-        $redis->set('insteon_queue', $queue);
+        $redis->igbset('insteon_queue', $queue);
     }
     if (!count($queue)) {
         if (rand(1, 25) == 3) {
@@ -36,13 +48,13 @@ function handleInsteonQueue()
     echo 'Run command ' . $command . "\n";
     runInsteonCommand($command);
     doneCommand($command);
-    return 0.1;
+    usleep(1000000 * 0.1);
 }
 
 function doneCommand($command)
 {
     global $redis;
-    $queue = $redis->get('insteon_queue');
+    $queue = $redis->igbget('insteon_queue');
     $res = [];
     foreach ($queue as $item) {
         if ($item == $command) {
@@ -50,6 +62,6 @@ function doneCommand($command)
         }
         $res[] = $item;
     }
-    $redis->set('insteon_queue', $res);
+    $redis->igbset('insteon_queue', $res);
     echo 'Done command : ' . $command . "\n";
 }
\ No newline at end of file
index cc8af7cd9bb95364685b1565bd21ac9633656e09..a234bed4285ea067ebf5d8d84669c737e6af979a 100644 (file)
@@ -1,2 +1,2 @@
 #!/bin/sh
-start-stop-daemon --start --user pi --name home-$1 --pidfile /run/home-$1.pid -b --startas /var/www/home/servers/_startdaemon.php --chuid pi -- $1 --daemon
\ No newline at end of file
+/sbin/start-stop-daemon --start --quiet --user pi --chuid pi --name home-$1 --make-pidfile --pidfile /run/home-$1.pid  --background --startas /bin/bash -- -c "exec /var/www/home/servers/_startdaemon.php $1"
\ No newline at end of file
index 4c17e56927667a260db8f28937cda30c6ff9e42c..afdfb444c1e648b2fe3b650411d737c78507644d 100644 (file)
@@ -1,2 +1,3 @@
 #!/bin/sh
-start-stop-daemon --stop --oknodo --user pi --name home-$1 --pidfile /run/home-$1.pid --retry 5
+/sbin/start-stop-daemon --stop --pidfile /run/home-$1.pid --retry 10
+pkill -f $1.php
\ No newline at end of file