A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
fix: demo reset clears embedded images but does not clear the poster_scanned_at flag, leaving them forever blank
aminnausind74c26177cec
diff --git a/app/Console/Commands/ResetDemo.php b/app/Console/Commands/ResetDemo.phpindex 638913ed..8fc7b7a8 100644--- a/app/Console/Commands/ResetDemo.php+++ b/app/Console/Commands/ResetDemo.php@@ -77,7 +77,7 @@ class ResetDemo extends Command {$this->clearStructureFiles();- Metadata::resetAllEditableFields();+ Metadata::resetAllEditableFields(['poster_scanned_at']);Series::resetAllEditableFields();Artisan::call('mediaServer:scan', ['library_id' => 1]);@@ -116,18 +116,22 @@ class ResetDemo extends Command {}/**- * Resets the poster for `metadata` to the auto generated image if exists+ * Resets the poster for `metadata` to the auto generated or embedded image if exists* Deletes all other images for `metadata` and `series` (including ogp images)*/private function resetGeneratedPosters(): void {- $nonGeneratedPosterImages = Image::where('image_source', '!=', ImageSource::GENERATED->value)->orWhere('image_type', ImageType::OGP->value)->get();+ $nonGeneratedPosterImages = Image::whereNotIn('image_source', [ImageSource::GENERATED->value, ImageSource::EMBEDDED->value])->orWhere('image_type', ImageType::OGP->value)->get();$deletedImageIds = [];$deletedLog = [];foreach ($nonGeneratedPosterImages as $image) {try {- Storage::disk('public')->delete($image->path);+ if (!Storage::disk('public')->delete($image->path)) {+ throw new \RuntimeException("Operation Failed");+ }++$deletedImageIds[] = $image->id;$deletedLog[] = ['id' => $image->id, 'imageable_id' => $image->imageable_id, 'type' => $image->image_type, 'source' => $image->image_source, 'source_url' => $image->source_url, 'path' => $image->path];} catch (\Throwable $e) {@@ -140,18 +144,21 @@ class ResetDemo extends Command {Image::whereIn('id', $deletedImageIds)->delete();$this->info("✅ Deleted {$deletedCount} non-generated images from disk and DB.");if ($deletedCount > 0) {- Log::info("Deleted {$deletedCount} non-generated images from disk and DB.", $deletedLog);+ Log::info("Deleted {$deletedCount} non-generated images from disk and DB.", [+ 'count' => $deletedCount,+ 'images' => $deletedLog,+ ]);}// might have to handle replaced auto generated posters somehow- $generatedByMetadataUuid = Image::where('image_source', ImageSource::GENERATED->value)+ $generatedPostersByMetadataUuid = Image::where('image_source', ImageSource::GENERATED->value)->where('imageable_type', Metadata::class)->where('image_type', ImageType::POSTER->value)->get()->groupBy('imageable_id');- Metadata::query()->each(function (Metadata $metadata) use ($generatedByMetadataUuid) {- $generatedId = $generatedByMetadataUuid->get($metadata->uuid)?->first()?->id;+ Metadata::query()->each(function (Metadata $metadata) use ($generatedPostersByMetadataUuid) {+ $generatedId = $generatedPostersByMetadataUuid->get($metadata->uuid)?->first()?->id;if ($generatedId && $metadata->primary_poster_id !== $generatedId) {$metadata->primary_poster_id = $generatedId;diff --git a/app/Traits/HasEditableFields.php b/app/Traits/HasEditableFields.phpindex 2a027ffd..5cf4226d 100644--- a/app/Traits/HasEditableFields.php+++ b/app/Traits/HasEditableFields.php@@ -2,27 +2,34 @@namespace App\Traits;+use Illuminate\Database\Eloquent\Builder;++/**+ * @method static Builder query()+ * @method bool save(array $options = [])+ */trait HasEditableFields {+ abstract protected function getEditableFields(): array;+public function resetEditableFields(): void {- $fresh = new static;+ $defaults = new static;foreach ($this->getEditableFields() as $field) {- $this->{$field} = $fresh->{$field};+ $this->{$field} = $defaults->{$field};}$this->save();}/**- * Static method: resets editable fields for all rows in the table (SQL bulk update).+ * Reset editable fields for all rows in the table (SQL bulk update).*/- public static function resetAllEditableFields(): void {- $fresh = new static;- $fields = $fresh->getEditableFields();+ public static function resetAllEditableFields(array $extraFields = []): void {+ $defaults = new static;$updates = [];- foreach ($fields as $field) {- $updates[$field] = $fresh->{$field};+ foreach ([...$defaults->getEditableFields(), ...$extraFields] as $field) {+ $updates[$field] = $defaults->{$field};}static::query()->update($updates);