Cutlery/Kyoo
1
0
Fork 0
mirror of https://github.com/zoriya/Kyoo.git synced 2025-05-24 02:02:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Nit picks files names

Browse Source
This commit is contained in:
Zoe Roux 2023-11-14 17:28:53 +01:00
parent aa4ea2134a
commit b9932383c6
6 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
back/src/Kyoo.Abstractions/Models/Resources/Episode.cs
View File

@ -238,7 +238,7 @@ namespace Kyoo.Abstractions.Models
|| (x.SeasonNumber == SeasonNumber && x.EpisodeNumber > EpisodeNumber) || (x.SeasonNumber == SeasonNumber && x.EpisodeNumber > EpisodeNumber)
); );
[SerializeIgnore] public ICollection<EpisodeWatchStatus> Watched { get; set; } [SerializeIgnore] public ICollection<EpisodeWatchStatus>? Watched { get; set; }
/// <summary> /// <summary>
/// Metadata of what an user as started/planned to watch. /// Metadata of what an user as started/planned to watch.
@ -247,7 +247,7 @@ namespace Kyoo.Abstractions.Models
[LoadableRelation] public EpisodeWatchStatus? WatchStatus { get; set; } [LoadableRelation] public EpisodeWatchStatus? WatchStatus { get; set; }
// There is a global query filter to filter by user so we just need to do single. // There is a global query filter to filter by user so we just need to do single.
private EpisodeWatchStatus? _WatchStatus => Watched.FirstOrDefault(); private EpisodeWatchStatus? _WatchStatus => Watched!.FirstOrDefault();
/// <summary> /// <summary>
/// Links to watch this episode. /// Links to watch this episode.

6
back/src/Kyoo.Abstractions/Models/Resources/Movie.cs
View File

@ -146,16 +146,16 @@ namespace Kyoo.Abstractions.Models
Hls = $"/video/movie/{Slug}/master.m3u8", Hls = $"/video/movie/{Slug}/master.m3u8",
}; };
[SerializeIgnore] public ICollection<MovieWatchStatus> Watched { get; set; } [SerializeIgnore] public ICollection<MovieWatchStatus>? Watched { get; set; }
/// <summary> /// <summary>
/// Metadata of what an user as started/planned to watch. /// Metadata of what an user as started/planned to watch.
/// </summary> /// </summary>
[Projectable(UseMemberBody = nameof(_WatchStatus), OnlyOnInclude = true)] [Projectable(UseMemberBody = nameof(_WatchStatus), OnlyOnInclude = true)]
[LoadableRelation] public MovieWatchStatus WatchStatus { get; set; } [LoadableRelation] public MovieWatchStatus? WatchStatus { get; set; }
// There is a global query filter to filter by user so we just need to do single. // There is a global query filter to filter by user so we just need to do single.
private MovieWatchStatus? _WatchStatus => Watched.FirstOrDefault(); private MovieWatchStatus? _WatchStatus => Watched!.FirstOrDefault();
/// <inheritdoc /> /// <inheritdoc />
public void OnMerge(object merged) public void OnMerge(object merged)

4
back/src/Kyoo.Abstractions/Models/Resources/Show.cs
View File

@ -187,7 +187,7 @@ namespace Kyoo.Abstractions.Models
private int _EpisodesCount => Episodes!.Count; private int _EpisodesCount => Episodes!.Count;
[SerializeIgnore] public ICollection<ShowWatchStatus> Watched { get; set; } [SerializeIgnore] public ICollection<ShowWatchStatus>? Watched { get; set; }
/// <summary> /// <summary>
/// Metadata of what an user as started/planned to watch. /// Metadata of what an user as started/planned to watch.
@ -196,7 +196,7 @@ namespace Kyoo.Abstractions.Models
[LoadableRelation] public ShowWatchStatus? WatchStatus { get; set; } [LoadableRelation] public ShowWatchStatus? WatchStatus { get; set; }
// There is a global query filter to filter by user so we just need to do single. // There is a global query filter to filter by user so we just need to do single.
private ShowWatchStatus? _WatchStatus => Watched.FirstOrDefault(); private ShowWatchStatus? _WatchStatus => Watched!.FirstOrDefault();
/// <inheritdoc /> /// <inheritdoc />
public void OnMerge(object merged) public void OnMerge(object merged)

4
back/src/Kyoo.Abstractions/Models/Resources/WatchInfo.cs → back/src/Kyoo.Abstractions/Models/Resources/WatchStatus.cs
View File

@ -217,7 +217,7 @@ namespace Kyoo.Abstractions.Models
[NotMapped] [NotMapped]
public int? WatchedTime { get; set; } public int? WatchedTime { get; set; }
private int? _WatchedTime => NextEpisode?.Watched.FirstOrDefault()?.WatchedTime; private int? _WatchedTime => NextEpisode?.Watched!.FirstOrDefault()?.WatchedTime;
/// <summary> /// <summary>
/// Where the player has stopped watching the episode (in percentage between 0 and 100). /// Where the player has stopped watching the episode (in percentage between 0 and 100).
@ -229,6 +229,6 @@ namespace Kyoo.Abstractions.Models
[NotMapped] [NotMapped]
public int? WatchedPercent { get; set; } public int? WatchedPercent { get; set; }
private int? _WatchedPercent => NextEpisode?.Watched.FirstOrDefault()?.WatchedPercent; private int? _WatchedPercent => NextEpisode?.Watched!.FirstOrDefault()?.WatchedPercent;
} }
} }

1
back/src/Kyoo.Core/CoreModule.cs
View File

@ -67,6 +67,7 @@ namespace Kyoo.Core
builder.RegisterRepository<StudioRepository>(); builder.RegisterRepository<StudioRepository>();
builder.RegisterRepository<UserRepository>(); builder.RegisterRepository<UserRepository>();
builder.RegisterRepository<NewsRepository>(); builder.RegisterRepository<NewsRepository>();
builder.RegisterType<WatchStatusRepository>().As<IWatchStatusRepository>().AsSelf().InstancePerLifetimeScope();
} }
/// <inheritdoc /> /// <inheritdoc />

2
back/src/Kyoo.Postgresql/DatabaseContext.cs
View File

@ -175,7 +175,7 @@ namespace Kyoo.Postgresql
{ {
// TODO: Waiting for https://github.com/dotnet/efcore/issues/29825 // TODO: Waiting for https://github.com/dotnet/efcore/issues/29825
// modelBuilder.Entity<T>() // modelBuilder.Entity<T>()
// .OwnsOne(x => x.ExternalIDs, x => // .OwnsOne(x => x.ExternalId, x =>
// { // {
// x.ToJson(); // x.ToJson();
// }); // });