From fd11904f89f9874b4c7639e27eac97e56b49668d Mon Sep 17 00:00:00 2001
From: xevidos <xevidos@gmail.com>
Date: Tue, 10 Dec 2019 14:09:24 -0500
Subject: [PATCH] Continued work on new uploader

---
 components/filemanager/controller.php | 17 ++++--
 components/filemanager/init.js        | 84 +++++++++++++++++----------
 2 files changed, 65 insertions(+), 36 deletions(-)

diff --git a/components/filemanager/controller.php b/components/filemanager/controller.php
index 9627125..580b455 100755
--- a/components/filemanager/controller.php
+++ b/components/filemanager/controller.php
@@ -287,9 +287,6 @@ switch( $action ) {
 	
 	case 'upload':
 		
-		echo var_dump( $_GET );
-		echo var_dump( $_POST );
-		
 		if( ! isset( $_POST["data"] ) ) {
 			
 			$response["status"] = "error";
@@ -299,7 +296,19 @@ switch( $action ) {
 			exit( json_encode( $response ) );
 		}
 		
-		$blob = $_POST["data"];
+		if( $_POST["data"] !== "data:" ) {
+			
+			$blob = @file_get_contents( $_POST["data"] );
+		} else {
+			
+			$response["status"] = "error";
+			$response["data"] = array(
+				"error" => "No blob given",
+				"data" => $_POST["data"],
+			);
+			exit( json_encode( $response ) );
+		}
+		
 		$response = $Filemanager->upload( $path, $blob );
 	break;
 	
diff --git a/components/filemanager/init.js b/components/filemanager/init.js
index 0452ca9..870bb40 100755
--- a/components/filemanager/init.js
+++ b/components/filemanager/init.js
@@ -1647,7 +1647,7 @@
 					
 					entry.file( function( file ) {
 						
-						_this.upload_blobs( file, destination );
+						_this.upload_blobs( file, destination + file.name );
 					});
 				} else if( entry.isDirectory ) {
 					
@@ -1656,60 +1656,80 @@
 			}
 		},
 		
-		upload_blob: async function( blob, path ) {
+		upload_blob: function( blob, path ) {
 			
-			let _this = codiad.filemanager;
-			let form = new FormData();
-			
-			form.append( 'path', path );
-			form.append( 'data', blob );
-			$.ajax({
-				type: 'POST',
-				url: _this.controller + '?action=upload',
-				data: form,
-				processData: false,
-				contentType: false,
-			}).done( function( data ) {
+			return new Promise( function( resolve, reject ) {
 				
-				console.log( data );
+				let _this = codiad.filemanager;
+				let form = new FormData();
+				
+				form.append( 'path', path );
+				form.append( 'data', blob );
+				$.ajax({
+					type: 'POST',
+					url: _this.controller + '?action=upload',
+					data: form,
+					processData: false,
+					contentType: false,
+					success: function( data ) {
+						
+						resolve( data );
+					},
+					error: function( data ) {
+						
+						reject( data );
+					},
+				});
 			});
 		},
 		
-		upload_blobs: function( file, path ) {
+		upload_blobs: function( file, path, start = 0, status = null ) {
 			
 			console.log( file, path );
 			let _this = codiad.filemanager;
-			let blob_size = 1024;
+			let blob_size = 1024*1024;
 			let total_size = file.size;
-			let current = 0 + blob_size;
+			
+			if( total_size < blob_size ) {
+				
+				blob_size = total_size;
+			}
+			
+			let current = start + blob_size;
 			let reader = new FileReader();
 			let blob = file.slice( current, current + blob_size );
 			let upload_status = null;
-			let file_path = path;
 			
-			if( path.charAt( path.length - 1 ) !== '/' ) {
+			if( status === null ) {
 				
-				file_path = file_path + '/';
+				status = $().toastmessage( 'showToast', {
+					text: 'Uploading blobs 0%',
+					sticky: true,
+					position: 'top-right',
+					type: 'warning',
+				});
 			}
 			
-			
 			reader.onload = async function( e ) {
 				
-				upload_status = await _this.upload_blob( blob, file_path );
-				console.log( upload_status );
-				
-				while( current <= total_size && typeof upload_status === "Boolean" ) {
+				upload_status = await _this.upload_blob( e.target.result, path );
+				try {
 					
-					console.log( ( current / total_size ) * 100 );
-					blob = file.slice( current, current + blob_size );
-					let upload_status = await _this.upload_blob( blob, file_path );
+					console.log( upload_status )
 					
-					console.log( upload_status );
+					let result = JSON.parse( upload_status );
+					if( result.bytes > 0 && current <= total_size ) {
+						
+						status.text( ( ( current / total_size )*100 ).toFixed( 2 ) + '%' );
+						_this.upload_blobs( file, path, current, status );
+					}
+				} catch( exception ) {
 					
-					reader.readAsBinaryString( blob );
+					console.log( 'done?', upload_status );
+					console.log( exception )
 				}
 			};
-			reader.readAsBinaryString( blob );
+			reader.readAsDataURL( blob );
 		},
 		
 		upload_data: {