diff --git a/back/src/Kyoo.Abstractions/Models/Resources/Interfaces/IRefreshable.cs b/back/src/Kyoo.Abstractions/Models/Resources/Interfaces/IRefreshable.cs
index ad7acc73..0a8acae3 100644
--- a/back/src/Kyoo.Abstractions/Models/Resources/Interfaces/IRefreshable.cs
+++ b/back/src/Kyoo.Abstractions/Models/Resources/Interfaces/IRefreshable.cs
@@ -27,16 +27,13 @@ public interface IRefreshable
///
public DateTime? NextMetadataRefresh { get; set; }
- public static DateTime ComputeNextRefreshDate(DateOnly? airDate)
+ public static DateTime ComputeNextRefreshDate(DateOnly airDate)
{
- if (airDate is null)
- return DateTime.UtcNow.AddDays(1);
-
- int days = airDate.Value.DayNumber - DateOnly.FromDateTime(DateTime.UtcNow).DayNumber;
+ int days = DateOnly.FromDateTime(DateTime.UtcNow).DayNumber - airDate.DayNumber;
return days switch
{
- <= 7 => DateTime.UtcNow.AddDays(1),
- <= 21 => DateTime.UtcNow.AddDays(5),
+ <= 4 => DateTime.UtcNow.AddDays(1),
+ <= 21 => DateTime.UtcNow.AddDays(14),
_ => DateTime.UtcNow.AddMonths(2)
};
}
diff --git a/back/src/Kyoo.Core/Controllers/Repositories/EpisodeRepository.cs b/back/src/Kyoo.Core/Controllers/Repositories/EpisodeRepository.cs
index e1f2f0bd..500972fa 100644
--- a/back/src/Kyoo.Core/Controllers/Repositories/EpisodeRepository.cs
+++ b/back/src/Kyoo.Core/Controllers/Repositories/EpisodeRepository.cs
@@ -92,7 +92,9 @@ public class EpisodeRepository(
.FirstOrDefaultAsync();
}
- resource.NextMetadataRefresh ??= IRefreshable.ComputeNextRefreshDate(resource.ReleaseDate);
+ resource.NextMetadataRefresh ??= IRefreshable.ComputeNextRefreshDate(
+ resource.ReleaseDate ?? DateOnly.FromDateTime(resource.AddedDate)
+ );
await thumbnails.DownloadImages(resource);
}
diff --git a/back/src/Kyoo.Core/Controllers/Repositories/MovieRepository.cs b/back/src/Kyoo.Core/Controllers/Repositories/MovieRepository.cs
index 2dec59c8..e33501e1 100644
--- a/back/src/Kyoo.Core/Controllers/Repositories/MovieRepository.cs
+++ b/back/src/Kyoo.Core/Controllers/Repositories/MovieRepository.cs
@@ -16,6 +16,7 @@
// You should have received a copy of the GNU General Public License
// along with Kyoo. If not, see .
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
@@ -74,7 +75,9 @@ public class MovieRepository(
resource.StudioId = (await studios.CreateIfNotExists(resource.Studio)).Id;
resource.Studio = null;
}
- resource.NextMetadataRefresh ??= IRefreshable.ComputeNextRefreshDate(resource.AirDate);
+ resource.NextMetadataRefresh ??= IRefreshable.ComputeNextRefreshDate(
+ resource.AirDate ?? DateOnly.FromDateTime(resource.AddedDate)
+ );
await thumbnails.DownloadImages(resource);
}
}
diff --git a/back/src/Kyoo.Core/Controllers/Repositories/SeasonRepository.cs b/back/src/Kyoo.Core/Controllers/Repositories/SeasonRepository.cs
index 61297f4a..a7f8233a 100644
--- a/back/src/Kyoo.Core/Controllers/Repositories/SeasonRepository.cs
+++ b/back/src/Kyoo.Core/Controllers/Repositories/SeasonRepository.cs
@@ -77,7 +77,9 @@ public class SeasonRepository(
throw new ValidationException("Missing show id");
// This is storred in db so it needs to be set before every create/edit (and before events)
resource.ShowSlug = (await shows.Get(resource.ShowId)).Slug;
- resource.NextMetadataRefresh ??= IRefreshable.ComputeNextRefreshDate(resource.StartDate);
+ resource.NextMetadataRefresh ??= IRefreshable.ComputeNextRefreshDate(
+ resource.StartDate ?? DateOnly.FromDateTime(resource.AddedDate)
+ );
await thumbnails.DownloadImages(resource);
}
}
diff --git a/back/src/Kyoo.Core/Controllers/Repositories/ShowRepository.cs b/back/src/Kyoo.Core/Controllers/Repositories/ShowRepository.cs
index 13caad26..51c9f76c 100644
--- a/back/src/Kyoo.Core/Controllers/Repositories/ShowRepository.cs
+++ b/back/src/Kyoo.Core/Controllers/Repositories/ShowRepository.cs
@@ -16,6 +16,7 @@
// You should have received a copy of the GNU General Public License
// along with Kyoo. If not, see .
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
@@ -74,7 +75,9 @@ public class ShowRepository(
resource.StudioId = (await studios.CreateIfNotExists(resource.Studio)).Id;
resource.Studio = null;
}
- resource.NextMetadataRefresh ??= IRefreshable.ComputeNextRefreshDate(resource.StartAir);
+ resource.NextMetadataRefresh ??= IRefreshable.ComputeNextRefreshDate(
+ resource.StartAir ?? DateOnly.FromDateTime(resource.AddedDate)
+ );
await thumbnails.DownloadImages(resource);
}
}
diff --git a/back/src/Kyoo.Postgresql/Migrations/20240506175054_FixSeasonMetadataId.Designer.cs b/back/src/Kyoo.Postgresql/Migrations/20240506175054_FixSeasonMetadataId.Designer.cs
new file mode 100644
index 00000000..37506ee3
--- /dev/null
+++ b/back/src/Kyoo.Postgresql/Migrations/20240506175054_FixSeasonMetadataId.Designer.cs
@@ -0,0 +1,1395 @@
+//
+using System;
+using System.Collections.Generic;
+using Kyoo.Abstractions.Models;
+using Kyoo.Postgresql;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace Kyoo.Postgresql.Migrations
+{
+ [DbContext(typeof(PostgresContext))]
+ [Migration("20240506175054_FixSeasonMetadataId")]
+ partial class FixSeasonMetadataId
+ {
+ ///
+ protected override void BuildTargetModel(ModelBuilder modelBuilder)
+ {
+#pragma warning disable 612, 618
+ modelBuilder
+ .HasAnnotation("ProductVersion", "8.0.4")
+ .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+ NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "genre", new[] { "action", "adventure", "animation", "comedy", "crime", "documentary", "drama", "family", "fantasy", "history", "horror", "music", "mystery", "romance", "science_fiction", "thriller", "war", "western", "kids", "news", "reality", "soap", "talk", "politics" });
+ NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "status", new[] { "unknown", "finished", "airing", "planned" });
+ NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "watch_status", new[] { "completed", "watching", "droped", "planned", "deleted" });
+ NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+ modelBuilder.Entity("Kyoo.Abstractions.Models.Collection", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uuid")
+ .HasColumnName("id");
+
+ b.Property("AddedDate")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("added_date")
+ .HasDefaultValueSql("now() at time zone 'utc'");
+
+ b.Property("ExternalId")
+ .IsRequired()
+ .HasColumnType("json")
+ .HasColumnName("external_id");
+
+ b.Property("Name")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("name");
+
+ b.Property("NextMetadataRefresh")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("next_metadata_refresh")
+ .HasDefaultValueSql("now() at time zone 'utc' + interval '2 hours'");
+
+ b.Property("Overview")
+ .HasColumnType("text")
+ .HasColumnName("overview");
+
+ b.Property("Slug")
+ .IsRequired()
+ .HasMaxLength(256)
+ .HasColumnType("character varying(256)")
+ .HasColumnName("slug");
+
+ b.HasKey("Id")
+ .HasName("pk_collections");
+
+ b.HasIndex("Slug")
+ .IsUnique()
+ .HasDatabaseName("ix_collections_slug");
+
+ b.ToTable("collections", (string)null);
+ });
+
+ modelBuilder.Entity("Kyoo.Abstractions.Models.Episode", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uuid")
+ .HasColumnName("id");
+
+ b.Property("AbsoluteNumber")
+ .HasColumnType("integer")
+ .HasColumnName("absolute_number");
+
+ b.Property("AddedDate")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("added_date")
+ .HasDefaultValueSql("now() at time zone 'utc'");
+
+ b.Property("EpisodeNumber")
+ .HasColumnType("integer")
+ .HasColumnName("episode_number");
+
+ b.Property("ExternalId")
+ .IsRequired()
+ .HasColumnType("json")
+ .HasColumnName("external_id");
+
+ b.Property("Name")
+ .HasColumnType("text")
+ .HasColumnName("name");
+
+ b.Property("NextMetadataRefresh")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("next_metadata_refresh")
+ .HasDefaultValueSql("now() at time zone 'utc' + interval '2 hours'");
+
+ b.Property("Overview")
+ .HasColumnType("text")
+ .HasColumnName("overview");
+
+ b.Property("Path")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("path");
+
+ b.Property("ReleaseDate")
+ .HasColumnType("date")
+ .HasColumnName("release_date");
+
+ b.Property("Runtime")
+ .HasColumnType("integer")
+ .HasColumnName("runtime");
+
+ b.Property("SeasonId")
+ .HasColumnType("uuid")
+ .HasColumnName("season_id");
+
+ b.Property("SeasonNumber")
+ .HasColumnType("integer")
+ .HasColumnName("season_number");
+
+ b.Property("ShowId")
+ .HasColumnType("uuid")
+ .HasColumnName("show_id");
+
+ b.Property("Slug")
+ .IsRequired()
+ .HasMaxLength(256)
+ .HasColumnType("character varying(256)")
+ .HasColumnName("slug");
+
+ b.HasKey("Id")
+ .HasName("pk_episodes");
+
+ b.HasIndex("SeasonId")
+ .HasDatabaseName("ix_episodes_season_id");
+
+ b.HasIndex("Slug")
+ .IsUnique()
+ .HasDatabaseName("ix_episodes_slug");
+
+ b.HasIndex("ShowId", "SeasonNumber", "EpisodeNumber", "AbsoluteNumber")
+ .IsUnique()
+ .HasDatabaseName("ix_episodes_show_id_season_number_episode_number_absolute_numb");
+
+ b.ToTable("episodes", (string)null);
+ });
+
+ modelBuilder.Entity("Kyoo.Abstractions.Models.EpisodeWatchStatus", b =>
+ {
+ b.Property("UserId")
+ .HasColumnType("uuid")
+ .HasColumnName("user_id");
+
+ b.Property("EpisodeId")
+ .HasColumnType("uuid")
+ .HasColumnName("episode_id");
+
+ b.Property("AddedDate")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("added_date")
+ .HasDefaultValueSql("now() at time zone 'utc'");
+
+ b.Property("PlayedDate")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("played_date");
+
+ b.Property("Status")
+ .HasColumnType("watch_status")
+ .HasColumnName("status");
+
+ b.Property("WatchedPercent")
+ .HasColumnType("integer")
+ .HasColumnName("watched_percent");
+
+ b.Property("WatchedTime")
+ .HasColumnType("integer")
+ .HasColumnName("watched_time");
+
+ b.HasKey("UserId", "EpisodeId")
+ .HasName("pk_episode_watch_status");
+
+ b.HasIndex("EpisodeId")
+ .HasDatabaseName("ix_episode_watch_status_episode_id");
+
+ b.ToTable("episode_watch_status", (string)null);
+ });
+
+ modelBuilder.Entity("Kyoo.Abstractions.Models.Issue", b =>
+ {
+ b.Property("Domain")
+ .HasColumnType("text")
+ .HasColumnName("domain");
+
+ b.Property("Cause")
+ .HasColumnType("text")
+ .HasColumnName("cause");
+
+ b.Property("AddedDate")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("added_date")
+ .HasDefaultValueSql("now() at time zone 'utc'");
+
+ b.Property("Extra")
+ .IsRequired()
+ .HasColumnType("json")
+ .HasColumnName("extra");
+
+ b.Property("Reason")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("reason");
+
+ b.HasKey("Domain", "Cause")
+ .HasName("pk_issues");
+
+ b.ToTable("issues", (string)null);
+ });
+
+ modelBuilder.Entity("Kyoo.Abstractions.Models.Movie", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uuid")
+ .HasColumnName("id");
+
+ b.Property("AddedDate")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("added_date")
+ .HasDefaultValueSql("now() at time zone 'utc'");
+
+ b.Property("AirDate")
+ .HasColumnType("date")
+ .HasColumnName("air_date");
+
+ b.Property("Aliases")
+ .IsRequired()
+ .HasColumnType("text[]")
+ .HasColumnName("aliases");
+
+ b.Property("ExternalId")
+ .IsRequired()
+ .HasColumnType("json")
+ .HasColumnName("external_id");
+
+ b.Property>("Genres")
+ .IsRequired()
+ .HasColumnType("genre[]")
+ .HasColumnName("genres");
+
+ b.Property("Name")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("name");
+
+ b.Property("NextMetadataRefresh")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("next_metadata_refresh")
+ .HasDefaultValueSql("now() at time zone 'utc' + interval '2 hours'");
+
+ b.Property("Overview")
+ .HasColumnType("text")
+ .HasColumnName("overview");
+
+ b.Property("Path")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("path");
+
+ b.Property("Rating")
+ .HasColumnType("integer")
+ .HasColumnName("rating");
+
+ b.Property("Runtime")
+ .HasColumnType("integer")
+ .HasColumnName("runtime");
+
+ b.Property("Slug")
+ .IsRequired()
+ .HasMaxLength(256)
+ .HasColumnType("character varying(256)")
+ .HasColumnName("slug");
+
+ b.Property("Status")
+ .HasColumnType("status")
+ .HasColumnName("status");
+
+ b.Property("StudioId")
+ .HasColumnType("uuid")
+ .HasColumnName("studio_id");
+
+ b.Property("Tagline")
+ .HasColumnType("text")
+ .HasColumnName("tagline");
+
+ b.Property("Tags")
+ .IsRequired()
+ .HasColumnType("text[]")
+ .HasColumnName("tags");
+
+ b.Property("Trailer")
+ .HasColumnType("text")
+ .HasColumnName("trailer");
+
+ b.HasKey("Id")
+ .HasName("pk_movies");
+
+ b.HasIndex("Slug")
+ .IsUnique()
+ .HasDatabaseName("ix_movies_slug");
+
+ b.HasIndex("StudioId")
+ .HasDatabaseName("ix_movies_studio_id");
+
+ b.ToTable("movies", (string)null);
+ });
+
+ modelBuilder.Entity("Kyoo.Abstractions.Models.MovieWatchStatus", b =>
+ {
+ b.Property("UserId")
+ .HasColumnType("uuid")
+ .HasColumnName("user_id");
+
+ b.Property("MovieId")
+ .HasColumnType("uuid")
+ .HasColumnName("movie_id");
+
+ b.Property("AddedDate")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("added_date")
+ .HasDefaultValueSql("now() at time zone 'utc'");
+
+ b.Property("PlayedDate")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("played_date");
+
+ b.Property("Status")
+ .HasColumnType("watch_status")
+ .HasColumnName("status");
+
+ b.Property("WatchedPercent")
+ .HasColumnType("integer")
+ .HasColumnName("watched_percent");
+
+ b.Property("WatchedTime")
+ .HasColumnType("integer")
+ .HasColumnName("watched_time");
+
+ b.HasKey("UserId", "MovieId")
+ .HasName("pk_movie_watch_status");
+
+ b.HasIndex("MovieId")
+ .HasDatabaseName("ix_movie_watch_status_movie_id");
+
+ b.ToTable("movie_watch_status", (string)null);
+ });
+
+ modelBuilder.Entity("Kyoo.Abstractions.Models.Season", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uuid")
+ .HasColumnName("id");
+
+ b.Property("AddedDate")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("added_date")
+ .HasDefaultValueSql("now() at time zone 'utc'");
+
+ b.Property("EndDate")
+ .HasColumnType("date")
+ .HasColumnName("end_date");
+
+ b.Property("ExternalId")
+ .IsRequired()
+ .HasColumnType("json")
+ .HasColumnName("external_id");
+
+ b.Property("Name")
+ .HasColumnType("text")
+ .HasColumnName("name");
+
+ b.Property("NextMetadataRefresh")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("next_metadata_refresh")
+ .HasDefaultValueSql("now() at time zone 'utc' + interval '2 hours'");
+
+ b.Property("Overview")
+ .HasColumnType("text")
+ .HasColumnName("overview");
+
+ b.Property("SeasonNumber")
+ .HasColumnType("integer")
+ .HasColumnName("season_number");
+
+ b.Property("ShowId")
+ .HasColumnType("uuid")
+ .HasColumnName("show_id");
+
+ b.Property("Slug")
+ .IsRequired()
+ .HasMaxLength(256)
+ .HasColumnType("character varying(256)")
+ .HasColumnName("slug");
+
+ b.Property("StartDate")
+ .HasColumnType("date")
+ .HasColumnName("start_date");
+
+ b.HasKey("Id")
+ .HasName("pk_seasons");
+
+ b.HasIndex("Slug")
+ .IsUnique()
+ .HasDatabaseName("ix_seasons_slug");
+
+ b.HasIndex("ShowId", "SeasonNumber")
+ .IsUnique()
+ .HasDatabaseName("ix_seasons_show_id_season_number");
+
+ b.ToTable("seasons", (string)null);
+ });
+
+ modelBuilder.Entity("Kyoo.Abstractions.Models.Show", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uuid")
+ .HasColumnName("id");
+
+ b.Property("AddedDate")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("added_date")
+ .HasDefaultValueSql("now() at time zone 'utc'");
+
+ b.Property>("Aliases")
+ .IsRequired()
+ .HasColumnType("text[]")
+ .HasColumnName("aliases");
+
+ b.Property("EndAir")
+ .HasColumnType("date")
+ .HasColumnName("end_air");
+
+ b.Property("ExternalId")
+ .IsRequired()
+ .HasColumnType("json")
+ .HasColumnName("external_id");
+
+ b.Property>("Genres")
+ .IsRequired()
+ .HasColumnType("genre[]")
+ .HasColumnName("genres");
+
+ b.Property("Name")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("name");
+
+ b.Property("NextMetadataRefresh")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("next_metadata_refresh")
+ .HasDefaultValueSql("now() at time zone 'utc' + interval '2 hours'");
+
+ b.Property("Overview")
+ .HasColumnType("text")
+ .HasColumnName("overview");
+
+ b.Property("Rating")
+ .HasColumnType("integer")
+ .HasColumnName("rating");
+
+ b.Property("Slug")
+ .IsRequired()
+ .HasMaxLength(256)
+ .HasColumnType("character varying(256)")
+ .HasColumnName("slug");
+
+ b.Property("StartAir")
+ .HasColumnType("date")
+ .HasColumnName("start_air");
+
+ b.Property("Status")
+ .HasColumnType("status")
+ .HasColumnName("status");
+
+ b.Property("StudioId")
+ .HasColumnType("uuid")
+ .HasColumnName("studio_id");
+
+ b.Property("Tagline")
+ .HasColumnType("text")
+ .HasColumnName("tagline");
+
+ b.Property>("Tags")
+ .IsRequired()
+ .HasColumnType("text[]")
+ .HasColumnName("tags");
+
+ b.Property("Trailer")
+ .HasColumnType("text")
+ .HasColumnName("trailer");
+
+ b.HasKey("Id")
+ .HasName("pk_shows");
+
+ b.HasIndex("Slug")
+ .IsUnique()
+ .HasDatabaseName("ix_shows_slug");
+
+ b.HasIndex("StudioId")
+ .HasDatabaseName("ix_shows_studio_id");
+
+ b.ToTable("shows", (string)null);
+ });
+
+ modelBuilder.Entity("Kyoo.Abstractions.Models.ShowWatchStatus", b =>
+ {
+ b.Property("UserId")
+ .HasColumnType("uuid")
+ .HasColumnName("user_id");
+
+ b.Property("ShowId")
+ .HasColumnType("uuid")
+ .HasColumnName("show_id");
+
+ b.Property("AddedDate")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("added_date")
+ .HasDefaultValueSql("now() at time zone 'utc'");
+
+ b.Property("NextEpisodeId")
+ .HasColumnType("uuid")
+ .HasColumnName("next_episode_id");
+
+ b.Property("PlayedDate")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("played_date");
+
+ b.Property("Status")
+ .HasColumnType("watch_status")
+ .HasColumnName("status");
+
+ b.Property("UnseenEpisodesCount")
+ .HasColumnType("integer")
+ .HasColumnName("unseen_episodes_count");
+
+ b.Property("WatchedPercent")
+ .HasColumnType("integer")
+ .HasColumnName("watched_percent");
+
+ b.Property("WatchedTime")
+ .HasColumnType("integer")
+ .HasColumnName("watched_time");
+
+ b.HasKey("UserId", "ShowId")
+ .HasName("pk_show_watch_status");
+
+ b.HasIndex("NextEpisodeId")
+ .HasDatabaseName("ix_show_watch_status_next_episode_id");
+
+ b.HasIndex("ShowId")
+ .HasDatabaseName("ix_show_watch_status_show_id");
+
+ b.ToTable("show_watch_status", (string)null);
+ });
+
+ modelBuilder.Entity("Kyoo.Abstractions.Models.Studio", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uuid")
+ .HasColumnName("id");
+
+ b.Property("ExternalId")
+ .IsRequired()
+ .HasColumnType("json")
+ .HasColumnName("external_id");
+
+ b.Property("Name")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("name");
+
+ b.Property("Slug")
+ .IsRequired()
+ .HasMaxLength(256)
+ .HasColumnType("character varying(256)")
+ .HasColumnName("slug");
+
+ b.HasKey("Id")
+ .HasName("pk_studios");
+
+ b.HasIndex("Slug")
+ .IsUnique()
+ .HasDatabaseName("ix_studios_slug");
+
+ b.ToTable("studios", (string)null);
+ });
+
+ modelBuilder.Entity("Kyoo.Abstractions.Models.User", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uuid")
+ .HasColumnName("id");
+
+ b.Property("AddedDate")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("added_date")
+ .HasDefaultValueSql("now() at time zone 'utc'");
+
+ b.Property("Email")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("email");
+
+ b.Property("ExternalId")
+ .IsRequired()
+ .HasColumnType("json")
+ .HasColumnName("external_id");
+
+ b.Property("Password")
+ .HasColumnType("text")
+ .HasColumnName("password");
+
+ b.Property("Permissions")
+ .IsRequired()
+ .HasColumnType("text[]")
+ .HasColumnName("permissions");
+
+ b.Property("Settings")
+ .IsRequired()
+ .HasColumnType("json")
+ .HasColumnName("settings");
+
+ b.Property("Slug")
+ .IsRequired()
+ .HasMaxLength(256)
+ .HasColumnType("character varying(256)")
+ .HasColumnName("slug");
+
+ b.Property("Username")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("username");
+
+ b.HasKey("Id")
+ .HasName("pk_users");
+
+ b.HasIndex("Slug")
+ .IsUnique()
+ .HasDatabaseName("ix_users_slug");
+
+ b.HasIndex("Username")
+ .IsUnique()
+ .HasDatabaseName("ix_users_username");
+
+ b.ToTable("users", (string)null);
+ });
+
+ modelBuilder.Entity("ServerOption", b =>
+ {
+ b.Property("Key")
+ .HasColumnType("text")
+ .HasColumnName("key");
+
+ b.Property("Value")
+ .IsRequired()
+ .HasColumnType("text")
+ .HasColumnName("value");
+
+ b.HasKey("Key")
+ .HasName("pk_options");
+
+ b.ToTable("options", (string)null);
+ });
+
+ modelBuilder.Entity("link_collection_movie", b =>
+ {
+ b.Property("collection_id")
+ .HasColumnType("uuid")
+ .HasColumnName("collection_id");
+
+ b.Property("movie_id")
+ .HasColumnType("uuid")
+ .HasColumnName("movie_id");
+
+ b.HasKey("collection_id", "movie_id")
+ .HasName("pk_link_collection_movie");
+
+ b.HasIndex("movie_id")
+ .HasDatabaseName("ix_link_collection_movie_movie_id");
+
+ b.ToTable("link_collection_movie", (string)null);
+ });
+
+ modelBuilder.Entity("link_collection_show", b =>
+ {
+ b.Property("collection_id")
+ .HasColumnType("uuid")
+ .HasColumnName("collection_id");
+
+ b.Property("show_id")
+ .HasColumnType("uuid")
+ .HasColumnName("show_id");
+
+ b.HasKey("collection_id", "show_id")
+ .HasName("pk_link_collection_show");
+
+ b.HasIndex("show_id")
+ .HasDatabaseName("ix_link_collection_show_show_id");
+
+ b.ToTable("link_collection_show", (string)null);
+ });
+
+ modelBuilder.Entity("Kyoo.Abstractions.Models.Collection", b =>
+ {
+ b.OwnsOne("Kyoo.Abstractions.Models.Image", "Logo", b1 =>
+ {
+ b1.Property("CollectionId")
+ .HasColumnType("uuid");
+
+ b1.Property("Blurhash")
+ .IsRequired()
+ .HasMaxLength(32)
+ .HasColumnType("character varying(32)");
+
+ b1.Property("Id")
+ .HasColumnType("uuid");
+
+ b1.Property("Source")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b1.HasKey("CollectionId");
+
+ b1.ToTable("collections");
+
+ b1.ToJson("logo");
+
+ b1.WithOwner()
+ .HasForeignKey("CollectionId")
+ .HasConstraintName("fk_collections_collections_id");
+ });
+
+ b.OwnsOne("Kyoo.Abstractions.Models.Image", "Poster", b1 =>
+ {
+ b1.Property("CollectionId")
+ .HasColumnType("uuid");
+
+ b1.Property("Blurhash")
+ .IsRequired()
+ .HasMaxLength(32)
+ .HasColumnType("character varying(32)");
+
+ b1.Property("Id")
+ .HasColumnType("uuid");
+
+ b1.Property("Source")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b1.HasKey("CollectionId")
+ .HasName("pk_collections");
+
+ b1.ToTable("collections");
+
+ b1.ToJson("poster");
+
+ b1.WithOwner()
+ .HasForeignKey("CollectionId")
+ .HasConstraintName("fk_collections_collections_collection_id");
+ });
+
+ b.OwnsOne("Kyoo.Abstractions.Models.Image", "Thumbnail", b1 =>
+ {
+ b1.Property("CollectionId")
+ .HasColumnType("uuid");
+
+ b1.Property("Blurhash")
+ .IsRequired()
+ .HasMaxLength(32)
+ .HasColumnType("character varying(32)");
+
+ b1.Property("Id")
+ .HasColumnType("uuid");
+
+ b1.Property("Source")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b1.HasKey("CollectionId");
+
+ b1.ToTable("collections");
+
+ b1.ToJson("thumbnail");
+
+ b1.WithOwner()
+ .HasForeignKey("CollectionId")
+ .HasConstraintName("fk_collections_collections_id");
+ });
+
+ b.Navigation("Logo");
+
+ b.Navigation("Poster");
+
+ b.Navigation("Thumbnail");
+ });
+
+ modelBuilder.Entity("Kyoo.Abstractions.Models.Episode", b =>
+ {
+ b.HasOne("Kyoo.Abstractions.Models.Season", "Season")
+ .WithMany("Episodes")
+ .HasForeignKey("SeasonId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .HasConstraintName("fk_episodes_seasons_season_id");
+
+ b.HasOne("Kyoo.Abstractions.Models.Show", "Show")
+ .WithMany("Episodes")
+ .HasForeignKey("ShowId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired()
+ .HasConstraintName("fk_episodes_shows_show_id");
+
+ b.OwnsOne("Kyoo.Abstractions.Models.Image", "Logo", b1 =>
+ {
+ b1.Property("EpisodeId")
+ .HasColumnType("uuid");
+
+ b1.Property("Blurhash")
+ .IsRequired()
+ .HasMaxLength(32)
+ .HasColumnType("character varying(32)");
+
+ b1.Property("Id")
+ .HasColumnType("uuid");
+
+ b1.Property("Source")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b1.HasKey("EpisodeId");
+
+ b1.ToTable("episodes");
+
+ b1.ToJson("logo");
+
+ b1.WithOwner()
+ .HasForeignKey("EpisodeId")
+ .HasConstraintName("fk_episodes_episodes_id");
+ });
+
+ b.OwnsOne("Kyoo.Abstractions.Models.Image", "Poster", b1 =>
+ {
+ b1.Property("EpisodeId")
+ .HasColumnType("uuid");
+
+ b1.Property("Blurhash")
+ .IsRequired()
+ .HasMaxLength(32)
+ .HasColumnType("character varying(32)");
+
+ b1.Property("Id")
+ .HasColumnType("uuid");
+
+ b1.Property("Source")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b1.HasKey("EpisodeId");
+
+ b1.ToTable("episodes");
+
+ b1.ToJson("poster");
+
+ b1.WithOwner()
+ .HasForeignKey("EpisodeId")
+ .HasConstraintName("fk_episodes_episodes_id");
+ });
+
+ b.OwnsOne("Kyoo.Abstractions.Models.Image", "Thumbnail", b1 =>
+ {
+ b1.Property("EpisodeId")
+ .HasColumnType("uuid");
+
+ b1.Property("Blurhash")
+ .IsRequired()
+ .HasMaxLength(32)
+ .HasColumnType("character varying(32)");
+
+ b1.Property("Id")
+ .HasColumnType("uuid");
+
+ b1.Property("Source")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b1.HasKey("EpisodeId");
+
+ b1.ToTable("episodes");
+
+ b1.ToJson("thumbnail");
+
+ b1.WithOwner()
+ .HasForeignKey("EpisodeId")
+ .HasConstraintName("fk_episodes_episodes_id");
+ });
+
+ b.Navigation("Logo");
+
+ b.Navigation("Poster");
+
+ b.Navigation("Season");
+
+ b.Navigation("Show");
+
+ b.Navigation("Thumbnail");
+ });
+
+ modelBuilder.Entity("Kyoo.Abstractions.Models.EpisodeWatchStatus", b =>
+ {
+ b.HasOne("Kyoo.Abstractions.Models.Episode", "Episode")
+ .WithMany("Watched")
+ .HasForeignKey("EpisodeId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired()
+ .HasConstraintName("fk_episode_watch_status_episodes_episode_id");
+
+ b.HasOne("Kyoo.Abstractions.Models.User", "User")
+ .WithMany()
+ .HasForeignKey("UserId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired()
+ .HasConstraintName("fk_episode_watch_status_users_user_id");
+
+ b.Navigation("Episode");
+
+ b.Navigation("User");
+ });
+
+ modelBuilder.Entity("Kyoo.Abstractions.Models.Movie", b =>
+ {
+ b.HasOne("Kyoo.Abstractions.Models.Studio", "Studio")
+ .WithMany("Movies")
+ .HasForeignKey("StudioId")
+ .OnDelete(DeleteBehavior.SetNull)
+ .HasConstraintName("fk_movies_studios_studio_id");
+
+ b.OwnsOne("Kyoo.Abstractions.Models.Image", "Logo", b1 =>
+ {
+ b1.Property("MovieId")
+ .HasColumnType("uuid");
+
+ b1.Property("Blurhash")
+ .IsRequired()
+ .HasMaxLength(32)
+ .HasColumnType("character varying(32)");
+
+ b1.Property("Id")
+ .HasColumnType("uuid");
+
+ b1.Property("Source")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b1.HasKey("MovieId");
+
+ b1.ToTable("movies");
+
+ b1.ToJson("logo");
+
+ b1.WithOwner()
+ .HasForeignKey("MovieId")
+ .HasConstraintName("fk_movies_movies_id");
+ });
+
+ b.OwnsOne("Kyoo.Abstractions.Models.Image", "Poster", b1 =>
+ {
+ b1.Property("MovieId")
+ .HasColumnType("uuid");
+
+ b1.Property("Blurhash")
+ .IsRequired()
+ .HasMaxLength(32)
+ .HasColumnType("character varying(32)");
+
+ b1.Property("Id")
+ .HasColumnType("uuid");
+
+ b1.Property("Source")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b1.HasKey("MovieId");
+
+ b1.ToTable("movies");
+
+ b1.ToJson("poster");
+
+ b1.WithOwner()
+ .HasForeignKey("MovieId")
+ .HasConstraintName("fk_movies_movies_id");
+ });
+
+ b.OwnsOne("Kyoo.Abstractions.Models.Image", "Thumbnail", b1 =>
+ {
+ b1.Property("MovieId")
+ .HasColumnType("uuid");
+
+ b1.Property("Blurhash")
+ .IsRequired()
+ .HasMaxLength(32)
+ .HasColumnType("character varying(32)");
+
+ b1.Property("Id")
+ .HasColumnType("uuid");
+
+ b1.Property("Source")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b1.HasKey("MovieId");
+
+ b1.ToTable("movies");
+
+ b1.ToJson("thumbnail");
+
+ b1.WithOwner()
+ .HasForeignKey("MovieId")
+ .HasConstraintName("fk_movies_movies_id");
+ });
+
+ b.Navigation("Logo");
+
+ b.Navigation("Poster");
+
+ b.Navigation("Studio");
+
+ b.Navigation("Thumbnail");
+ });
+
+ modelBuilder.Entity("Kyoo.Abstractions.Models.MovieWatchStatus", b =>
+ {
+ b.HasOne("Kyoo.Abstractions.Models.Movie", "Movie")
+ .WithMany("Watched")
+ .HasForeignKey("MovieId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired()
+ .HasConstraintName("fk_movie_watch_status_movies_movie_id");
+
+ b.HasOne("Kyoo.Abstractions.Models.User", "User")
+ .WithMany()
+ .HasForeignKey("UserId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired()
+ .HasConstraintName("fk_movie_watch_status_users_user_id");
+
+ b.Navigation("Movie");
+
+ b.Navigation("User");
+ });
+
+ modelBuilder.Entity("Kyoo.Abstractions.Models.Season", b =>
+ {
+ b.HasOne("Kyoo.Abstractions.Models.Show", "Show")
+ .WithMany("Seasons")
+ .HasForeignKey("ShowId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired()
+ .HasConstraintName("fk_seasons_shows_show_id");
+
+ b.OwnsOne("Kyoo.Abstractions.Models.Image", "Logo", b1 =>
+ {
+ b1.Property("SeasonId")
+ .HasColumnType("uuid");
+
+ b1.Property("Blurhash")
+ .IsRequired()
+ .HasMaxLength(32)
+ .HasColumnType("character varying(32)");
+
+ b1.Property("Id")
+ .HasColumnType("uuid");
+
+ b1.Property("Source")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b1.HasKey("SeasonId");
+
+ b1.ToTable("seasons");
+
+ b1.ToJson("logo");
+
+ b1.WithOwner()
+ .HasForeignKey("SeasonId")
+ .HasConstraintName("fk_seasons_seasons_id");
+ });
+
+ b.OwnsOne("Kyoo.Abstractions.Models.Image", "Poster", b1 =>
+ {
+ b1.Property("SeasonId")
+ .HasColumnType("uuid");
+
+ b1.Property("Blurhash")
+ .IsRequired()
+ .HasMaxLength(32)
+ .HasColumnType("character varying(32)");
+
+ b1.Property("Id")
+ .HasColumnType("uuid");
+
+ b1.Property("Source")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b1.HasKey("SeasonId");
+
+ b1.ToTable("seasons");
+
+ b1.ToJson("poster");
+
+ b1.WithOwner()
+ .HasForeignKey("SeasonId")
+ .HasConstraintName("fk_seasons_seasons_id");
+ });
+
+ b.OwnsOne("Kyoo.Abstractions.Models.Image", "Thumbnail", b1 =>
+ {
+ b1.Property("SeasonId")
+ .HasColumnType("uuid");
+
+ b1.Property("Blurhash")
+ .IsRequired()
+ .HasMaxLength(32)
+ .HasColumnType("character varying(32)");
+
+ b1.Property("Id")
+ .HasColumnType("uuid");
+
+ b1.Property("Source")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b1.HasKey("SeasonId");
+
+ b1.ToTable("seasons");
+
+ b1.ToJson("thumbnail");
+
+ b1.WithOwner()
+ .HasForeignKey("SeasonId")
+ .HasConstraintName("fk_seasons_seasons_id");
+ });
+
+ b.Navigation("Logo");
+
+ b.Navigation("Poster");
+
+ b.Navigation("Show");
+
+ b.Navigation("Thumbnail");
+ });
+
+ modelBuilder.Entity("Kyoo.Abstractions.Models.Show", b =>
+ {
+ b.HasOne("Kyoo.Abstractions.Models.Studio", "Studio")
+ .WithMany("Shows")
+ .HasForeignKey("StudioId")
+ .OnDelete(DeleteBehavior.SetNull)
+ .HasConstraintName("fk_shows_studios_studio_id");
+
+ b.OwnsOne("Kyoo.Abstractions.Models.Image", "Logo", b1 =>
+ {
+ b1.Property("ShowId")
+ .HasColumnType("uuid");
+
+ b1.Property("Blurhash")
+ .IsRequired()
+ .HasMaxLength(32)
+ .HasColumnType("character varying(32)");
+
+ b1.Property("Id")
+ .HasColumnType("uuid");
+
+ b1.Property("Source")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b1.HasKey("ShowId");
+
+ b1.ToTable("shows");
+
+ b1.ToJson("logo");
+
+ b1.WithOwner()
+ .HasForeignKey("ShowId")
+ .HasConstraintName("fk_shows_shows_id");
+ });
+
+ b.OwnsOne("Kyoo.Abstractions.Models.Image", "Poster", b1 =>
+ {
+ b1.Property("ShowId")
+ .HasColumnType("uuid");
+
+ b1.Property("Blurhash")
+ .IsRequired()
+ .HasMaxLength(32)
+ .HasColumnType("character varying(32)");
+
+ b1.Property("Id")
+ .HasColumnType("uuid");
+
+ b1.Property("Source")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b1.HasKey("ShowId");
+
+ b1.ToTable("shows");
+
+ b1.ToJson("poster");
+
+ b1.WithOwner()
+ .HasForeignKey("ShowId")
+ .HasConstraintName("fk_shows_shows_id");
+ });
+
+ b.OwnsOne("Kyoo.Abstractions.Models.Image", "Thumbnail", b1 =>
+ {
+ b1.Property("ShowId")
+ .HasColumnType("uuid");
+
+ b1.Property("Blurhash")
+ .IsRequired()
+ .HasMaxLength(32)
+ .HasColumnType("character varying(32)");
+
+ b1.Property("Id")
+ .HasColumnType("uuid");
+
+ b1.Property("Source")
+ .IsRequired()
+ .HasColumnType("text");
+
+ b1.HasKey("ShowId");
+
+ b1.ToTable("shows");
+
+ b1.ToJson("thumbnail");
+
+ b1.WithOwner()
+ .HasForeignKey("ShowId")
+ .HasConstraintName("fk_shows_shows_id");
+ });
+
+ b.Navigation("Logo");
+
+ b.Navigation("Poster");
+
+ b.Navigation("Studio");
+
+ b.Navigation("Thumbnail");
+ });
+
+ modelBuilder.Entity("Kyoo.Abstractions.Models.ShowWatchStatus", b =>
+ {
+ b.HasOne("Kyoo.Abstractions.Models.Episode", "NextEpisode")
+ .WithMany()
+ .HasForeignKey("NextEpisodeId")
+ .OnDelete(DeleteBehavior.SetNull)
+ .HasConstraintName("fk_show_watch_status_episodes_next_episode_id");
+
+ b.HasOne("Kyoo.Abstractions.Models.Show", "Show")
+ .WithMany("Watched")
+ .HasForeignKey("ShowId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired()
+ .HasConstraintName("fk_show_watch_status_shows_show_id");
+
+ b.HasOne("Kyoo.Abstractions.Models.User", "User")
+ .WithMany()
+ .HasForeignKey("UserId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired()
+ .HasConstraintName("fk_show_watch_status_users_user_id");
+
+ b.Navigation("NextEpisode");
+
+ b.Navigation("Show");
+
+ b.Navigation("User");
+ });
+
+ modelBuilder.Entity("link_collection_movie", b =>
+ {
+ b.HasOne("Kyoo.Abstractions.Models.Collection", null)
+ .WithMany()
+ .HasForeignKey("collection_id")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired()
+ .HasConstraintName("fk_link_collection_movie_collections_collection_id");
+
+ b.HasOne("Kyoo.Abstractions.Models.Movie", null)
+ .WithMany()
+ .HasForeignKey("movie_id")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired()
+ .HasConstraintName("fk_link_collection_movie_movies_movie_id");
+ });
+
+ modelBuilder.Entity("link_collection_show", b =>
+ {
+ b.HasOne("Kyoo.Abstractions.Models.Collection", null)
+ .WithMany()
+ .HasForeignKey("collection_id")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired()
+ .HasConstraintName("fk_link_collection_show_collections_collection_id");
+
+ b.HasOne("Kyoo.Abstractions.Models.Show", null)
+ .WithMany()
+ .HasForeignKey("show_id")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired()
+ .HasConstraintName("fk_link_collection_show_shows_show_id");
+ });
+
+ modelBuilder.Entity("Kyoo.Abstractions.Models.Episode", b =>
+ {
+ b.Navigation("Watched");
+ });
+
+ modelBuilder.Entity("Kyoo.Abstractions.Models.Movie", b =>
+ {
+ b.Navigation("Watched");
+ });
+
+ modelBuilder.Entity("Kyoo.Abstractions.Models.Season", b =>
+ {
+ b.Navigation("Episodes");
+ });
+
+ modelBuilder.Entity("Kyoo.Abstractions.Models.Show", b =>
+ {
+ b.Navigation("Episodes");
+
+ b.Navigation("Seasons");
+
+ b.Navigation("Watched");
+ });
+
+ modelBuilder.Entity("Kyoo.Abstractions.Models.Studio", b =>
+ {
+ b.Navigation("Movies");
+
+ b.Navigation("Shows");
+ });
+#pragma warning restore 612, 618
+ }
+ }
+}
diff --git a/back/src/Kyoo.Postgresql/Migrations/20240506175054_FixSeasonMetadataId.cs b/back/src/Kyoo.Postgresql/Migrations/20240506175054_FixSeasonMetadataId.cs
new file mode 100644
index 00000000..c4bb048b
--- /dev/null
+++ b/back/src/Kyoo.Postgresql/Migrations/20240506175054_FixSeasonMetadataId.cs
@@ -0,0 +1,33 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Kyoo.Postgresql.Migrations
+{
+ ///
+ public partial class FixSeasonMetadataId : Migration
+ {
+ ///
+ protected override void Up(MigrationBuilder migrationBuilder)
+ {
+ // language=PostgreSQL
+ migrationBuilder.Sql(
+ """
+ update seasons as s set external_id = (
+ SELECT jsonb_build_object(
+ 'themoviedatabase', jsonb_build_object(
+ 'DataId', sh.external_id->'themoviedatabase'->'DataId',
+ 'Link', s.external_id->'themoviedatabase'->'Link'
+ )
+ )
+ FROM shows AS sh
+ WHERE sh.id = s.show_id
+ );
+ """
+ );
+ }
+
+ ///
+ protected override void Down(MigrationBuilder migrationBuilder) { }
+ }
+}
diff --git a/scanner/providers/implementations/themoviedatabase.py b/scanner/providers/implementations/themoviedatabase.py
index e6f5193c..3abb19b2 100644
--- a/scanner/providers/implementations/themoviedatabase.py
+++ b/scanner/providers/implementations/themoviedatabase.py
@@ -377,7 +377,7 @@ class TheMovieDatabase(Provider):
end_air=None,
external_id={
self.name: MetadataID(
- season["id"],
+ show_id,
f"https://www.themoviedb.org/tv/{show_id}/season/{season['season_number']}",
)
},
diff --git a/transcoder/src/codec.go b/transcoder/src/codec.go
index 023ce166..e6afd0ac 100644
--- a/transcoder/src/codec.go
+++ b/transcoder/src/codec.go
@@ -1,6 +1,7 @@
package src
import (
+ "cmp"
"fmt"
"strings"
@@ -14,7 +15,7 @@ import (
//
// this code is addapted from https://github.com/jellyfin/jellyfin/blob/master/Jellyfin.Api/Helpers/HlsCodecStringHelpers.cs
func GetMimeCodec(mi *mediainfo.File, kind mediainfo.StreamKind, i int) *string {
- codec := Or(
+ codec := cmp.Or(
mi.Parameter(kind, i, "InternetMediaType"),
mi.Parameter(kind, i, "Format"),
)
diff --git a/transcoder/src/info.go b/transcoder/src/info.go
index b79fdeb8..5a78a1f2 100644
--- a/transcoder/src/info.go
+++ b/transcoder/src/info.go
@@ -1,6 +1,7 @@
package src
import (
+ "cmp"
"encoding/base64"
"encoding/json"
"fmt"
@@ -140,19 +141,6 @@ func ParseTime(str string) float32 {
return (hours*60.+minutes)*60. + seconds + ms/1000.
}
-// Stolen from the cmp.Or code that is not yet released
-// Or returns the first of its arguments that is not equal to the zero value.
-// If no argument is non-zero, it returns the zero value.
-func Or[T comparable](vals ...T) T {
- var zero T
- for _, val := range vals {
- if val != zero {
- return val
- }
- }
- return zero
-}
-
func Map[T, U any](ts []T, f func(T, int) U) []U {
us := make([]U, len(ts))
for i := range ts {
@@ -268,7 +256,7 @@ func getInfo(path string) (*MediaInfo, error) {
Width: ParseUint(mi.Parameter(mediainfo.StreamVideo, i, "Width")),
Height: ParseUint(mi.Parameter(mediainfo.StreamVideo, i, "Height")),
Bitrate: ParseUint(
- Or(
+ cmp.Or(
mi.Parameter(mediainfo.StreamVideo, i, "BitRate"),
mi.Parameter(mediainfo.StreamVideo, i, "OverallBitRate"),
mi.Parameter(mediainfo.StreamVideo, i, "BitRate_Nominal"),