From: Vincent <vincent@enhydra.fr>
Date: Wed, 4 Sep 2019 07:52:55 +0000 (+0200)
Subject: .
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=4454ce8c8fdbe58dd80c192ef03fd54ac16576bb;p=tortuga-home.git

.
---

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f9d1b2d..186da78 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,8 +3,11 @@
   <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/cron/cron.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/cron/cron.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/medialibrary.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/medialibrary.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/tools/pop/pop.py" beforeDir="false" afterPath="$PROJECT_DIR$/tools/pop/pop.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/transcode.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/transcode.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/servers/insteon.php" beforeDir="false" afterPath="$PROJECT_DIR$/servers/insteon.php" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -719,13 +722,7 @@
       <workItem from="1567261528772" duration="609000" />
       <workItem from="1567408023339" duration="2511000" />
       <workItem from="1567413752073" duration="11664000" />
-    </task>
-    <task id="LOCAL-00173" summary=".">
-      <created>1551175350566</created>
-      <option name="number" value="00173" />
-      <option name="presentableId" value="LOCAL-00173" />
-      <option name="project" value="LOCAL" />
-      <updated>1551175350567</updated>
+      <workItem from="1567582030869" duration="1366000" />
     </task>
     <task id="LOCAL-00174" summary=".">
       <created>1551255018831</created>
@@ -1063,7 +1060,14 @@
       <option name="project" value="LOCAL" />
       <updated>1567499513044</updated>
     </task>
-    <option name="localTasksCounter" value="222" />
+    <task id="LOCAL-00222" summary=".">
+      <created>1567582046066</created>
+      <option name="number" value="00222" />
+      <option name="presentableId" value="LOCAL-00222" />
+      <option name="project" value="LOCAL" />
+      <updated>1567582046067</updated>
+    </task>
+    <option name="localTasksCounter" value="223" />
     <servers />
   </component>
   <component name="TodoView">
diff --git a/scripts/cron/cron.php b/scripts/cron/cron.php
index 21f4d51..8a6e7ca 100644
--- a/scripts/cron/cron.php
+++ b/scripts/cron/cron.php
@@ -6,6 +6,7 @@ function cronOneLoop($cronmin)
 {
     set_time_limit(0);
     cronRooms($cronmin);
+    cronInsteon($cronmin);
 
     if ($cronmin % 5 == 0) {
         cronTraffic($cronmin, false);
@@ -37,6 +38,10 @@ function cronOneLoop($cronmin)
     cronHeartbeat($cronmin);
 }
 
+function cronInsteon($cronmin){
+    insteonCommand('knock');
+}
+
 function cronEcoMode($cronmin)
 {
     if ($cronmin % 5 != 0) {
diff --git a/scripts/lib/insteon.php b/scripts/lib/insteon.php
index 3912422..a213dbe 100644
--- a/scripts/lib/insteon.php
+++ b/scripts/lib/insteon.php
@@ -26,7 +26,7 @@ function runInsteonCommand($command, $attempts = 3)
     insteonClearBuffer();
     echo "\n" . '-- Command ' . $command . ' attempt #' . $attempts . ' --' . "\n";
     echo "command : " . _insteonCommand($command) . "\n";
-    for ($i = 1; $i <= 5; $i++) {
+    for ($i = 1; $i <= 3; $i++) {
         usleep(1000000 * 0.1);
         $buff = insteonBuffer();
         echo $buff . "\n";
diff --git a/scripts/lib/medialibrary.php b/scripts/lib/medialibrary.php
index fc87d22..79dbd71 100644
--- a/scripts/lib/medialibrary.php
+++ b/scripts/lib/medialibrary.php
@@ -132,6 +132,8 @@ function transcodeOneVideo()
             continue;
         }
 
+        set_time_limit(0);
+        ignore_user_abort(true);
         $cmd = 'C:\Scripts\convertvideo.bat "' . nasToAvion($item) . '" "' . nasToAvion($to) . '" ' . $item->getExtension();
         print_r(sshCommand($cmd, 'avion'));
         return;
diff --git a/scripts/transcode.php b/scripts/transcode.php
index 1b2d946..1f958ed 100644
--- a/scripts/transcode.php
+++ b/scripts/transcode.php
@@ -1,3 +1,4 @@
 <?php
 require_once 'import.php';
+
 transcodeOneVideo();
\ No newline at end of file
diff --git a/servers/insteon.php b/servers/insteon.php
index 0bef892..6693af9 100644
--- a/servers/insteon.php
+++ b/servers/insteon.php
@@ -38,6 +38,10 @@ function handleInsteonQueue()
         $command = array_shift($queue);
         $redis->igbset('insteon_queue', $queue);
         echo 'Run command ' . $command . "\n";
+        if ($command == 'knock') {
+            insteonKnock();
+            continue;
+        }
         runInsteonCommand($command);
         usleep(1000000 * 0.5);
     }