kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-17 11:06:36 +00:00
Code Issues Projects Releases Wiki Activity

Also delete downscaled image files when deleting an image (closes #1499)

Browse Source
This commit is contained in:
Bernd Bestel
2021-07-02 20:50:52 +02:00
parent 34ffb96ae3
commit 90b8ea15ff
2 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
controllers/FilesApiController.php
View File

@@ -25,12 +25,7 @@ class FilesApiController extends BaseApiController
throw new \Exception('Invalid filename'); throw new \Exception('Invalid filename');
} }
$filePath = $this->getFilesService()->GetFilePath($args['group'], $fileName); $this->getFilesService()->DeleteFile($args['group'], $fileName);
if (file_exists($filePath))
{
unlink($filePath);
}
return $this->EmptyApiResponse($response); return $this->EmptyApiResponse($response);
} }

32
services/FilesService.php
View File

@@ -19,11 +19,6 @@ class FilesService extends BaseService
$fileNameDownscaled = $fileNameWithoutExtension . '__downscaledto' . ($bestFitHeight ? $bestFitHeight : 'auto') . 'x' . ($bestFitWidth ? $bestFitWidth : 'auto') . '.' . $fileExtension; $fileNameDownscaled = $fileNameWithoutExtension . '__downscaledto' . ($bestFitHeight ? $bestFitHeight : 'auto') . 'x' . ($bestFitWidth ? $bestFitWidth : 'auto') . '.' . $fileExtension;
$filePathDownscaled = $this->GetFilePath($group, $fileNameDownscaled); $filePathDownscaled = $this->GetFilePath($group, $fileNameDownscaled);
if (!extension_loaded('gd'))
{
return $filePath;
}
try try
{ {
if (!file_exists($filePathDownscaled)) if (!file_exists($filePathDownscaled))
@@ -54,6 +49,33 @@ class FilesService extends BaseService
return $filePathDownscaled; return $filePathDownscaled;
} }
public function DeleteFile($group, $fileName)
{
$filePath = $this->GetFilePath($group, $fileName);
if (file_exists($filePath))
{
$fileNameWithoutExtension = pathinfo($filePath, PATHINFO_FILENAME);
$fileExtension = pathinfo($filePath, PATHINFO_EXTENSION);
if (getimagesize($filePath) !== false) // Then the file is an image
{
// Also delete all corresponding "__downscaledto" files when deleting an image
$groupFolderPath = $this->StoragePath . '/' . $group;
$files = scandir($groupFolderPath);
foreach($files as $file)
{
if (string_starts_with($file, $fileNameWithoutExtension . '__downscaledto'))
{
unlink($this->GetFilePath($group, $file));
}
}
}
unlink($filePath);
}
}
public function GetFilePath($group, $fileName) public function GetFilePath($group, $fileName)
{ {
$groupFolderPath = $this->StoragePath . '/' . $group; $groupFolderPath = $this->StoragePath . '/' . $group;