WIP: API Handler

.travis.yml

@@ -0,0 +1,35 @@
+language: php
+php:
+  - 7.1
+  - 7.2
+
+env:
+  global:
+    - APP_NAME=ocdownloader
+    - PHP_COVERAGE=FALSE
+  matrix:
+    - DB=sqlite SERVER=nextcloud/travis_ci/master SERVER_BRANCH=master
+    - DB=mysql SERVER=nextcloud/travis_ci/master SERVER_BRANCH=master PHP_COVERAGE=TRUE
+    - DB=pgsql SERVER=nextcloud/travis_ci/master SERVER_BRANCH=master
+
+matrix:
+  fast_finish: true
+
+# branches:
+#   only:
+#     - master
+    #- /^stable\d+(\.\d+)?$/
+
+before_install:
+  - wget https://raw.githubusercontent.com/$SERVER/before_install.sh
+  - . ./before_install.sh "$APP_NAME" "$SERVER_BRANCH" "$DB"
+  - cd ../core || cd ../server
+  - php occ app:enable $APP_NAME
+
+before_script:
+  # Test lint
+  - cd apps/$APP_NAME
+  - find . -name \*.php -exec php -l "{}" \;
+
+script:
+    - echo hello test

README.md

@@ -13,6 +13,21 @@ UWP Windows 8.1/10 app: https://github.com/e-alfred/ocDownloader_WindowsDesktop
 
 If you want to write your own app or extension, this would be highly welcome. ocDownloader has an API (look at controller/lib/api.php here: https://github.com/e-alfred/ocdownloader/blob/master/controller/lib/api.php) that allows you to add and list downloads using ocDownloader.
 
+
+## New Features
+* Provide nextcloud API  
+* Implement Backends  
+
+## TO DO
+* API Count, Cleanup, Hide, Pause, Remove  
+* Simplify API Syntax
+* UI Use API   
+* Single Page Aplication UI  
+* Use Nextcloud Theme
+* Cleanup Code
+* Integration Tests
+* Unit Tests 
+
 ## ARIA2 installation
 You have to install Aria2 on your system. To do this on Debian/Ubuntu you can use the following command:
 

appinfo/app.php

@@ -14,7 +14,7 @@
 \OC::$server->getNavigationManager()->add([
     'id' => 'ocdownloader',
     'order' => 10,
-    'href' => \OC::$server->getURLGenerator()->linkToRoute('ocdownloader.Index.Add'),
+    'href' => \OC::$server->getURLGenerator()->linkToRoute('ocdownloader.Index.All'),
     'icon' => \OC::$server->getURLGenerator()->imagePath('ocdownloader', 'ocdownloader.svg'),
     'name' => 'ocDownloader'
 ]);

appinfo/application.php

@@ -14,105 +14,110 @@
 use OCP\AppFramework\App;
 use OCP\IContainer;
 
+use OC\AppFramework\Utility\SimpleContainer;
+
+use OCA\ocDownloader\Service\BackendService;
+use \OCA\ocDownloader\Config\IBackendProvider;
+
 use OCA\ocDownloader\Controller\Index;
-use OCA\ocDownloader\Controller\HttpDownloader;
-use OCA\ocDownloader\Controller\FtpDownloader;
-use OCA\ocDownloader\Controller\YTDownloader;
-use OCA\ocDownloader\Controller\BTDownloader;
 use OCA\ocDownloader\Controller\Queue;
 use OCA\ocDownloader\Controller\Updater;
 use OCA\ocDownloader\Controller\PersonalSettings;
 use OCA\ocDownloader\Controller\AdminSettings;
 
-class Application extends App
+
+class Application extends App implements IBackendProvider
 {
-    public function __construct(array $URLParams = array())
-    {
-        parent::__construct('ocdownloader', $URLParams);
-        $container = $this->getContainer();
-
-        $container->registerService('CurrentUID', function (IContainer $Container) {
-            $User = $Container->query('ServerContainer')->getUserSession()->getUser();
-            return($User) ? $User->getUID() : '';
-        });
-
-        $container->registerService('IndexController', function (IContainer $Container) {
-            return new Index(
-                $Container->query('AppName'),
-                $Container->query('Request'),
-                $Container->query('CurrentUID'),
-                $Container->getServer()->getL10N('ocdownloader')
-            );
-        });
-
-        $container->registerService('HttpDownloaderController', function (IContainer $Container) {
-            return new HttpDownloader(
-                $Container->query('AppName'),
-                $Container->query('Request'),
-                $Container->query('CurrentUID'),
-                $Container->getServer()->getL10N('ocdownloader')
-            );
-        });
-
-        $container->registerService('FtpDownloaderController', function (IContainer $Container) {
-            return new FtpDownloader(
-                $Container->query('AppName'),
-                $Container->query('Request'),
-                $Container->query('CurrentUID'),
-                $Container->getServer()->getL10N('ocdownloader')
-            );
-        });
-
-        $container->registerService('YTDownloaderController', function (IContainer $Container) {
-            return new YTDownloader(
-                $Container->query('AppName'),
-                $Container->query('Request'),
-                $Container->query('CurrentUID'),
-                $Container->getServer()->getL10N('ocdownloader')
-            );
-        });
-
-        $container->registerService('BTDownloaderController', function (IContainer $Container) {
-            return new BTDownloader(
-                $Container->query('AppName'),
-                $Container->query('Request'),
-                $Container->query('CurrentUID'),
-                $Container->getServer()->getL10N('ocdownloader')
-            );
-        });
-
-        $container->registerService('QueueController', function (IContainer $Container) {
-            return new Queue(
-                $Container->query('AppName'),
-                $Container->query('Request'),
-                $Container->query('CurrentUID'),
-                $Container->getServer()->getL10N('ocdownloader')
-            );
-        });
-
-        $container->registerService('UpdaterController', function (IContainer $Container) {
-            return new Updater(
-                $Container->query('AppName'),
-                $Container->query('Request'),
-                $Container->getServer()->getL10N('ocdownloader')
-            );
-        });
-
-        $container->registerService('AdminSettingsController', function (IContainer $Container) {
-            return new AdminSettings(
-                $Container->query('AppName'),
-                $Container->query('Request'),
-                $Container->getServer()->getL10N('ocdownloader')
-            );
-        });
-
-        $container->registerService('PersonalSettingsController', function (IContainer $Container) {
-            return new PersonalSettings(
-                $Container->query('AppName'),
-                $Container->query('Request'),
-                $Container->query('CurrentUID'),
-                $Container->getServer()->getL10N('ocdownloader')
-            );
-        });
-    }
+	public function __construct (Array $URLParams = Array ())
+	{
+		parent::__construct ('ocdownloader', $URLParams);
+		$container = $this->getContainer ();
+
+		$backendService = $container->query('OCA\\ocDownloader\\Service\\BackendService');
+		$backendService->registerBackendProvider($this);
+		//$backendService->getBackends();
+
+
+		$container->registerService ('CurrentUID', function (IContainer $Container)
+		{
+			$User = $Container->query ('ServerContainer')->getUserSession ()->getUser ();
+			return ($User) ? $User->getUID () : '';
+		});
+
+		$container->registerService ('IndexController', function (IContainer $Container)
+		{
+	      	return new Index
+			(
+		        $Container->query ('AppName'),
+		        $Container->query ('Request'),
+						$Container->query ('CurrentUID'),
+						$Container->getServer ()->getL10N ('ocdownloader')
+	      	);
+	    });
+
+
+		$container->registerService ('QueueController', function (IContainer $Container)
+		{
+	      	return new Queue
+			(
+		        $Container->query ('AppName'),
+		        $Container->query ('Request'),
+						$Container->query ('CurrentUID'),
+						$Container->getServer ()->getL10N ('ocdownloader')
+	      	);
+	    });
+
+		$container->registerService ('UpdaterController', function (IContainer $Container)
+		{
+	      	return new Updater
+			(
+		        $Container->query ('AppName'),
+		        $Container->query ('Request'),
+						$Container->getServer ()->getL10N ('ocdownloader')
+	      	);
+	    });
+
+		$container->registerService ('AdminSettingsController', function (IContainer $Container)
+		{
+	      	return new AdminSettings
+			(
+		        $Container->query ('AppName'),
+		        $Container->query ('Request'),
+						$Container->getServer ()->getL10N ('ocdownloader')
+	      	);
+	    });
+
+		$container->registerService ('PersonalSettingsController', function (IContainer $Container)
+		{
+	      	return new PersonalSettings
+			(
+		        $Container->query ('AppName'),
+		        $Container->query ('Request'),
+						$Container->query ('CurrentUID'),
+						$Container->getServer ()->getL10N ('ocdownloader')
+	      	);
+	    });
+
+/*	 $container->registerService('APIController', function(SimpleContainer $Container)  {
+				return new ApiController
+		(
+					$Container->query ('AppName'),
+					$Container->query ('Request'),
+				);
+		});*/
+
+}
+
+	public function getBackends() {
+		$container = $this->getContainer();
+
+		$backends = [
+			$container->query('OCA\ocDownloader\Backend\MagnetBackend'),
+		  $container->query('OCA\ocDownloader\Backend\YTDLBackend'),
+			$container->query('OCA\ocDownloader\Backend\HttpBackend'),
+			$container->query('OCA\ocDownloader\Backend\FtpBackend'),
+		];
+
+		return $backends;
+	}
 }

appinfo/info.xml

@@ -20,4 +20,5 @@
 		<nextcloud min-version="14" max-version="16" />
 		<lib>curl</lib>
 	</dependencies>
+	<namespace>ocDownloader</namespace>
 </info>

appinfo/routes.php

@@ -16,7 +16,7 @@
     'routes' => [
         // Index
         ['name' => 'Index#Add', 'url' => '/add', 'verb' => 'GET'],
-        ['name' => 'Index#All', 'url' => '/all', 'verb' => 'GET'],
+        ['name' => 'Index#All', 'url' => '/', 'verb' => 'GET'],
         ['name' => 'Index#Completes', 'url' => '/completes', 'verb' => 'GET'],
         ['name' => 'Index#Actives', 'url' => '/actives', 'verb' => 'GET'],
         ['name' => 'Index#Waitings', 'url' => '/waitings', 'verb' => 'GET'],
@@ -58,37 +58,14 @@
         ['name' => 'PersonalSettings#Get', 'url' => '/personalsettings/get', 'verb' => 'GET'],
 
         // Updater
-        ['name' => 'Updater#Check', 'url' => '/updater/check', 'verb' => 'GET']
+        ['name' => 'Updater#Check', 'url' => '/updater/check', 'verb' => 'GET'],
+
+    ],
+    'ocs' => [
+      //API
+      ['name' => 'Api#Handler', 'url' => '/api/handler', 'verb' => 'POST'],
+      ['name' => 'Api#Add',    'url' => '/api/add', 'verb' => 'POST'],
+      ['name' => 'Api#getQueue', 'url' => '/api/queue', 'verb' => 'POST'],
+      ['name' => 'Api#getCount', 'url' => '/api/queue/count', 'verb' => 'POST']
     ]
 ));
-
-$APIBasePath = '/apps/ocdownloader/api/';
-\OCP\API::register(
-    'POST',
-    $APIBasePath.'version',
-    function ($URLParams) {
-        return new \OC\OCS\Result(\OCA\ocDownloader\Controller\Lib\API::checkAddonVersion($_POST['AddonVersion']));
-    },
-    'ocdownloader',
-    \OCP\API::USER_AUTH
-);
-
-\OCP\API::register(
-    'GET',
-    $APIBasePath.'queue/get',
-    function ($URLParams) {
-        return new \OC\OCS\Result(\OCA\ocDownloader\Controller\Lib\API::getQueue());
-    },
-    'ocdownloader',
-    \OCP\API::USER_AUTH
-);
-
-\OCP\API::register(
-    'POST',
-    $APIBasePath.'add',
-    function ($URLParams) {
-        return new \OC\OCS\Result(\OCA\ocDownloader\Controller\Lib\API::add($_POST['URL']));
-    },
-    'ocdownloader',
-    \OCP\API::USER_AUTH
-);

controller/adminsettings.php

@@ -17,8 +17,8 @@
 use OCP\IL10N;
 use OCP\IRequest;
 
-use OCA\ocDownloader\Controller\Lib\Settings;
-use OCA\ocDownloader\Controller\Lib\Tools;
+use OCA\ocDownloader\Lib\Settings;
+use OCA\ocDownloader\Lib\Tools;
 
 class AdminSettings extends Controller
 {