From: Vincent Date: Thu, 5 Sep 2019 08:24:33 +0000 (+0200) Subject: . X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=9c43de4aefe5242a58058a3fc7f1bd13766d0921;p=tortuga-home.git . --- diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 2342c82..a65b83b 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -3,7 +3,8 @@ - + + diff --git a/scripts/cron/cron.php b/scripts/cron/cron.php index 8a6e7ca..aa422df 100644 --- a/scripts/cron/cron.php +++ b/scripts/cron/cron.php @@ -38,7 +38,8 @@ function cronOneLoop($cronmin) cronHeartbeat($cronmin); } -function cronInsteon($cronmin){ +function cronInsteon($cronmin) +{ insteonCommand('knock'); } @@ -54,9 +55,7 @@ function cronEcoMode($cronmin) function cronTranscode($cronmin) { - if (getState('device_avion_awake') === '1') { - transcodeOneVideo(); - } + httpRequest('https://home.tortuga.enhydra.fr/scripts/transcode.php','get',[],null,10,true); } function cronRooms($cronmin) diff --git a/scripts/lib/medialibrary.php b/scripts/lib/medialibrary.php index 79dbd71..5720bae 100644 --- a/scripts/lib/medialibrary.php +++ b/scripts/lib/medialibrary.php @@ -134,6 +134,13 @@ function transcodeOneVideo() set_time_limit(0); ignore_user_abort(true); + + $hour = intval(date('H')); + if ($hour > 12 && $hour < 20) { + wakeupPC('avion'); + sleep(5); + } + $cmd = 'C:\Scripts\convertvideo.bat "' . nasToAvion($item) . '" "' . nasToAvion($to) . '" ' . $item->getExtension(); print_r(sshCommand($cmd, 'avion')); return;