From d4c674f2be5dce8dee9ea2504076a44e6ca87700 Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Sat, 26 Jun 2021 18:29:49 +0200 Subject: [PATCH] Fixing sqlite episodes nullable --- Kyoo.Common/Models/Resources/Episode.cs | 2 +- ...ial.Designer.cs => 20210626141337_Initial.Designer.cs} | 8 ++++---- ...0210621175330_Initial.cs => 20210626141337_Initial.cs} | 6 +++--- ...rs.Designer.cs => 20210626141347_Triggers.Designer.cs} | 8 ++++---- ...10621175342_Triggers.cs => 20210626141347_Triggers.cs} | 0 Kyoo.SqLite/Migrations/SqLiteContextModelSnapshot.cs | 6 +++--- Kyoo.Tests/Library/SpecificTests/EpisodeTest.cs | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) rename Kyoo.SqLite/Migrations/{20210621175330_Initial.Designer.cs => 20210626141337_Initial.Designer.cs} (99%) rename Kyoo.SqLite/Migrations/{20210621175330_Initial.cs => 20210626141337_Initial.cs} (99%) rename Kyoo.SqLite/Migrations/{20210621175342_Triggers.Designer.cs => 20210626141347_Triggers.Designer.cs} (99%) rename Kyoo.SqLite/Migrations/{20210621175342_Triggers.cs => 20210626141347_Triggers.cs} (100%) diff --git a/Kyoo.Common/Models/Resources/Episode.cs b/Kyoo.Common/Models/Resources/Episode.cs index 7c5bd7c7..aa947836 100644 --- a/Kyoo.Common/Models/Resources/Episode.cs +++ b/Kyoo.Common/Models/Resources/Episode.cs @@ -40,7 +40,7 @@ namespace Kyoo.Models } else { - match = Regex.Match(value, @"(?.*)-(?\d*)"); + match = Regex.Match(value, @"(?.+)-(?\d+)"); if (match.Success) { ShowSlug = match.Groups["show"].Value; diff --git a/Kyoo.SqLite/Migrations/20210621175330_Initial.Designer.cs b/Kyoo.SqLite/Migrations/20210626141337_Initial.Designer.cs similarity index 99% rename from Kyoo.SqLite/Migrations/20210621175330_Initial.Designer.cs rename to Kyoo.SqLite/Migrations/20210626141337_Initial.Designer.cs index 26e94354..1337ce6b 100644 --- a/Kyoo.SqLite/Migrations/20210621175330_Initial.Designer.cs +++ b/Kyoo.SqLite/Migrations/20210626141337_Initial.Designer.cs @@ -9,7 +9,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion; namespace Kyoo.SqLite.Migrations { [DbContext(typeof(SqLiteContext))] - [Migration("20210621175330_Initial")] + [Migration("20210626141337_Initial")] partial class Initial { protected override void BuildTargetModel(ModelBuilder modelBuilder) @@ -51,10 +51,10 @@ namespace Kyoo.SqLite.Migrations .ValueGeneratedOnAdd() .HasColumnType("INTEGER"); - b.Property("AbsoluteNumber") + b.Property("AbsoluteNumber") .HasColumnType("INTEGER"); - b.Property("EpisodeNumber") + b.Property("EpisodeNumber") .HasColumnType("INTEGER"); b.Property("Overview") @@ -69,7 +69,7 @@ namespace Kyoo.SqLite.Migrations b.Property("SeasonID") .HasColumnType("INTEGER"); - b.Property("SeasonNumber") + b.Property("SeasonNumber") .HasColumnType("INTEGER"); b.Property("ShowID") diff --git a/Kyoo.SqLite/Migrations/20210621175330_Initial.cs b/Kyoo.SqLite/Migrations/20210626141337_Initial.cs similarity index 99% rename from Kyoo.SqLite/Migrations/20210621175330_Initial.cs rename to Kyoo.SqLite/Migrations/20210626141337_Initial.cs index fb73c02a..87d98348 100644 --- a/Kyoo.SqLite/Migrations/20210621175330_Initial.cs +++ b/Kyoo.SqLite/Migrations/20210626141337_Initial.cs @@ -407,9 +407,9 @@ namespace Kyoo.SqLite.Migrations Slug = table.Column(type: "TEXT", nullable: true), ShowID = table.Column(type: "INTEGER", nullable: false), SeasonID = table.Column(type: "INTEGER", nullable: true), - SeasonNumber = table.Column(type: "INTEGER", nullable: false), - EpisodeNumber = table.Column(type: "INTEGER", nullable: false), - AbsoluteNumber = table.Column(type: "INTEGER", nullable: false), + SeasonNumber = table.Column(type: "INTEGER", nullable: true), + EpisodeNumber = table.Column(type: "INTEGER", nullable: true), + AbsoluteNumber = table.Column(type: "INTEGER", nullable: true), Path = table.Column(type: "TEXT", nullable: true), Thumb = table.Column(type: "TEXT", nullable: true), Title = table.Column(type: "TEXT", nullable: true), diff --git a/Kyoo.SqLite/Migrations/20210621175342_Triggers.Designer.cs b/Kyoo.SqLite/Migrations/20210626141347_Triggers.Designer.cs similarity index 99% rename from Kyoo.SqLite/Migrations/20210621175342_Triggers.Designer.cs rename to Kyoo.SqLite/Migrations/20210626141347_Triggers.Designer.cs index 0f99af22..02045e3f 100644 --- a/Kyoo.SqLite/Migrations/20210621175342_Triggers.Designer.cs +++ b/Kyoo.SqLite/Migrations/20210626141347_Triggers.Designer.cs @@ -9,7 +9,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion; namespace Kyoo.SqLite.Migrations { [DbContext(typeof(SqLiteContext))] - [Migration("20210621175342_Triggers")] + [Migration("20210626141347_Triggers")] partial class Triggers { protected override void BuildTargetModel(ModelBuilder modelBuilder) @@ -51,10 +51,10 @@ namespace Kyoo.SqLite.Migrations .ValueGeneratedOnAdd() .HasColumnType("INTEGER"); - b.Property("AbsoluteNumber") + b.Property("AbsoluteNumber") .HasColumnType("INTEGER"); - b.Property("EpisodeNumber") + b.Property("EpisodeNumber") .HasColumnType("INTEGER"); b.Property("Overview") @@ -69,7 +69,7 @@ namespace Kyoo.SqLite.Migrations b.Property("SeasonID") .HasColumnType("INTEGER"); - b.Property("SeasonNumber") + b.Property("SeasonNumber") .HasColumnType("INTEGER"); b.Property("ShowID") diff --git a/Kyoo.SqLite/Migrations/20210621175342_Triggers.cs b/Kyoo.SqLite/Migrations/20210626141347_Triggers.cs similarity index 100% rename from Kyoo.SqLite/Migrations/20210621175342_Triggers.cs rename to Kyoo.SqLite/Migrations/20210626141347_Triggers.cs diff --git a/Kyoo.SqLite/Migrations/SqLiteContextModelSnapshot.cs b/Kyoo.SqLite/Migrations/SqLiteContextModelSnapshot.cs index fc0b3cbc..58ded130 100644 --- a/Kyoo.SqLite/Migrations/SqLiteContextModelSnapshot.cs +++ b/Kyoo.SqLite/Migrations/SqLiteContextModelSnapshot.cs @@ -49,10 +49,10 @@ namespace Kyoo.SqLite.Migrations .ValueGeneratedOnAdd() .HasColumnType("INTEGER"); - b.Property("AbsoluteNumber") + b.Property("AbsoluteNumber") .HasColumnType("INTEGER"); - b.Property("EpisodeNumber") + b.Property("EpisodeNumber") .HasColumnType("INTEGER"); b.Property("Overview") @@ -67,7 +67,7 @@ namespace Kyoo.SqLite.Migrations b.Property("SeasonID") .HasColumnType("INTEGER"); - b.Property("SeasonNumber") + b.Property("SeasonNumber") .HasColumnType("INTEGER"); b.Property("ShowID") diff --git a/Kyoo.Tests/Library/SpecificTests/EpisodeTest.cs b/Kyoo.Tests/Library/SpecificTests/EpisodeTest.cs index 22c4cdee..156bc9b2 100644 --- a/Kyoo.Tests/Library/SpecificTests/EpisodeTest.cs +++ b/Kyoo.Tests/Library/SpecificTests/EpisodeTest.cs @@ -60,7 +60,7 @@ namespace Kyoo.Tests.Library ID = 1, SeasonNumber = 2 }, false); - Assert.Equal($"{TestSample.Get().Slug}-s2e2", episode.Slug); + Assert.Equal($"{TestSample.Get().Slug}-s2e1", episode.Slug); episode = await _repository.Get(1); Assert.Equal($"{TestSample.Get().Slug}-s2e1", episode.Slug); }