Redesign and allow people to upload in the multiple locations

ajax/locations.php

@@ -0,0 +1,66 @@
+<?php
+  // Restrict access // ToDo: Enabled for current user?
+  if (!\OCP\User::isLoggedIn() || !\OCP\App::isEnabled('flowupload')) {
+  	\OC_Response::setStatus(403);
+  }
+
+  function getAllLocations() {
+    // ToDo: Return locations from database
+    return array(
+      array(
+        'id' => 0,
+        'location' => '/flowupload/',
+        'pause' => 0,
+        'uploading' => 0,
+        'completed' => 0,
+        'aborted' => 0
+      )
+    );
+  }
+
+  function addNewLocation($location) {
+    // ToDo: Add to database
+  	$location = preg_replace('/(\.\.\/|~|\/\/)/i', '', '/'.$location.'/');
+    $location = preg_replace('/[^a-z0-9äöüß \(\)\.\-_\/]/i', '', $location);
+  	$location = trim($location);
+
+    return $location;
+  }
+
+  if ($_SERVER['REQUEST_METHOD'] === 'POST') {
+    $_POST = json_decode(file_get_contents('php://input'), true);
+
+    if (isset($_POST['location']) && \OC\Files\Filesystem::isValidPath($_POST['location'])) {
+      $locations = getAllLocations();
+
+      foreach ($locations as $location) {
+        if ($location['location'] === $_POST['location']) {
+          \OC_Response::setStatus(409);
+          die();
+        }
+      }
+
+      \OC_Response::setStatus(201);
+
+      $location = addNewLocation($_POST['location']);
+
+      echo json_encode(array(
+          'id' => preg_replace('#/#', '', $location),
+          'location' => $location,
+          'pause' => 0,
+          'uploading' => 0,
+          'completed' => 0,
+          'aborted' => 0
+        ));
+    }
+    else {
+      \OC_Response::setStatus(400);
+    }
+
+    die();
+  }
+
+  echo json_encode(array(
+    "locations" => getAllLocations()
+  ));
+?>

ajax/upload.php

@@ -11,7 +11,8 @@
 // Directory definitions
 $userhome = OC_User::getHome(OC_User::getUser());
 $temp = $userhome.'/.flowupload_tmp/';
-$result = '/flowupload/';
+$result = $_REQUEST['target'] ?? '/flowupload/';
+$result = '/'.$result.'/';
 
 // Initialize uploader
 $config = new \Flow\Config();

appinfo/info.xml

@@ -3,10 +3,11 @@
     <id>flowupload</id>
     <name>Flow Upload</name>
     <description>Provides functions to upload large files with your HTML5-Browser.</description>
-    <version>0.0.7</version>
+    <version>0.1.0</version>
     <licence>AGPL</licence>
     <author>Patrick Schwarz</author>
     <author>e-alfred</author>
+    <author>NastuzziSamy</author>
     <category>tools</category>
     <website>https://github.com/e-alfred/flowupload</website>
     <repository>https://github.com/e-alfred/flowupload</repository>

appinfo/routes.php

@@ -4,4 +4,7 @@
 	->actionInclude('flowupload/index.php');
 
 $this->create('flowupload_ajax_upload', 'ajax/upload.php')
-	->actionInclude('flowupload/ajax/upload.php');
+	->actionInclude('flowupload/ajax/upload.php');
+
+$this->create('flowupload_ajax_locations', 'ajax/locations.php')
+	->actionInclude('flowupload/ajax/locations.php');

index.php

@@ -5,7 +5,19 @@
 \OCP\Util::addScript('flowupload', 'angular');
 \OCP\Util::addScript('flowupload', 'ng-flow-standalone');
 \OCP\Util::addScript('flowupload', 'app');
+\OCP\Util::addScript('flowupload', 'script');
 \OCP\Util::addStyle('flowupload', 'bootstrap-combined');
 
+$locations = array(
+  array(
+    'id' => 0,
+    'location' => '/flowupload/',
+    'nbrInPause' => 0,
+    'nbrUploading' => 0,
+    'nbrCompleted' => 0,
+    'nbrAborted' => 0,
+  )
+);
+
 $tpl = new OCP\Template("flowupload", "main", "user");
 $tpl->printPage();

js/app.js

@@ -2,30 +2,135 @@
 'use strict';
 
 /**
- * The main app module
- * @name app
- * @type {angular.Module}
- */
-var app = angular.module('app', ['flow'])
-.config(['flowFactoryProvider', function (flowFactoryProvider) {
-  flowFactoryProvider.defaults = {
-    target: 'ajax/upload.php',
-    permanentErrors: [403, 404, 500, 501],
-    maxChunkRetries: 2,
-    chunkRetryInterval: 5000,
-    simultaneousUploads: 4
-  };
-  flowFactoryProvider.on('catchAll', function (event) {
-    console.log('catchAll', arguments);
-  });
+* The main app module
+* @name app
+* @type {angular.Module}
+*/
+var app = angular.module('app', ['flow']).config(['flowFactoryProvider', function (flowFactoryProvider) {
+	flowFactoryProvider.defaults = {
+		target: 'ajax/upload.php',
+		permanentErrors: [403, 404, 500, 501],
+		maxChunkRetries: 2,
+		chunkRetryInterval: 5000,
+		simultaneousUploads: 4
+	};
+	flowFactoryProvider.on('catchAll', function ($event, file) {
+		if ($event === 'fileAdded')
+			console.log(file);
+	});
 }]);
 
-app.filter('bytes', function() {
+app.filter('bytes', function () {
 	return function(bytes, precision) {
 		if (isNaN(parseFloat(bytes)) || bytes == 0 || !isFinite(bytes)) return '-';
 		if (typeof precision === 'undefined') precision = 1;
+
 		var units = ['bytes', 'kB', 'MB', 'GB'],
-			number = Math.floor(Math.log(bytes) / Math.log(1024));
+		number = Math.floor(Math.log(bytes) / Math.log(1024));
+
 		return (bytes / Math.pow(1024, Math.floor(number))).toFixed(precision) +  ' ' + units[number];
 	}
-});
+});
+
+app.controller('location', function ($scope) {
+	$scope.init = function (id, name) {
+		$scope.locationId = id;
+		$scope.locationName = name;
+	}
+
+	$scope.seeUploads = function ($event, type) {
+		$event.stopPropagation();
+		$event.preventDefault();
+
+		console.log($scope);
+
+		$('#locations li.active').removeClass('active');
+
+		$($event.currentTarget).addClass('active');
+	};
+
+	$scope.beforeUploading = {
+		query: function (flowFile, flowChunk) {
+			// function will be called for every request
+			console.log('File', flowFile);
+			console.log('Chunk', flowChunk);
+			return {
+				//id: $scope.locationId
+				// Temporary:
+				target: $scope.locationName
+			};
+		}
+	};
+});
+
+app.controller('flow', function ($scope) {
+	$scope.locationId = 0;
+
+	$scope.$on('changeLocation', function (event, id, $flow) {
+		$scope.locationId = id;
+		$scope.$flow = $flow;
+
+		console.log(id);
+		console.log($flow);
+	});
+});
+
+app.controller('locations', function ($rootScope, $scope, $http) {
+	$scope.isOpen = false;
+
+	$scope.reloadLocations = function () {
+		setTimeout(function () {
+			if ($scope.locationId === undefined)
+				$($($('.locations')[0]).find('a')).click();
+			else
+				$($('#location-' + $scope.locationId).find('a')).click();
+		}, 100);
+	}
+
+	$scope.setLocation = function (id, $flow) {
+		$rootScope.$broadcast('changeLocation', id, $flow);
+		$scope.$flow = $flow;
+		$scope.locationId = id;
+
+		$('.locations').each(function () {
+			if ($(this).attr('id') === 'location-' + id)
+				$(this).addClass('open');
+			else
+				$(this).removeClass('open');
+			}
+		);
+	}
+
+	$scope.getLocations = function () {
+		$http({
+			method: "GET",
+			url: "ajax/locations.php"
+		}).then(function mySuccess(response) {
+				$scope.locations = response.data.locations;
+
+				$scope.locationId = $scope.locations[0].id;
+			}, function myError(response) {
+				$scope.locations = {};
+			}
+		);
+	};
+
+	$scope.addNewLocation = function () {
+		$http({
+			method : "POST",
+			url : "ajax/locations.php",
+			data : {
+				location: $('#newLocationName').val()
+			}
+		}).then(function mySuccess(response) {
+			$('#newLocationName').val('');
+
+			$scope.locationId = response.data.id;
+			$scope.locations.push(response.data);
+		}, function myError(response) {
+			$scope.locations = {};
+		});
+	};
+
+	$scope.getLocations();
+});