Fix downloading image directly from smart album (#4005)

Author: ildyria

app/Actions/Album/BaseArchive.php

@@ -25,6 +25,7 @@
 use Composer\InstalledVersions;
 use Composer\Semver\VersionParser;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Gate;
 use Safe\Exceptions\InfoException;
@@ -229,6 +230,67 @@ private function compressAlbum(AbstractAlbum $album, array &$used_dir_names, ?st
 		// TODO: Ensure that the size variant `original` for each photo is eagerly loaded as it is needed below. This must be solved in close coordination with `ArchiveAlbumRequest`.
 		$photos = $album->get_photos();
 
+		// For smart albums, get_photos() returns a paginator. We need to iterate through all pages.
+		if ($photos instanceof LengthAwarePaginator) {
+			$this->compressPhotosFromPaginator($photos, $album, $full_name_of_directory, $used_file_names, $zip);
+		} else {
+			$this->compressPhotosFromCollection($photos, $album, $full_name_of_directory, $used_file_names, $zip);
+		}
+
+		// Recursively compress sub-albums
+		if ($album instanceof Album) {
+			$sub_dirs = [];
+			// TODO: For higher efficiency, ensure that the photos of each child album together with the original size variant are eagerly loaded.
+			$sub_albums = $album->children;
+			foreach ($sub_albums as $sub_album) {
+				try {
+					$this->compressAlbum($sub_album, $sub_dirs, $full_name_of_directory, $zip);
+					// @codeCoverageIgnoreStart
+				} catch (\Throwable $e) {
+					Handler::reportSafely($e);
+				}
+				// @codeCoverageIgnoreEnd
+			}
+		}
+	}
+
+	/**
+	 * Compresses photos from a paginator by iterating through all pages.
+	 *
+	 * @param LengthAwarePaginator<int,Photo> $paginator
+	 * @param AbstractAlbum                   $album
+	 * @param string                          $full_name_of_directory
+	 * @param array<string>                   $used_file_names
+	 * @param ZipStream                       $zip
+	 */
+	private function compressPhotosFromPaginator(LengthAwarePaginator $paginator, AbstractAlbum $album, string $full_name_of_directory, array &$used_file_names, ZipStream $zip): void
+	{
+		$current_page = 1;
+		$last_page = $paginator->lastPage();
+
+		// Process first page (already loaded)
+		$this->compressPhotosFromCollection($paginator->getCollection(), $album, $full_name_of_directory, $used_file_names, $zip);
+
+		// Process remaining pages
+		while ($current_page < $last_page) {
+			$current_page++;
+			/** @var LengthAwarePaginator<int,Photo> $next_page */
+			$next_page = $album->photos()->paginate($paginator->perPage(), ['*'], 'page', $current_page);
+			$this->compressPhotosFromCollection($next_page->getCollection(), $album, $full_name_of_directory, $used_file_names, $zip);
+		}
+	}
+
+	/**
+	 * Compresses photos from a collection.
+	 *
+	 * @param Collection<int,Photo>|iterable<Photo> $photos
+	 * @param AbstractAlbum                         $album
+	 * @param string                                $full_name_of_directory
+	 * @param array<string>                         $used_file_names
+	 * @param ZipStream                             $zip
+	 */
+	private function compressPhotosFromCollection(Collection|iterable $photos, AbstractAlbum $album, string $full_name_of_directory, array &$used_file_names, ZipStream $zip): void
+	{
 		/** @var Photo $photo */
 		foreach ($photos as $photo) {
 			try {
@@ -265,22 +327,6 @@ private function compressAlbum(AbstractAlbum $album, array &$used_dir_names, ?st
 			}
 			// @codeCoverageIgnoreEnd
 		}
-
-		// Recursively compress sub-albums
-		if ($album instanceof Album) {
-			$sub_dirs = [];
-			// TODO: For higher efficiency, ensure that the photos of each child album together with the original size variant are eagerly loaded.
-			$sub_albums = $album->children;
-			foreach ($sub_albums as $sub_album) {
-				try {
-					$this->compressAlbum($sub_album, $sub_dirs, $full_name_of_directory, $zip);
-					// @codeCoverageIgnoreStart
-				} catch (\Throwable $e) {
-					Handler::reportSafely($e);
-				}
-				// @codeCoverageIgnoreEnd
-			}
-		}
 	}
 
 	/**

app/Http/Requests/Album/ZipRequest.php

@@ -24,8 +24,8 @@
 use App\Policies\AlbumPolicy;
 use App\Policies\PhotoPolicy;
 use App\Rules\AlbumIDListRule;
+use App\Rules\AlbumIDRule;
 use App\Rules\RandomIDListRule;
-use App\Rules\RandomIDRule;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Validation\Rules\Enum;
 
@@ -71,7 +71,7 @@ public function rules(): array
 			RequestAttribute::ALBUM_IDS_ATTRIBUTE => ['sometimes', new AlbumIDListRule()],
 			RequestAttribute::PHOTO_IDS_ATTRIBUTE => ['sometimes', new RandomIDListRule()],
 			RequestAttribute::SIZE_VARIANT_ATTRIBUTE => ['required_if_accepted:photos_ids', new Enum(DownloadVariantType::class)],
-			RequestAttribute::FROM_ID_ATTRIBUTE => ['required_if_accepted:photos_ids', new RandomIDRule(true)],
+			RequestAttribute::FROM_ID_ATTRIBUTE => ['required_if_accepted:photos_ids', new AlbumIDRule(true)],
 		];
 	}
 

tests/Unit/Http/Requests/Album/ZipRequestTest.php

@@ -17,8 +17,8 @@
 use App\Models\TagAlbum;
 use App\Policies\AlbumPolicy;
 use App\Rules\AlbumIDListRule;
+use App\Rules\AlbumIDRule;
 use App\Rules\RandomIDListRule;
-use App\Rules\RandomIDRule;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Validation\Rules\Enum;
 use Tests\Unit\Http\Requests\Base\BaseRequestTest;
@@ -63,7 +63,7 @@ public function testRules(): void
 			RequestAttribute::ALBUM_IDS_ATTRIBUTE => ['sometimes', new AlbumIDListRule()],
 			RequestAttribute::PHOTO_IDS_ATTRIBUTE => ['sometimes', new RandomIDListRule()],
 			RequestAttribute::SIZE_VARIANT_ATTRIBUTE => ['required_if_accepted:photos_ids', new Enum(DownloadVariantType::class)],
-			RequestAttribute::FROM_ID_ATTRIBUTE => ['required_if_accepted:photos_ids', new RandomIDRule(true)],
+			RequestAttribute::FROM_ID_ATTRIBUTE => ['required_if_accepted:photos_ids', new AlbumIDRule(true)],
 		];
 		$this->assertCount(count($expectedRuleMap), $rules); // only validating the first 7 rules & the GRANTS_UPLOAD_ATTRIBUTE is tested afterwards