- zip implementation for users

This commit is contained in:
Peter Papp
2020-12-13 17:49:44 +01:00
parent 874b4bb768
commit 11873d06ff
16 changed files with 335 additions and 129 deletions

View File

@@ -3,9 +3,11 @@
namespace App\Http\Controllers;
use App\FileManagerFolder;
use App\Http\Tools\Editor;
use App\Http\Tools\Guardian;
use App\Share;
use App\User;
use App\Zip;
use Illuminate\Support\Arr;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\DB;
@@ -14,7 +16,11 @@ use Illuminate\Http\Request;
use App\FileManagerFile;
use Illuminate\Support\Facades\Storage;
use Illuminate\Support\Str;
use Illuminate\Http\Exceptions\HttpResponseException;
use Madnest\Madzipper\Facades\Madzipper;
use Response;
use League\Flysystem\FileNotFoundException;
use Symfony\Component\HttpKernel\Exception\HttpException;
class FileAccessController extends Controller
{
@@ -86,11 +92,36 @@ class FileAccessController extends Controller
}
// Store user download size
$request->user()->record_download((int) $file->getRawOriginal('filesize'));
$request->user()->record_download((int)$file->getRawOriginal('filesize'));
return $this->download_file($file);
}
/**
* Get generated zip for user
*
* @param $id
* @return \Symfony\Component\HttpFoundation\StreamedResponse
*/
public function get_zip($id)
{
$zip = Zip::where('id', $id)
->where('user_id', Auth::id())
->first();
$zip_path = 'zip/' . $zip->basename;
$header = [
"Content-Type" => 'application/zip',
"Content-Length" => Storage::size($zip_path),
"Accept-Ranges" => "bytes",
"Content-Range" => "bytes 0-600/" . Storage::size($zip_path),
"Content-Disposition" => "attachment; filename=" . $zip->basename,
];
return Storage::download($zip_path, $zip->basename, $header);
}
/**
* Get file public
*
@@ -118,7 +149,7 @@ class FileAccessController extends Controller
$this->check_file_access($shared, $file);
// Store user download size
User::find($shared->user_id)->record_download((int) $file->getRawOriginal('filesize'));
User::find($shared->user_id)->record_download((int)$file->getRawOriginal('filesize'));
return $this->download_file($file);
}

View File

@@ -10,6 +10,7 @@ use App\Http\Requests\FileFunctions\UploadRequest;
use App\Http\Tools\Demo;
use Illuminate\Contracts\Routing\ResponseFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use App\Http\Controllers\Controller;
use App\Http\Tools\Guardian;
@@ -175,7 +176,7 @@ class EditItemsController extends Controller
return Demo::response_204();
}
foreach($request->input('data') as $file){
foreach ($request->input('data') as $file) {
$unique_id = $file['unique_id'];
// Check permission to delete item for authenticated editor
@@ -204,9 +205,9 @@ class EditItemsController extends Controller
// Delete item
Editor::delete_item($file, $unique_id);
// Return response
// Return response
}
return response(null, 204);
return response(null, 204);
}
/**
@@ -232,7 +233,7 @@ class EditItemsController extends Controller
// Check shared permission
if (!is_editor($shared)) abort(403);
foreach($request->input('data') as $file){
foreach ($request->input('data') as $file) {
$unique_id = $file['unique_id'];
// Get file|folder item
@@ -316,6 +317,28 @@ class EditItemsController extends Controller
return $new_file;
}
/**
* User download multiple files via zip
*
* @param Request $request
* @return string
*/
public function user_zip_multiple_files(Request $request)
{
// Get requested files
$files = FileManagerFile::whereUserId(Auth::id())
->whereIn('unique_id', $request->input('files'))
->get();
$zip = Editor::zip_files($files);
// Get file
return response([
'url' => route('zip', $zip->id),
'name' => $zip->basename,
], 200);
}
/**
* Move item for authenticated master|editor user
*
@@ -341,7 +364,7 @@ class EditItemsController extends Controller
$shared = get_shared($request->cookie('shared_token'));
// Check access to requested directory
Guardian::check_item_access($to_unique_id, $shared);
Guardian::check_item_access($to_unique_id, $shared);
}
// Move item
@@ -374,7 +397,7 @@ class EditItemsController extends Controller
// Check shared permission
if (!is_editor($shared)) abort(403);
foreach($request->input('items') as $item) {
foreach ($request->input('items') as $item) {
$unique_id = $item['unique_id'];
$moving_unique_id = $unique_id;