Precompute album sizes.

app/Actions/Statistics/Spaces.php

@@ -24,6 +24,9 @@ final class Spaces
 	/**
 	 * Return the amount of data stored on the server (optionally for a user).
 	 *
+	 * Uses pre-computed album_size_statistics table for <100ms performance.
+	 * Joins user's owned albums and sums their statistics.
+	 *
 	 * @param int|null $owner_id
 	 *
 	 * @return Collection<int,array{id:int,username:string,size:int}>
@@ -32,28 +35,24 @@ public function getFullSpacePerUser(?int $owner_id = null): Collection
 	{
 		return DB::table('users')
 			->when($owner_id !== null, fn ($query) => $query->where('users.id', '=', $owner_id))
-			->joinSub(
-				query: DB::table('photos')->select(['photos.id', 'photos.owner_id']),
-				as: 'photos',
-				first: 'photos.owner_id',
-				operator: '=',
-				second: 'users.id',
-				type: 'left'
-			)
-			->joinSub(
-				query: DB::table('size_variants')
-					->select(['size_variants.photo_id', 'size_variants.filesize'])
-					->where('size_variants.type', '!=', 7),
-				as: 'size_variants',
-				first: 'size_variants.photo_id',
+			->leftJoinSub(
+				query: DB::table('base_albums')->select(['base_albums.id', 'base_albums.owner_id']),
+				as: 'base_albums',
+				first: 'base_albums.owner_id',
 				operator: '=',
-				second: 'photos.id',
-				type: 'left'
+				second: 'users.id'
 			)
+			->leftJoin('album_size_statistics', 'album_size_statistics.album_id', '=', 'base_albums.id')
 			->select(
 				'users.id',
 				'username',
-				DB::raw('SUM(size_variants.filesize) as size')
+				DB::raw('SUM(COALESCE(album_size_statistics.size_thumb, 0) +
+					COALESCE(album_size_statistics.size_thumb2x, 0) +
+					COALESCE(album_size_statistics.size_small, 0) +
+					COALESCE(album_size_statistics.size_small2x, 0) +
+					COALESCE(album_size_statistics.size_medium, 0) +
+					COALESCE(album_size_statistics.size_medium2x, 0) +
+					COALESCE(album_size_statistics.size_original, 0)) as size')
 			)
 			->groupBy('users.id', 'username')
 			->orderBy('users.id', 'asc')
@@ -144,6 +143,9 @@ public function getSpacePerSizeVariantTypePerAlbum(string $album_id): Collection
 	/**
 	 * Return size statistics per album.
 	 *
+	 * Uses pre-computed album_size_statistics table for performance.
+	 * Falls back to runtime calculation if statistics are missing.
+	 *
 	 * @param string|null $album_id
 	 * @param int|null    $owner_id
 	 *
@@ -172,22 +174,19 @@ public function getSpacePerAlbum(?string $album_id = null, ?int $owner_id = null
 				second: 'albums.id'
 			)
 			->where('base_albums.owner_id', '=', $owner_id))
-			->join(PA::PHOTO_ALBUM, PA::ALBUM_ID, '=', 'albums.id')
-			->joinSub(
-				query: DB::table('size_variants')
-					->select(['size_variants.id', 'size_variants.photo_id', 'size_variants.filesize'])
-					->where('size_variants.type', '!=', 7),
-				as: 'size_variants',
-				first: 'size_variants.photo_id',
-				operator: '=',
-				second: PA::PHOTO_ID
-			)
+			->leftJoin('album_size_statistics', 'album_size_statistics.album_id', '=', 'albums.id')
 			->select(
 				'albums.id',
 				'albums._lft',
 				'albums._rgt',
-				DB::raw('SUM(size_variants.filesize) as size'),
-			)->groupBy('albums.id')
+				DB::raw('(COALESCE(album_size_statistics.size_thumb, 0) +
+					COALESCE(album_size_statistics.size_thumb2x, 0) +
+					COALESCE(album_size_statistics.size_small, 0) +
+					COALESCE(album_size_statistics.size_small2x, 0) +
+					COALESCE(album_size_statistics.size_medium, 0) +
+					COALESCE(album_size_statistics.size_medium2x, 0) +
+					COALESCE(album_size_statistics.size_original, 0)) as size')
+			)
 			->orderBy('albums._lft', 'asc');
 
 		return $query
@@ -203,6 +202,9 @@ public function getSpacePerAlbum(?string $album_id = null, ?int $owner_id = null
 	/**
 	 * Same as above but with full size (including sub-albums).
 	 *
+	 * Uses pre-computed album_size_statistics table with nested set query
+	 * to find descendants and sum their statistics.
+	 *
 	 * @param string|null $album_id
 	 * @param int|null    $owner_id
 	 *
@@ -228,22 +230,19 @@ public function getTotalSpacePerAlbum(?string $album_id = null, ?int $owner_id =
 						->on('albums._rgt', '>=', 'descendants._rgt');
 				}
 			)
-			->join(PA::PHOTO_ALBUM, PA::ALBUM_ID, '=', 'descendants.id')
-			->joinSub(
-				query: DB::table('size_variants')
-					->select(['size_variants.id', 'size_variants.photo_id', 'size_variants.filesize'])
-					->where('size_variants.type', '!=', 7),
-				as: 'size_variants',
-				first: 'size_variants.photo_id',
-				operator: '=',
-				second: PA::PHOTO_ID
-			)
+			->leftJoin('album_size_statistics', 'album_size_statistics.album_id', '=', 'descendants.id')
 			->select(
 				'albums.id',
 				'albums._lft',
 				'albums._rgt',
-				DB::raw('SUM(size_variants.filesize) as size'),
-			)->groupBy('albums.id')
+				DB::raw('SUM(COALESCE(album_size_statistics.size_thumb, 0) +
+					COALESCE(album_size_statistics.size_thumb2x, 0) +
+					COALESCE(album_size_statistics.size_small, 0) +
+					COALESCE(album_size_statistics.size_small2x, 0) +
+					COALESCE(album_size_statistics.size_medium, 0) +
+					COALESCE(album_size_statistics.size_medium2x, 0) +
+					COALESCE(album_size_statistics.size_original, 0)) as size')
+			)->groupBy('albums.id', 'albums._lft', 'albums._rgt')
 			->orderBy('albums._lft', 'asc');
 
 		return $query

app/Console/Commands/BackfillAlbumSizeStatistics.php

@@ -0,0 +1,112 @@
+<?php
+
+/**
+ * SPDX-License-Identifier: MIT
+ * Copyright (c) 2017-2018 Tobias Reich
+ * Copyright (c) 2018-2026 LycheeOrg.
+ */
+
+namespace App\Console\Commands;
+
+use App\Jobs\RecomputeAlbumSizeJob;
+use App\Models\Album;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Log;
+
+/**
+ * Backfill album size statistics for all albums (T-004-35, T-004-36, FR-004-04).
+ *
+ * This command dispatches RecomputeAlbumSizeJob for each album to populate
+ * the album_size_statistics table with pre-computed size data.
+ */
+class BackfillAlbumSizeStatistics extends Command
+{
+	/**
+	 * The name and signature of the console command.
+	 *
+	 * @var string
+	 */
+	protected $signature = 'lychee:backfill-album-sizes
+							{--dry-run : Preview without making changes}
+							{--chunk=1000 : Number of albums to process per batch}';
+
+	/**
+	 * The console command description.
+	 *
+	 * @var string
+	 */
+	protected $description = 'Backfill size statistics (per-variant sizes) for all albums';
+
+	/**
+	 * Execute the console command.
+	 */
+	public function handle(): int
+	{
+		$dry_run = $this->option('dry-run');
+		$chunk_size = (int) $this->option('chunk');
+
+		if ($chunk_size < 1) {
+			$this->error('Chunk size must be at least 1');
+
+			return Command::FAILURE;
+		}
+
+		$this->info('Starting album size statistics backfill...');
+		if ($dry_run) {
+			$this->warn('DRY RUN MODE - No changes will be made');
+		}
+
+		// Get total count
+		$total = Album::query()->count();
+		$this->info("Found {$total} albums to process");
+
+		if ($total === 0) {
+			$this->info('No albums to process');
+
+			return Command::SUCCESS;
+		}
+
+		// Process albums ordered by _lft ASC (leaf-to-root order)
+		// This ensures child albums are computed before parents
+		$bar = $this->output->createProgressBar($total);
+		$bar->start();
+
+		$processed = 0;
+
+		Album::query()
+			->orderBy('_lft', 'asc')
+			->chunk($chunk_size, function (\Illuminate\Database\Eloquent\Collection $albums) use ($dry_run, &$processed, $bar): void {
+				/** @var Album $album */
+				foreach ($albums as $album) {
+					if (!$dry_run) {
+						// Dispatch job to recompute size statistics for this album
+						RecomputeAlbumSizeJob::dispatch($album->id);
+					}
+
+					$processed++;
+					$bar->advance();
+
+					// Log progress at intervals (TE-004-03)
+					if ($processed % 100 === 0) {
+						$percentage = round(($processed / $bar->getMaxSteps()) * 100, 2);
+						Log::info("Backfilled album sizes: {$processed}/{$bar->getMaxSteps()} albums ({$percentage}%)");
+					}
+				}
+			});
+
+		$bar->finish();
+		$this->newLine(2);
+
+		if ($dry_run) {
+			$this->info("DRY RUN: Would have dispatched {$processed} jobs");
+		} else {
+			$this->info("Dispatched {$processed} jobs to recompute album size statistics");
+			$this->info('Jobs will be processed by the queue worker');
+			$this->warn('Note: This operation may take some time for large galleries');
+		}
+
+		Log::info("Album size backfill completed: {$processed} albums processed");
+
+		return Command::SUCCESS;
+	}
+}

app/Console/Commands/RecomputeAlbumSizes.php

@@ -0,0 +1,64 @@
+<?php
+
+/**
+ * SPDX-License-Identifier: MIT
+ * Copyright (c) 2017-2018 Tobias Reich
+ * Copyright (c) 2018-2026 LycheeOrg.
+ */
+
+namespace App\Console\Commands;
+
+use App\Jobs\RecomputeAlbumSizeJob;
+use App\Models\Album;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Log;
+
+/**
+ * Manually recompute size statistics for a specific album (T-004-39, T-004-40, CLI-004-02).
+ *
+ * This command is useful for manual recovery when statistics drift out of sync.
+ */
+class RecomputeAlbumSizes extends Command
+{
+	/**
+	 * The name and signature of the console command.
+	 *
+	 * @var string
+	 */
+	protected $signature = 'lychee:recompute-album-sizes {album_id : The ID of the album to recompute}';
+
+	/**
+	 * The console command description.
+	 *
+	 * @var string
+	 */
+	protected $description = 'Manually recompute size statistics for a specific album';
+
+	/**
+	 * Execute the console command.
+	 */
+	public function handle(): int
+	{
+		$album_id = $this->argument('album_id');
+
+		// Validate album exists
+		$album = Album::find($album_id);
+		if ($album === null) {
+			$this->error("Album with ID '{$album_id}' not found");
+
+			return Command::FAILURE;
+		}
+
+		$this->info("Recomputing size statistics for album: {$album->title} (ID: {$album_id})");
+
+		// Dispatch job
+		RecomputeAlbumSizeJob::dispatch($album_id);
+
+		$this->info('Job dispatched successfully');
+		$this->info('Statistics will be updated by the queue worker');
+
+		Log::info("Manual recompute triggered for album {$album_id} via CLI");
+
+		return Command::SUCCESS;
+	}
+}