Remove original file from versions path

This commit is contained in:
Philipp Lang 2021-09-17 07:52:06 +00:00
parent 0457bd9cff
commit 04f31bbfcf
2 changed files with 12 additions and 16 deletions

View File

@ -29,7 +29,6 @@ class ImageResizer
public function generate(MediaPath $file): void
{
$this->file = $file;
$this->disk->put($this->file->versionsPath(), $this->file->get());
if ($this->file->compressor()->shouldGenerateVersions()) {
$this->generateVersions();

View File

@ -43,8 +43,8 @@ class ResizerTest extends TestCase
$media->put('/pages/test.jpg', $file->get());
Event::fire('media.file.upload', [null, '/pages/test.jpg', null]);
$this->assertFileCount(2, 'pages');
$this->assertHasFile('pages/test.jpg');
$this->assertFileCount(1, 'pages');
$this->assertDoesntHaveFile('pages/test.jpg');
$this->assertHasFile('pages/test-500x600.jpg');
}
@ -59,8 +59,7 @@ class ResizerTest extends TestCase
$media->put('/pages/test.jpg', $file->get());
Event::fire('media.file.upload', [null, 'pages/test.jpg', null]);
$this->assertFileCount(2, 'pages');
$this->assertHasFile('pages/test.jpg');
$this->assertFileCount(1, 'pages');
$this->assertHasFile('pages/test-500x600.jpg');
}
@ -90,7 +89,7 @@ class ResizerTest extends TestCase
$media->put('/pages/neu/test.jpg', $file->get());
Event::fire('media.file.upload', [null, '/pages/neu/test.jpg', null]);
$this->assertFileCount(2, 'pages/neu');
$this->assertFileCount(1, 'pages/neu');
}
public function testGenerateSizeIfSizeIsSmallerWithSameAspectRatio(): void
@ -104,10 +103,9 @@ class ResizerTest extends TestCase
$media->put('/pages/neu/test.jpg', $file->get());
Event::fire('media.file.upload', [null, '/pages/neu/test.jpg', null]);
$this->assertFileCount(3, 'pages/neu');
$this->assertFileCount(2, 'pages/neu');
$this->assertHasFile('pages/neu/test-250x300.jpg');
$this->assertHasFile('pages/neu/test-500x600.jpg');
$this->assertHasFile('pages/neu/test.jpg');
}
public function testGenerateSizeIfSizeIsSmallerWithDifferentAspectRatio(): void
@ -135,7 +133,7 @@ class ResizerTest extends TestCase
$media->put('/pages/neu/test.jpg', $file->get());
Event::fire('media.file.upload', [null, '/pages/neu/test.jpg', null]);
$this->assertFileCount(2, 'pages/neu');
$this->assertFileCount(1, 'pages/neu');
}
public function testDontGenerateSizeIfImageWouldBeLarger(): void
@ -149,7 +147,7 @@ class ResizerTest extends TestCase
$media->put('/pages/neu/test.jpg', $file->get());
Event::fire('media.file.upload', [null, '/pages/neu/test.jpg', null]);
$this->assertFileCount(2, 'pages/neu');
$this->assertFileCount(1, 'pages/neu');
}
public function testGenerateBreakpointImage(): void
@ -163,8 +161,7 @@ class ResizerTest extends TestCase
$media->put('/pages/neu/test.jpg', $file->get());
Event::fire('media.file.upload', [null, '/pages/neu/test.jpg', null]);
$this->assertFileCount(5, 'pages/neu');
$this->assertHasFile('pages/neu/test.jpg');
$this->assertFileCount(4, 'pages/neu');
$this->assertHasFile('pages/neu/test-500x400.jpg');
$this->assertHasFile('pages/neu/test-250x400.jpg');
$this->assertHasFile('pages/neu/test-100x160.jpg');
@ -181,7 +178,7 @@ class ResizerTest extends TestCase
$media->put('/pages/test.svg', file_get_contents(__DIR__.'/stub/close.svg'));
Event::fire('media.file.upload', [null, '/pages/test.svg', null]);
$this->assertFileCount(1, 'pages');
$this->assertFileCount(0, 'pages');
}
public function testGeneratePngImage(): void
@ -195,7 +192,7 @@ class ResizerTest extends TestCase
Event::fire('media.file.upload', [null, '/pages/test.png', null]);
$this->assertHasFile('pages/test-100x100.png');
$this->assertFileCount(3, 'pages');
$this->assertFileCount(2, 'pages');
}
public function testDontUpsizeAJpgImage(): void
@ -209,7 +206,7 @@ class ResizerTest extends TestCase
Event::fire('media.file.upload', [null, '/pages/test.jpg', null]);
$this->assertHasFile('pages/test-100x100.jpg');
$this->assertFileCount(3, 'pages');
$this->assertFileCount(2, 'pages');
}
public function testDontUpsizeAPngImage(): void
@ -223,7 +220,7 @@ class ResizerTest extends TestCase
Event::fire('media.file.upload', [null, '/pages/test.png', null]);
$this->assertHasFile('pages/test-100x100.png');
$this->assertFileCount(3, 'pages');
$this->assertFileCount(2, 'pages');
}
}