Fix filename: no more double extension on download. (#2474)

LycheeOrg · Jun 25, 2024 · a0bcb4d · a0bcb4d
1 parent 907a404
commit a0bcb4d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/app/Actions/Album/Archive.php b/app/Actions/Album/Archive.php
@@ -127,6 +127,7 @@ private static function createZipTitle(Collection $albums): string
 	private static function createValidTitle(string $title): string
 	{
 		$validTitle = str_replace(self::BAD_CHARS, '', $title);
+		$validTitle = pathinfo($validTitle, PATHINFO_FILENAME);
 
 		return $validTitle !== '' ? $validTitle : 'Untitled';
 	}

diff --git a/app/Actions/Photo/Archive.php b/app/Actions/Photo/Archive.php
@@ -282,6 +282,7 @@ protected function extractFileInfo(Photo $photo, DownloadVariantType $downloadVa
 	{
 		$validFilename = str_replace(self::BAD_CHARS, '', $photo->title);
 		$baseFilename = $validFilename !== '' ? $validFilename : 'Untitled';
+		$baseFilename = pathinfo($baseFilename, PATHINFO_FILENAME);
 
 		if ($downloadVariant === DownloadVariantType::LIVEPHOTOVIDEO) {
 			$disk = $photo->size_variants->getSizeVariant(SizeVariantType::ORIGINAL)->storage_disk->value;