From 5325ecb68cd07a57377d2d79fb846911f7f37137 Mon Sep 17 00:00:00 2001 From: Vincent Date: Tue, 7 Jan 2020 08:37:30 +0100 Subject: [PATCH] . --- .idea/workspace.xml | 33 +++++++++++++-------------------- scripts/gradient.php | 2 +- scripts/lib/mediarasp.php | 3 --- 3 files changed, 14 insertions(+), 24 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index f0442cc..8814ac4 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,16 +2,9 @@ - - - - - - - - - + + @@ -1183,12 +1176,12 @@ - + - + diff --git a/scripts/gradient.php b/scripts/gradient.php index 40bdcbd..a173633 100644 --- 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 9f8a277..176c03a 100644 --- 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; -- 2.39.5