From 32b64845966f2effc986df41144dc4e9cec71bd2 Mon Sep 17 00:00:00 2001
From: huangjx <freefallbenson@gmail.com>
Date: Wed, 27 Apr 2022 23:09:47 +0800
Subject: [PATCH] bugfixes

---
 lib/Controller/MainController.php    | 4 ++--
 lib/Controller/YoutubeController.php | 3 +--
 lib/Tools/Helper.php                 | 8 +++++---
 lib/Tools/folderScan.php             | 2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/lib/Controller/MainController.php b/lib/Controller/MainController.php
index b4dc240..85d7e1e 100644
--- a/lib/Controller/MainController.php
+++ b/lib/Controller/MainController.php
@@ -155,7 +155,7 @@ class MainController extends Controller
             'uid' => $this->uid,
             'gid' => $result,
             'type' => Helper::DOWNLOADTYPE['ARIA2'],
-            'filename' => $filename ?? 'unknown',
+            'filename' => empty($filename) ? "unknown" : $filename,
             'timestamp' => time(),
             'data' => serialize(['link' => $url]),
         ];
@@ -202,7 +202,7 @@ class MainController extends Controller
      */
     public function scanFolder()
     {
-        $resp = folderScan::create()->scan();
+        $resp = folderScan::sync();
         return new JSONResponse($resp);
     }
     /**
diff --git a/lib/Controller/YoutubeController.php b/lib/Controller/YoutubeController.php
index ebc2cbd..d856f79 100644
--- a/lib/Controller/YoutubeController.php
+++ b/lib/Controller/YoutubeController.php
@@ -13,8 +13,6 @@ use OCP\IRequest;
 
 class YoutubeController extends Controller
 {
-    private $userId;
-    private $settings = null;
     //@config OC\AppConfig
     private $l10n;
     private $audio_extensions = array("mp3", "m4a", "vorbis");
@@ -67,6 +65,7 @@ class YoutubeController extends Controller
 
         $resp['title'] = ['filename', 'speed', 'progress', 'actions'];
         $resp['counter'] = ['youtube-dl' => count($data)];
+        folderScan::sync();
         return new JSONResponse($resp);
     }
     /**
diff --git a/lib/Tools/Helper.php b/lib/Tools/Helper.php
index dfb7af3..85f9e79 100644
--- a/lib/Tools/Helper.php
+++ b/lib/Tools/Helper.php
@@ -70,14 +70,15 @@ class Helper
         }
         return $filename;
     }
-    public static function getFilename($url)
+    public static function getFilename($url): string
     {
         if (self::isMagnet($url)) {
-            $filename = self::parseUrl($url)['dn'];
+            $info = self::parseUrl($url);
+            $filename = $info["dn"] ?? "";
         } else {
             $filename = self::getUrlPath($url);
         }
-        return substr($filename, 0, self::MAXFILELEN);
+        return self::clipFilename($filename);
     }
     public static function formatBytes($size, $precision = 2)
     {
@@ -483,6 +484,7 @@ class Helper
             return false;
         }
         $checkFile = $dir . "/.lastmodified";
+
         if (!file_exists($checkFile)) {
             $time = \filemtime($dir);
             file_put_contents($checkFile, $time);
diff --git a/lib/Tools/folderScan.php b/lib/Tools/folderScan.php
index 98c2d4a..c3b4daa 100644
--- a/lib/Tools/folderScan.php
+++ b/lib/Tools/folderScan.php
@@ -14,7 +14,7 @@ class folderScan
     {
         $this->user = $user ?? Helper::getUID();
         $this->path = $path ?? $this->getDefaultPath();
-        $this->realDir = $realDir ?? Helper::getLocalFolder($this->path);
+        $this->realDir = Helper::getLocalFolder(Helper::getDownloadDir());
     }
 
     public function getDefaultPath()