.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f0442cc6a57bee1e7c6c53b6925467397ddfaddb..8814ac45f1112567ebf21066f5633a27ddd95b11 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,16 +2,9 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="352ce63a-b52a-41a2-979b-becda7920939" name="Default" comment=".">
-      <change afterPath="$PROJECT_DIR$/images/netflix.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/images/netflix.svg" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/config/media.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/media.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/config/tv.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/tv.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/js/home.js" beforeDir="false" afterPath="$PROJECT_DIR$/js/home.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/freeboxchannel.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/freeboxchannel.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$/style/style.css" beforeDir="false" afterPath="$PROJECT_DIR$/style/style.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/style/style.less" beforeDir="false" afterPath="$PROJECT_DIR$/style/style.less" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/gradient.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/gradient.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/mediarasp.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/mediarasp.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -786,14 +779,7 @@
       <workItem from="1577380387468" duration="866000" />
       <workItem from="1577785483253" duration="3506000" />
       <workItem from="1577891426611" duration="8746000" />
-      <workItem from="1578343490755" duration="2798000" />
-    </task>
-    <task id="LOCAL-00218" summary=".">
-      <created>1567064583593</created>
-      <option name="number" value="00218" />
-      <option name="presentableId" value="LOCAL-00218" />
-      <option name="project" value="LOCAL" />
-      <updated>1567064583593</updated>
+      <workItem from="1578343490755" duration="2955000" />
     </task>
     <task id="LOCAL-00219" summary=".">
       <created>1567453650664</created>
@@ -1131,7 +1117,14 @@
       <option name="project" value="LOCAL" />
       <updated>1578043868577</updated>
     </task>
-    <option name="localTasksCounter" value="267" />
+    <task id="LOCAL-00267" summary=".">
+      <created>1578382506582</created>
+      <option name="number" value="00267" />
+      <option name="presentableId" value="LOCAL-00267" />
+      <option name="project" value="LOCAL" />
+      <updated>1578382506583</updated>
+    </task>
+    <option name="localTasksCounter" value="268" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1183,12 +1176,12 @@
     </state>
     <state x="720" y="247" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1577298128269" />
     <state x="960" y="247" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog/0.0.2560.1040@0.0.2560.1040" timestamp="1576479992407" />
-    <state x="935" y="114" key="CommitChangelistDialog2" timestamp="1578043863426">
+    <state x="935" y="114" key="CommitChangelistDialog2" timestamp="1578382488210">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="701" y="114" key="CommitChangelistDialog2/0.0.1920.1040@0.0.1920.1040" timestamp="1577381105204" />
     <state x="701" y="127" key="CommitChangelistDialog2/0.0.1920.1160@0.0.1920.1160" timestamp="1575647157027" />
-    <state x="935" y="114" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1578043863426" />
+    <state x="935" y="114" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1578382488210" />
     <state x="1114" y="443" key="NewPhpFileDialog" timestamp="1578038647334">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>

diff --git a/scripts/gradient.php b/scripts/gradient.php
index 40bdcbd18b2c398a78bb61b644ce527129222092..a173633c205346a7c87cb3bc1b4809ac3ff0333e 100644 (file)
--- a/scripts/gradient.php
+++ b/scripts/gradient.php
@@ -22,7 +22,7 @@ switch ($c) {
 //             $type = 'image';
 //             $res = ['image' => '/images/ambiance/borealis.jpg', 'position' => '50% 100%'];
         $type = 'youtube';
-        $res = ['videoid' => 'T75IKSXVXlc', 'start' => 5];
+        $res = ['videoid' => 'T75IKSXVXlc', 'start' => 12];
         break;
     case 'tropical':
         $type = 'youtube';

diff --git a/scripts/lib/mediarasp.php b/scripts/lib/mediarasp.php
index 9f8a277e69f5d2dabc0fcfc5334c5601826d1276..176c03a146bb2dac973401a35ec37773e628a3aa 100644 (file)
--- a/scripts/lib/mediarasp.php
+++ b/scripts/lib/mediarasp.php
@@ -372,9 +372,7 @@ function getYoutubeDLPath($url, $h = 0, $ext = 'mkv')
     if ($h != 0) {
         $hash .= '--' . $h . '++';
     }
-    echo $hash;
     $hash = sha1($hash);
-    echo $hash;
     return "/nas/Videos/YoutubeDL/" . $hash . '.' . $ext;
 }
 
@@ -385,7 +383,6 @@ function downloadYoutubeDL($url, $height = 1080, $cast = true, $ext = 'mkv')
     if (!file_exists($dest)) {
         if (!file_exists($wip)) {
             $convert = 'https://' . $_SERVER['HTTP_HOST'] . '/scripts/youtubedl-download.php?url=' . rawurldecode($url) . '&h=' . $height . '&ext=' . $ext;
-            echo $convert;
             httpRequest($convert, 'get', [], null, $cast ? 1 : 0);
             if (!$cast) {
                 return $dest;