Skip to content

A self-hosted media server and file management system

fix: metadata and series record edit dates on fields that should be ignored

aminnausinbe98167de9f7
diff --git a/app/Http/Controllers/Api/V1/MetadataController.php b/app/Http/Controllers/Api/V1/MetadataController.php
index 3cce9113..8dd62ab2 100644
--- a/app/Http/Controllers/Api/V1/MetadataController.php
+++ b/app/Http/Controllers/Api/V1/MetadataController.php
@@ -69,7 +69,10 @@ class MetadataController extends Controller {
if ($metadata->isDirty() || $tagsChanged) {
$user = Auth::user();
- $metadata->fill(['editor_id' => $user->id, 'edited_at' => now()]);
+
+ if ($this->hasMeaningfulChanges($metadata, Metadata::IGNORED_EDITABLE_FIELDS)) {
+ $metadata->fill(['editor_id' => $user->id, 'edited_at' => now()]);
+ }
$this->logModelChanges($metadata, ['tags_changed' => $tagsChanged], $user);
diff --git a/app/Http/Controllers/Api/V1/SeriesController.php b/app/Http/Controllers/Api/V1/SeriesController.php
index 3de66e6e..f27c81e6 100644
--- a/app/Http/Controllers/Api/V1/SeriesController.php
+++ b/app/Http/Controllers/Api/V1/SeriesController.php
@@ -88,7 +88,10 @@ class SeriesController extends Controller {
if ($series->isDirty() || $tagsChanged) {
$user = Auth::user();
- $series->fill(['editor_id' => $user->id, 'edited_at' => now()]);
+
+ if ($this->hasMeaningfulChanges($series, Series::IGNORED_EDITABLE_FIELDS)) {
+ $series->fill(['editor_id' => $user->id, 'edited_at' => now()]);
+ }
$this->logModelChanges($series, ['tags_changed' => $tagsChanged], $user);
diff --git a/app/Models/Metadata.php b/app/Models/Metadata.php
index 331a2978..183fba55 100644
--- a/app/Models/Metadata.php
+++ b/app/Models/Metadata.php
@@ -141,6 +141,8 @@ class Metadata extends Model {
'raw_metadata' => 'array',
];
+ public const IGNORED_EDITABLE_FIELDS = ['intro_start', 'intro_duration', 'episode', 'season', 'release_date'];
+
public function video(): BelongsTo {
return $this->belongsTo(Video::class);
}
diff --git a/app/Models/Series.php b/app/Models/Series.php
index 9f0eb821..7037cf0a 100644
--- a/app/Models/Series.php
+++ b/app/Models/Series.php
@@ -98,6 +98,8 @@ class Series extends Model {
'films' => 'integer',
];
+ public const IGNORED_EDITABLE_FIELDS = ['avg_intro_duration', 'rating', 'seasons', 'episodes', 'films', 'start_date', 'end_date', 'studio'];
+
public function folder(): BelongsTo {
return $this->belongsTo(Folder::class);
}
diff --git a/app/Traits/HasMeaningfulChanges.php b/app/Traits/HasMeaningfulChanges.php
new file mode 100644
index 00000000..05645404
--- /dev/null
+++ b/app/Traits/HasMeaningfulChanges.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Traits;
+
+use Illuminate\Database\Eloquent\Model;
+
+trait HasMeaningfulChanges {
+ protected function hasMeaningfulChanges(Model $model, array $ignoredFields = []): bool {
+ return collect($model->getDirty())->diff($ignoredFields)->isNotEmpty();
+ }
+}