]> _ Git - tortuga-home.git/commitdiff
.
authorVincent <vincent@enhydra.fr>
Mon, 16 Nov 2020 09:08:37 +0000 (10:08 +0100)
committerVincent <vincent@enhydra.fr>
Mon, 16 Nov 2020 09:08:37 +0000 (10:08 +0100)
.idea/workspace.xml
config/chambre.php
scripts/lib/off.php
scripts/lib/tmdb.php
style/style.css
style/style.less

index 25b049bb81c8a7c178908ac24c84e95c0e02529f..31711c294efab9a24f73615e70bb8b5cea195441 100644 (file)
@@ -3,7 +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$/config/chambre.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/chambre.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/off.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/off.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$/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" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
       <workItem from="1605087787424" duration="33487000" />
       <workItem from="1605261347643" duration="1199000" />
       <workItem from="1605342171398" duration="4613000" />
-      <workItem from="1605355486465" duration="19020000" />
-    </task>
-    <task id="LOCAL-00351" summary=".">
-      <created>1603560058397</created>
-      <option name="number" value="00351" />
-      <option name="presentableId" value="LOCAL-00351" />
-      <option name="project" value="LOCAL" />
-      <updated>1603560058397</updated>
+      <workItem from="1605355486465" duration="22961000" />
     </task>
     <task id="LOCAL-00352" summary=".">
       <created>1603560834622</created>
       <option name="project" value="LOCAL" />
       <updated>1605437322206</updated>
     </task>
-    <option name="localTasksCounter" value="400" />
+    <task id="LOCAL-00400" summary=".">
+      <created>1605437456015</created>
+      <option name="number" value="00400" />
+      <option name="presentableId" value="LOCAL-00400" />
+      <option name="project" value="LOCAL" />
+      <updated>1605437456015</updated>
+    </task>
+    <option name="localTasksCounter" value="401" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="LAST_COMMIT_MESSAGE" value="." />
   </component>
   <component name="WindowStateProjectService">
-    <state x="740" y="229" key="#com.jetbrains.php.refactoring.extractMethod.PhpExtractMethodDialog#function0" timestamp="1604146905948">
-      <screen x="0" y="0" width="1707" height="920" />
+    <state x="1110" y="259" key="#com.jetbrains.php.refactoring.extractMethod.PhpExtractMethodDialog#function0" timestamp="1605437484620">
+      <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="740" y="229" key="#com.jetbrains.php.refactoring.extractMethod.PhpExtractMethodDialog#function0/0.0.1707.920@0.0.1707.920" timestamp="1604146905948" />
-    <state x="198" y="0" width="737" height="502" key="CommitChangelistDialog2" timestamp="1605437318597">
+    <state x="1110" y="259" key="#com.jetbrains.php.refactoring.extractMethod.PhpExtractMethodDialog#function0/0.0.2560.1040@0.0.2560.1040" timestamp="1605437484620" />
+    <state x="198" y="0" width="737" height="502" key="CommitChangelistDialog2" timestamp="1605437453046">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="132" y="0" width="737" height="502" key="CommitChangelistDialog2/0.0.1707.920@0.0.1707.920" timestamp="1605086955514" />
     <state x="701" y="75" key="CommitChangelistDialog2/0.0.1920.1160@0.0.1920.1160" timestamp="1605188136787" />
-    <state x="198" y="0" width="745" height="567" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1605437318597" />
+    <state x="198" y="0" width="745" height="567" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1605437453046" />
     <state x="952" y="244" key="FileChooserDialogImpl" timestamp="1605104496549">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
index 3979316955cb089bb6ddaeb1d98a687abae16957..6d79a571dc09674cd4da35472161672a448d94fb 100644 (file)
@@ -19,5 +19,5 @@ if (DISPLAYINTERFACE) {
     $favoriteslights = $c['favorites'];
 
     include "default.php";
-    $nav = ['home', 'lights', 'music', 'fan', 'remote', 'coffee', 'switch', 'settings', 'alert', 'off'];
+    $nav = ['home', 'lights', 'music','remote', 'coffee', 'switch', 'settings', 'alert', 'off'];
 }
\ No newline at end of file
index dbae0fc69ca6be8ea7e48f3e9e52218bd7648d4f..75168a812d5dbf482ca67299b4df31bfead81e92 100644 (file)
@@ -28,7 +28,6 @@ function offSalon()
     stopHarmony();
     shieldKillAll('salon');
     shieldSleep('salon');
-    harmonyDeviceCommand('videoprojecteur-epson', 'power-off');
 }
 
 function offBureau()
index 1e7d38b66bca6edb30cdd231e399fc2cdbf7756b..5da815f1f4fa880a44e7125daaccba9864dab644 100644 (file)
@@ -116,10 +116,16 @@ class tvShowLibrary extends mediaLibrary
 
     protected $tvShows = [];
     protected $force = false;
+    protected $tmdbclient;
+    protected $find;
 
     public function __construct($directories, $force = false)
     {
         $this->force = $force;
+
+        $this->tmdbclient = getTmbdClient();
+        $this->find = $this->tmdbclient->getFindApi();
+
         foreach ($directories as $directory) {
             if ($directory['context'] != 'tvshow') {
                 continue;
@@ -131,6 +137,20 @@ class tvShowLibrary extends mediaLibrary
                     @rename($f->getPathname(), str_replace('.tmbd.id', '.tmdb.id', $f->getPathname()));
                     continue;
                 }
+                if ($f->isDir() && !file_exists($f->getPath() . '/.tmdb.id') && strpos($f->getPath(), '.tt') !== false) {
+
+                    $e = explode('.', $f->getPath());
+                    $last = array_pop($e);
+                    $r = $this->find->findBy($last, ['external_source' => 'imdb_id']);
+
+                    foreach ($r['tv_results'] as $tv_result) {
+                        if (isset($tv_result['id'])) {
+                            file_put_contents($f->getPath() . '/.tmdb.id', $tv_result['id']);
+                            break;
+                        }
+                    }
+                    continue;
+                }
                 if ($f->isDir() || strpos($f->getFilename(), '.tmdb.id') === false) {
                     continue;
                 }
index 40a1c1ee70a68c075c58ffce087b91cba9ea87a2..f2f4da53848b48f7e57dda6d088b971dd6cd6763 100644 (file)
@@ -46,10 +46,10 @@ body #splash {
 }
 #burger {
   position: fixed;
-  left: -100px;
-  top: -100px;
-  width: 200px;
-  height: 200px;
+  right: 10vh;
+  bottom: 10vh;
+  width: 20vh;
+  height: 20vh;
   background-color: #000;
   border-radius: 50% 50%;
   z-index: 2;
@@ -57,9 +57,9 @@ body #splash {
 #burger i {
   position: absolute;
   color: #fff;
-  right: 45px;
-  bottom: 45px;
-  font-size: 40px;
+  right: 6.3vh;
+  bottom: 6.3vh;
+  font-size: 7.7vh;
 }
 #mainnav a {
   text-align: center;
index 03a683c61fa95603c161e20e39230530d7086759..a33a9b6127e79950caedf029a596b929c03b48dd 100644 (file)
@@ -55,11 +55,11 @@ body {
 }
 
 #burger {
-  @w: 200px;
-  @o: unit(@w/-2, px);
+  @w: 20vh;
+  @o: unit(@w/2, vh);
   position: fixed;
-  left: @o;
-  top: @o;
+  right: @o;
+  bottom: @o;
   width: @w;
   height: @w;
   background-color: #000;
@@ -67,11 +67,12 @@ body {
   z-index: 2;
 
   i {
+    @f: unit((@w/200)*63, vh);
     position: absolute;
     color: #fff;
-    right: 45px;
-    bottom: 45px;
-    font-size: 40px;
+    right: @f;
+    bottom: @f;
+    font-size: unit(@f/45*55, vh);
   }
 }