pisto/ncdownloader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tidying up

Browse Source
This commit is contained in:
huangjx
2022-07-24 10:54:02 +08:00
parent 96c7128ef7
commit 3a00325042
32 changed files with 146 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
appinfo/application.php
View File

@@ -4,12 +4,12 @@ namespace OCA\NCDownloader\AppInfo;
use OCA\NCDownloader\Controller\Aria2Controller;
use OCA\NCDownloader\Controller\MainController;
use OCA\NCDownloader\Controller\YoutubeController;
use OCA\NCDownloader\Tools\Aria2;
use OCA\NCDownloader\Tools\Client;
use OCA\NCDownloader\Controller\YtdlController;
use OCA\NCDownloader\Aria2\Aria2;
use OCA\NCDownloader\Http\Client;
use OCA\NCDownloader\Tools\Helper;
use OCA\NCDownloader\Tools\Settings;
use OCA\NCDownloader\Tools\Youtube;
use OCA\NCDownloader\Db\Settings;
use OCA\NCDownloader\Ytdl\Ytdl;
use OCP\AppFramework\App;
use OCP\IContainer;
use Symfony\Component\DomCrawler\Crawler;
@@ -32,9 +32,9 @@ class Application extends App
return new Aria2(Helper::getAria2Config($this->uid));
});
$container->registerService('Youtube', function (IContainer $container) {
$config = Helper::getYoutubeConfig($this->uid);
return new Youtube($config);
$container->registerService('Ytdl', function (IContainer $container) {
$config = Helper::getYtdlConfig($this->uid);
return new Ytdl($config);
});
$container->registerService('Settings', function (IContainer $container) {
@@ -49,7 +49,7 @@ class Application extends App
\OC::$server->getL10N('ncdownloader'),
//\OC::$server->getRootFolder(),
$container->query('Aria2'),
$container->query('Youtube')
$container->query('Ytdl')
);
});
@@ -63,14 +63,14 @@ class Application extends App
$container->query('Aria2')
);
});
$container->registerService('YoutubeController', function (IContainer $container) {
return new YoutubeController(
$container->registerService('YtdlController', function (IContainer $container) {
return new YtdlController(
$container->query('AppName'),
$container->query('Request'),
$container->query('UserId'),
\OC::$server->getL10N('ncdownloader'),
$container->query('Aria2'),
$container->query('Youtube')
$container->query('Ytdl')
);
});
$container->registerService('httpClient', function () {

14
appinfo/routes.php
View File

@@ -9,10 +9,10 @@ return [
['name' => 'Aria2#Action', 'url' => '/aria2/{path}', 'verb' => 'POST'],
['name' => 'Aria2#getStatus', 'url' => '/status/{path}', 'verb' => 'POST'],
['name' => 'Main#scanFolder', 'url' => '/scanfolder', 'verb' => 'POST'],
['name' => 'Youtube#Index', 'url' => '/youtube/get', 'verb' => 'POST'],
['name' => 'Youtube#Download', 'url' => '/youtube/new', 'verb' => 'POST'],
['name' => 'Youtube#Delete', 'url' => '/youtube/delete', 'verb' => 'POST'],
['name' => 'Youtube#Redownload', 'url' => '/youtube/redownload', 'verb' => 'POST'],
['name' => 'Ytdl#Index', 'url' => '/ytdl/get', 'verb' => 'POST'],
['name' => 'Ytdl#Download', 'url' => '/ytdl/new', 'verb' => 'POST'],
['name' => 'Ytdl#Delete', 'url' => '/ytdl/delete', 'verb' => 'POST'],
['name' => 'Ytdl#Redownload', 'url' => '/ytdl/redownload', 'verb' => 'POST'],
['name' => 'Search#Execute', 'url' => '/search', 'verb' => 'POST'],
// AdminSettings
['name' => 'Settings#Admin', 'url' => '/admin/save', 'verb' => 'POST'],
@@ -21,9 +21,9 @@ return [
['name' => 'Settings#aria2Get', 'url' => '/personal/aria2/get', 'verb' => 'POST'],
['name' => 'Settings#aria2Save', 'url' => '/personal/aria2/save', 'verb' => 'POST'],
['name' => 'Settings#aria2Delete', 'url' => '/personal/aria2/delete', 'verb' => 'POST'],
['name' => 'Settings#youtubeGet', 'url' => '/personal/youtube-dl/get', 'verb' => 'POST'],
['name' => 'Settings#youtubeSave', 'url' => '/personal/youtube-dl/save', 'verb' => 'POST'],
['name' => 'Settings#youtubeDelete', 'url' => '/personal/youtube-dl/delete', 'verb' => 'POST'],
['name' => 'Settings#ytdlGet', 'url' => '/personal/ytdl/get', 'verb' => 'POST'],
['name' => 'Settings#ytdlSave', 'url' => '/personal/ytdl/save', 'verb' => 'POST'],
['name' => 'Settings#ytdlDelete', 'url' => '/personal/ytdl/delete', 'verb' => 'POST'],
['name' => 'Settings#getSettings', 'url' => '/getsettings', 'verb' => 'POST'],
],
];