Merge pull request #230 from e-alfred/v180

Fixes for version 1.8.0 (thanks @weeman1337)

Author: e-alfred

README.md

@@ -90,6 +90,12 @@ Loki3000
 (formerly) Xavier Beurois
 
 ## Releases notes
+### v1.8.0 [unreleased]
+- Removed Nextcloud 20 support (min version is now 21)
+- Added Nextcloud 23 support
+- Fixed curl download stuck in "waiting" status
+- Fixed some "Trying to access array offset" errors in `queue.php`
+
 ### v1.7.1
 - Added support for quota limits (thanks @Irillit)
 - Moved translations to Transiflex and fixed some localization issues (thanks @MorrisJobke and @rakekniven)

SERVER/fallback.php

@@ -95,9 +95,6 @@ private static function curlSetAdvancedOptions($OPTIONS)
         if (isset($OPTIONS['user-agent'])) {
             curl_setopt(self::$CurlHandler, CURLOPT_USERAGENT, $OPTIONS['user-agent']);
         }
-        if (isset($OPTIONS['out'])) {
-            curl_setopt(self::$CurlHandler, CURLOPT_FILE, $OPTIONS['out']);
-        }
         if (isset($OPTIONS['all-proxy'])) {
             curl_setopt(self::$CurlHandler, CURLOPT_PROXY, $OPTIONS['all-proxy']);
             if (isset($OPTIONS['all-proxy-user']) && isset($OPTIONS['all-proxy-passwd'])) {

appinfo/app.php

@@ -16,5 +16,5 @@
     'order' => 10,
     'href' => \OC::$server->getURLGenerator()->linkToRoute('ocdownloader.Index.Add'),
     'icon' => \OC::$server->getURLGenerator()->imagePath('ocdownloader', 'ocdownloader.svg'),
-    'name' => 'ocDownloader'
+    'name' => \OC::$server->getL10N('ocdownloader')->t('ocDownloader')
 ]);

appinfo/info.xml

@@ -6,7 +6,7 @@
 	<description>Easy to use download manager using Curl/Aria2 and youtube-dl to allow downloading HTTP(S), FTP(S), YouTube videos and BitTorrent files. For more information on how to install, please go to https://github.com/e-alfred/ocdownloader/blob/master/README.md
 
 	</description>
-	<version>1.7.12</version>
+	<version>1.8.0</version>
 	<licence>agpl</licence>
 	<author>e-alfred</author>
 	<author>Nibbels</author>
@@ -17,7 +17,7 @@
 	<screenshot>https://raw.githubusercontent.com/e-alfred/ocdownloader/master/appinfo/Screenshot.jpg</screenshot>
 	<repository>https://github.com/e-alfred/</repository>
 	<dependencies>
-		<nextcloud min-version="20" max-version="22" />
+		<nextcloud min-version="21" max-version="23" />
 		<lib>curl</lib>
 	</dependencies>
 

controller/lib/curl.php

@@ -15,40 +15,40 @@ class CURL
     private static $GID = null;
     private static $URI = null;
     private static $OPTIONS = null;
-    
+
     public static function addUri($URI, $OPTIONS)
     {
         self::$GID = uniqid();
         self::$URI = $URI;
         self::$OPTIONS = $OPTIONS;
-        
+
         self::run();
-        
+
         return array('result' => self::$GID);
     }
-    
+
     public static function tellStatus($GID)
     {
         if (file_exists('/tmp/' . $GID . '.curl')) {
             $Line = null;
-    
+
             $TFHandle = fopen('/tmp/' . $GID . '.curl', 'r');
             $Cursor = -1;
-    
+
             fseek($TFHandle, $Cursor, SEEK_END);
             $Char = fgetc($TFHandle);
-            
+
             while ($Char === "\n" || $Char === "\r") {
                 fseek($TFHandle, $Cursor--, SEEK_END);
                 $Char = fgetc($TFHandle);
             }
-            
+
             while ($Char !== false && $Char !== "\n" && $Char !== "\r") {
                 $Line = $Char . $Line;
                 fseek($TFHandle, $Cursor--, SEEK_END);
                 $Char = fgetc($TFHandle);
             }
-            
+
             $StatusArray = array(
                 'status' => 'waiting',
                 'completedLength' => 0,
@@ -57,7 +57,7 @@ public static function tellStatus($GID)
                 'PID' => 0,
                 'GID' => $GID
             );
-            
+
             if (!is_null($Line)) {
                 $Status = explode(';', $Line);
                 if (count($Status) == 5) {
@@ -77,15 +77,15 @@ public static function tellStatus($GID)
             );
         }
     }
-    
+
     public static function remove($Status)
     {
         $Return = null;
         if (isset($Status['PID']) && is_numeric($Status['PID']) && isset($Status['GID'])) {
             if ($Status['PID'] == 0 || posix_kill($Status['PID'], 15) === false) {
                 $Return = null;
             }
-            
+
             if (file_exists('/tmp/' . $Status['GID'] . '.curl')) {
                 $PFHandle = fopen('/tmp/' . $Status['GID'] . '.curl', 'a');
                 if (is_resource($PFHandle)) {
@@ -95,14 +95,14 @@ public static function remove($Status)
                             .';'.$Status['PID']."\n"
                     );
                     fclose($PFHandle);
-                    
+
                     $Return = array('result' => $Status['GID']);
                 }
             }
         }
         return $Return;
     }
-    
+
     public static function removeDownloadResult($GID)
     {
         if (file_exists('/tmp/' . $GID . '.curl')) {
@@ -112,7 +112,7 @@ public static function removeDownloadResult($GID)
             'result' => 'OK'
         );
     }
-    
+
     /********** PRIVATE STATIC METHODS **********/
     private static function run()
     {

controller/queue.php

@@ -144,6 +144,10 @@ public function get()
                 $Queue = [];
                 $DownloadUpdated = false;
                 while ($Row = $Request->fetchRow()) {
+                    if (is_array($Row) === false) {
+                        break;
+                    }
+
                     $Status =($this->WhichDownloader == 0
                         ?Aria2::tellStatus($Row['GID']):CURL::tellStatus($Row['GID']));
                     $DLStatus = 5; // Error