.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 97ddca3c5c14b1e2f26763ee01c0ca6a6434c3d0..54d8905199d6eed1a92da27af6e0917af4995db3 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,9 +3,8 @@
   <component name="ChangeListManager">
     <list default="true" id="352ce63a-b52a-41a2-979b-becda7920939" name="Default" comment=".">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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/scenes.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/scenes.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/servers/domoticz.php" beforeDir="false" afterPath="$PROJECT_DIR$/servers/domoticz.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/global.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/global.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/jarvis.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/jarvis.php" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -42,52 +41,52 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/scripts/lib/scenes.php">
+        <entry file="file://$PROJECT_DIR$/servers/domoticz.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="357">
-              <caret line="556" column="22" lean-forward="true" selection-start-line="556" selection-start-column="22" selection-end-line="556" selection-end-column="22" />
+            <state relative-caret-position="467">
+              <caret line="42" column="5" selection-start-line="42" selection-start-column="5" selection-end-line="42" selection-end-column="5" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/servers/insteon.php">
+        <entry file="file://$PROJECT_DIR$/config/global.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-273">
-              <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="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>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/servers/domoticz.php">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/scripts/lib/jarvis.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="226">
-              <caret line="42" column="5" lean-forward="true" selection-start-line="42" selection-start-column="5" selection-end-line="42" selection-end-column="5" />
+            <state relative-caret-position="68">
+              <caret line="4" column="36" selection-start-line="4" selection-start-column="36" selection-end-line="4" selection-end-column="36" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/scripts/insteon.php">
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/scripts/jarvis.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="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>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/scripts/lib/insteon.php">
+        <entry file="file://$PROJECT_DIR$/tools/jarvis/commands">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1">
-              <caret line="35" selection-start-line="35" selection-end-line="44" selection-end-column="1" />
+            <state relative-caret-position="340">
+              <caret line="20" lean-forward="true" selection-start-line="20" selection-end-line="20" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/scripts/domoticz_device_event.php">
+        <entry file="file://$PROJECT_DIR$/tools/jarvis/events">
           <provider selected="true" editor-type-id="text-editor" />
         </entry>
       </file>
@@ -104,7 +103,7 @@
         <entry file="file://$PROJECT_DIR$/scripts/bedroomlight.php">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="119">
-              <caret line="7" column="8" lean-forward="true" selection-start-line="7" selection-start-column="8" selection-end-line="7" selection-end-column="13" />
+              <caret line="7" column="8" selection-start-line="7" selection-start-column="8" selection-end-line="7" selection-end-column="13" />
             </state>
           </provider>
         </entry>
@@ -112,7 +111,7 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/scripts/lib/medialibrary.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="223">
+            <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>
           </provider>
@@ -121,7 +120,7 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/scripts/lib/tmdb.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="385">
+            <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>
           </provider>
@@ -142,7 +141,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>wc/</find>
       <find>cronWeather</find>
       <find>deshumidificateur</find>
       <find>hide</find>
@@ -172,6 +170,7 @@
       <find>sudo</find>
       <find>domoticzCmd</find>
       <find>domoticz</find>
+      <find>jarvis</find>
     </findStrings>
     <replaceStrings>
       <replace />
@@ -201,7 +200,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/scripts/lib/bricks.php" />
         <option value="$PROJECT_DIR$/scripts/gradient.php" />
         <option value="$PROJECT_DIR$/style/common.less" />
         <option value="$PROJECT_DIR$/js/common.js" />
@@ -232,7 +230,6 @@
         <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$/config/global.php" />
         <option value="$PROJECT_DIR$/servers/stopdaemon" />
         <option value="$PROJECT_DIR$/servers/startdaemon" />
         <option value="$PROJECT_DIR$/config/tv.php" />
@@ -252,6 +249,8 @@
         <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" />
       </list>
     </option>
   </component>
@@ -424,13 +423,13 @@
             <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" />
+              <item name="tools" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="home" type="b2602c69:ProjectViewProjectNode" />
               <item name="home" type="462c0819:PsiDirectoryNode" />
-              <item name="servers" type="462c0819:PsiDirectoryNode" />
+              <item name="tools" type="462c0819:PsiDirectoryNode" />
+              <item name="jarvis" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
@@ -920,13 +919,7 @@
       <workItem from="1562139612183" duration="879000" />
       <workItem from="1562187458066" duration="10928000" />
       <workItem from="1562315270549" duration="3917000" />
-    </task>
-    <task id="LOCAL-00138" summary=".">
-      <created>1549795030567</created>
-      <option name="number" value="00138" />
-      <option name="presentableId" value="LOCAL-00138" />
-      <option name="project" value="LOCAL" />
-      <updated>1549795030567</updated>
+      <workItem from="1562430904715" duration="1570000" />
     </task>
     <task id="LOCAL-00139" summary=".">
       <created>1549800016125</created>
@@ -1264,11 +1257,18 @@
       <option name="project" value="LOCAL" />
       <updated>1562398828377</updated>
     </task>
-    <option name="localTasksCounter" value="187" />
+    <task id="LOCAL-00187" summary=".">
+      <created>1562430926369</created>
+      <option name="number" value="00187" />
+      <option name="presentableId" value="LOCAL-00187" />
+      <option name="project" value="LOCAL" />
+      <updated>1562430926369</updated>
+    </task>
+    <option name="localTasksCounter" value="188" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1236560000" />
+    <option name="totallyTimeSpent" value="1238130000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1289,9 +1289,9 @@
       <window_info id="Designer" order="3" />
       <window_info id="UI Designer" order="4" />
       <window_info id="Favorites" order="5" sideWeight="0.4576547" side_tool="true" weight="0.22506666" />
-      <window_info active="true" content_ui="combo" id="Project" order="6" sideWeight="0.49456522" visible="true" weight="0.2182035" />
+      <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" visible="true" weight="0.30444205" />
+      <window_info anchor="bottom" id="Find" order="1" sideWeight="0.48251194" weight="0.30444205" />
       <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4674086" weight="0.3217768" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
@@ -1299,7 +1299,7 @@
       <window_info anchor="bottom" id="TODO" order="6" sideWeight="0.49920508" weight="0.32936078" />
       <window_info anchor="bottom" id="Version Control" order="7" sideWeight="0.49801272" weight="0.32936078" />
       <window_info anchor="bottom" id="Terminal" order="8" sideWeight="0.44395867" weight="0.2383532" />
-      <window_info anchor="bottom" id="File Transfer" order="9" sideWeight="0.43759936" weight="0.2524377" />
+      <window_info anchor="bottom" id="File Transfer" order="9" sideWeight="0.43759936" visible="true" weight="0.2524377" />
       <window_info anchor="bottom" id="Database Changes" order="10" show_stripe_button="false" />
       <window_info anchor="bottom" id="Docker" order="11" show_stripe_button="false" />
       <window_info anchor="bottom" id="Messages" order="12" />
@@ -1314,9 +1314,9 @@
       <window_info anchor="right" id="Palette&#9;" order="7" />
       <window_info anchor="right" id="Capture Analysis" order="8" />
       <window_info anchor="right" id="Theme Preview" order="9" />
-      <window_info anchor="right" id="Remote Host" order="10" sideWeight="0.48753893" visible="true" weight="0.0918124" />
+      <window_info anchor="right" id="Remote Host" order="10" sideWeight="0.48550725" 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.51246107" side_tool="true" visible="true" weight="0.0918124" />
+      <window_info anchor="right" id="Structure" order="12" sideWeight="0.51449275" 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>
@@ -1352,30 +1352,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/config/bureausun.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="51">
-          <caret line="3" column="28" selection-start-line="3" selection-start-column="28" selection-end-line="3" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/lib/http.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="50" column="5" selection-start-line="50" selection-start-column="5" selection-end-line="50" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/config/music.php">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/config/media.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="408">
-          <caret line="24" column="22" selection-start-line="24" selection-start-column="22" selection-end-line="24" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/scripts/sections.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="51">
@@ -1468,13 +1444,6 @@
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/servers/stopdaemon.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="85" selection-start-line="39" selection-start-column="85" selection-end-line="39" selection-end-column="85" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/servers/_startdaemon.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="85">
@@ -1625,23 +1594,30 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/lib/medialibrary.php">
+    <entry file="file://$PROJECT_DIR$/scripts/lib/scenes.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="223">
-          <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="9452">
+          <caret line="556" column="22" selection-start-line="556" selection-start-column="22" selection-end-line="556" selection-end-column="22" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/bedroomlight.php">
+    <entry file="file://$PROJECT_DIR$/servers/insteon.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="119">
-          <caret line="7" column="8" lean-forward="true" selection-start-line="7" selection-start-column="8" selection-end-line="7" selection-end-column="13" />
+        <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>
+      </provider>
+    </entry>
+    <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="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$/scripts/lib/insteon.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1">
+        <state relative-caret-position="595">
           <caret line="35" selection-start-line="35" selection-end-line="44" selection-end-column="1" />
         </state>
       </provider>
@@ -1649,45 +1625,69 @@
     <entry file="file://$PROJECT_DIR$/scripts/domoticz_device_event.php">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/servers/insteon.php">
+    <entry file="file://$PROJECT_DIR$/scripts/lib/domoticz.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-273">
-          <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="238">
+          <caret line="14" column="9" selection-start-line="14" selection-start-column="9" selection-end-line="14" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/scripts/bedroomlight.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>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/scripts/lib/medialibrary.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>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/scripts/lib/tmdb.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="385">
+        <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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/insteon.php">
+    <entry file="file://$PROJECT_DIR$/servers/domoticz.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="467">
+          <caret line="42" column="5" selection-start-line="42" selection-start-column="5" selection-end-line="42" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/lib/domoticz.php">
+    <entry file="file://$PROJECT_DIR$/config/global.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="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$/scripts/lib/scenes.php">
+    <entry file="file://$PROJECT_DIR$/tools/jarvis/events">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/tools/jarvis/commands">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="357">
-          <caret line="556" column="22" lean-forward="true" selection-start-line="556" selection-start-column="22" selection-end-line="556" selection-end-column="22" />
+        <state relative-caret-position="340">
+          <caret line="20" lean-forward="true" selection-start-line="20" selection-end-line="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/servers/domoticz.php">
+    <entry file="file://$PROJECT_DIR$/scripts/lib/jarvis.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="226">
-          <caret line="42" column="5" lean-forward="true" selection-start-line="42" selection-start-column="5" selection-end-line="42" selection-end-column="5" />
+        <state relative-caret-position="68">
+          <caret line="4" column="36" selection-start-line="4" selection-start-column="36" selection-end-line="4" selection-end-column="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/scripts/jarvis.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="68">
+          <caret line="4" column="27" selection-start-line="4" selection-start-column="27" selection-end-line="4" selection-end-column="27" />
         </state>
       </provider>
     </entry>

diff --git a/config/global.php b/config/global.php
index 6ccff66cf99d77ae27458c4b4aae2ca0e7c4a07b..100df5fb5852b784c21e95bcc4c72e63470b1a6d 100644 (file)
--- a/config/global.php
+++ b/config/global.php
@@ -33,8 +33,8 @@ $devices = [
        'litjerome' => ['host' => '192.168.1.62', 'user' => 'pi', 'password' => 'atacama'],
        'sdb' => ['host' => '192.168.1.63', 'user' => 'pi', 'password' => 'atacama'],
        'entree' => ['host' => '192.168.1.64', 'user' => 'pi', 'password' => 'atacama'],
-       'jarvis' => ['host' => '192.168.1.69', 'user' => 'jarvis', 'password' => 'atacama'],
-       'chambre' => ['host' => '192.168.1.65', 'user' => 'chambre', 'password' => 'atacama'],
+       'jarvis' => ['host' => '192.168.1.60', 'user' => 'jarvis', 'password' => 'atacama'],
+       'minitel1' => ['host' => '192.168.1.65', 'user' => 'pi', 'password' => 'atacama'],
        'salon' => ['host' => '192.168.1.66', 'user' => 'pi', 'password' => 'atacama'],
        'bureau' => ['host' => '192.168.1.67', 'user' => 'pi', 'password' => 'atacama'],
        'cuisine' => ['host' => '192.168.1.68', 'user' => 'pi', 'password' => 'atacama'],

diff --git a/scripts/jarvis.php b/scripts/jarvis.php
index f0f7b8067dfffa2f4401898d43b2d6ee9a271b0d..b7b3015184282b32b5fbf42dc2cc25e037c276fc 100644 (file)
--- a/scripts/jarvis.php
+++ b/scripts/jarvis.php
@@ -2,7 +2,7 @@
 require_once 'import.php';
 
 $auth = ['33664863307', '33662717540', '33646396295'];
-if (!isset($_GET['from']) || !in_array($_GET['from'], $auth)) {
+if (isset($_GET['from']) && !in_array($_GET['from'], $auth)) {
     echo 'Désolé, je ne vous connais pas';
 } else {
     echo jarvisCmd($_GET['question']);