Extract ytd binary to config, other minor changes

Author: michal-repo

Diff for: aria2.php

@@ -134,7 +134,7 @@ public function fetchFormats($force_pull = false)
             $this->formats = unserialize(file_get_contents($this->availableFormatsPath));
         } else {
             $creds = $this->getCreds();
-            $out = shell_exec('youtube-dl "' . $this->url . '" --dump-json' . $creds);
+            $out = shell_exec($GLOBALS['config']['ytd_binary'] . ' "' . $this->url . '" --dump-json' . $creds);
             $json_formats = json_decode($out, 1);
             if (isset($json_formats)) {
                 foreach ($json_formats['formats'] as $format) {
@@ -341,7 +341,7 @@ private function dispatchToAria2c()
     {
         $this->incrementAttempts();
         $creds = $this->getCreds();
-        $url = shell_exec('youtube-dl -f "' . $this->selectedFormat . '" "' . $this->url . '" -g ' . (($this->useCookiesForAria2c == 0) ? '' : '--cookies ' . $this->cookiesPath) . $creds);
+        $url = shell_exec($GLOBALS['config']['ytd_binary'] . ' -f "' . $this->selectedFormat . '" "' . $this->url . '" -g ' . (($this->useCookiesForAria2c == 0) ? '' : '--cookies ' . $this->cookiesPath) . $creds);
         if ($url === "" || is_null($url)) {
             return null;
         }
@@ -612,12 +612,12 @@ public function pListInternalQueue($type, $offset = 0, $limit = 100)
                     break;
             }
             $stmt = $this->connection->prepare("select count(id) as count from downloads where dispatched = :type_code");
-			$stmt->bindValue(':type_code', $type_code);
+            $stmt->bindValue(':type_code', $type_code);
             $stmt->execute();
             $count = $stmt->fetch(PDO::FETCH_ASSOC);
             $pages = ceil($count['count'] / $limit);
             $stmt = $this->connection->prepare("select id, url, formatOption, download_url, opt, priority, attempts, addedTime, dispatched from downloads where dispatched = :type_code order by " . ($type_code === 0 ? "priority desc, " : "") . " id " . ($type_code === 0 ? "asc" : "desc") . " limit :limit offset :offset");
-			$stmt->bindValue(':limit', $limit);
+            $stmt->bindValue(':limit', $limit);
             $stmt->bindValue(':offset', $offset);
             $stmt->bindValue(':type_code', $type_code);
             $stmt->execute();

Diff for: config.php

@@ -1,11 +1,11 @@
 <?php
 
 # db_location => set path to directory where db will be saved
-$config = ["db_location" => "/opt/php_aria2", "delay_after_ytd_url_generation" => 0, "use_cookies_by_default" => false, "add_to_internal_queue_by_default" => true, "max_download_attempts" => 10];
+$config = ["ytd_binary" => "youtube-dl", "db_location" => "/opt/php_aria2", "delay_after_ytd_url_generation" => 0, "use_cookies_by_default" => false, "add_to_internal_queue_by_default" => true, "max_download_attempts" => 10];
 $custom_locations = [
     // "LABEL" => "LOCATION",
     // eg.
     // "Downloads" => "/home/ubuntu/Downloads",
     // "HDD" => "/data/hdd/",
 ];
-$default_name_value = "";
+$default_name_value = "";

Diff for: index.php

@@ -152,6 +152,27 @@ function unlockFile($fp)
     redirectToSelf(("?status=" . urlencode($status)));
 }
 
+function populateEditForm($data)
+{
+    foreach ($data as $key => $field) {
+        if ($key === "opt") {
+            $downloadOptions = unserialize($field);
+            $_POST['out_name'] = $downloadOptions['out'];
+            $_POST['dir_name'] = $downloadOptions['dir'];
+        } else {
+            $_POST[$key] = $field;
+        }
+    }
+    $_POST['addToInternalQueue'] = "true";
+    $_POST['skipCookies'] = "true";
+    return true;
+}
+
+if (isset($_POST['editDownloadByID'])) {
+    $data = php2Aria2c::getDownloadByID(intval($_POST['editDownloadByID']));
+    $edit_form = populateEditForm($data);
+}
+
 if (isset($_POST['url'])) {
     $url = $_POST['url'];
     if (!empty($url)) {
@@ -163,30 +184,15 @@ function unlockFile($fp)
         $available_credentials = $php2Aria2c->getListOfCredentials();
         if (!(isset($_POST['id']) && !empty($_POST['id']))) {
             $alreadyAdded = $php2Aria2c->findByURL();
+            if (isset($alreadyAdded) && count($alreadyAdded) > 0){
+                $data = end($alreadyAdded);
+                unset($data['formatOption']);
+                $edit_form = populateEditForm($data);
+            }
         }
     }
 }
 
-if (isset($_POST['editDownloadByID']) || (isset($alreadyAdded) && count($alreadyAdded) > 0)) {
-    if (isset($alreadyAdded) && count($alreadyAdded) > 0){
-        $data = end($alreadyAdded);
-    } else {
-        $data = php2Aria2c::getDownloadByID(intval($_POST['editDownloadByID']));
-    }
-    foreach ($data as $key => $field) {
-        if ($key === "opt") {
-            $downloadOptions = unserialize($field);
-            $_POST['out_name'] = $downloadOptions['out'];
-            $_POST['dir_name'] = $downloadOptions['dir'];
-        } else {
-            $_POST[$key] = $field;
-        }
-    }
-    $_POST['addToInternalQueue'] = "true";
-    $_POST['skipCookies'] = "true";
-    $edit_form = true;
-}
-
 if (isset($php2Aria2c) && isset($_POST['formatOption']) && in_array($_POST['formatOption'], $available_formats) && !$edit_form) {
     $php2Aria2c->setSelectedFormat($_POST['formatOption']);
     $php2Aria2c->priority = $_POST['priority'];