- mad zipper hotfix

This commit is contained in:
Peter Papp
2021-05-17 11:49:19 +02:00
parent 08099b9671
commit 61824a511c
7 changed files with 1979 additions and 278 deletions

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -149,6 +149,7 @@ class EditItemsController extends Controller
*
* @param Request $request
* @return string
* @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
*/
public function zip_multiple_files(Request $request)
{

View File

@@ -12,7 +12,6 @@ use App\Models\File as UserFile;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\File;
use Illuminate\Support\Facades\Storage;
use Madnest\Madzipper\Facades\Madzipper;
use League\Flysystem\FileNotFoundException;
use App\Http\Requests\FileFunctions\RenameItemRequest;
use Symfony\Component\HttpKernel\Exception\HttpException;
@@ -63,7 +62,8 @@ class FileManagerService
$zip_name = Str::random(16) . '-' . Str::slug($requested_folder->name) . '.zip';
// Create zip
$zip = Madzipper::make($disk_local->path("zip/$zip_name"));
$zipper = new \Madnest\Madzipper\Madzipper;
$zip = $zipper->make($disk_local->path("zip/$zip_name"));
// Add files to zip
foreach ($files as $file) {
@@ -77,7 +77,7 @@ class FileManagerService
}
// Close zip
$zip->close();
//$zip->close();
// Delete temporary files
if (! is_storage_driver('local')) {
@@ -122,7 +122,8 @@ class FileManagerService
$zip_name = Str::random(16) . '.zip';
// Create zip
$zip = Madzipper::make($disk_local->path("zip/$zip_name"));
$zipper = new \Madnest\Madzipper\Madzipper;
$zip = $zipper->make($disk_local->path("zip/$zip_name"));
// Add files to zip
$files->each(function ($file) use ($zip, $disk_local) {
@@ -134,7 +135,7 @@ class FileManagerService
});
// Close zip
$zip->close();
//$zip->close();
// Delete temporary files
if (! is_storage_driver('local')) {

View File

@@ -229,7 +229,7 @@ return [
'Image' => Intervention\Image\Facades\Image::class,
'Stripe' => Cartalyst\Stripe\Laravel\Facades\Stripe::class,
'Crawler' => Jaybizzle\LaravelCrawlerDetect\Facades\LaravelCrawlerDetect::class,
'Madzipper' => Madnest\Madzipper\Madzipper::class,
//'Madzipper' => Madnest\Madzipper\Madzipper::class,
],
'deploy_secret' => env('APP_DEPLOY_SECRET'),

View File

@@ -11,9 +11,6 @@
processIsolation="false"
stopOnFailure="false">
<testsuites>
<testsuite name="Unit">
<directory suffix="Test.php">./tests/Unit</directory>
</testsuite>
<testsuite name="Feature">
<directory suffix="Test.php">./tests/Feature</directory>

View File

@@ -1,18 +0,0 @@
<?php
namespace Tests\Unit;
use PHPUnit\Framework\TestCase;
class ExampleTest extends TestCase
{
/**
* A basic test example.
*
* @return void
*/
public function test_example()
{
$this->assertTrue(true);
}
}