Cutlery/Kyoo
1
0
Fork 0
mirror of https://github.com/zoriya/Kyoo.git synced 2025-07-09 03:04:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Finishing the register episode task

Browse Source
This commit is contained in:
Zoe Roux 2021-07-17 00:51:15 +02:00
parent 5f98484b4a
commit f71ae0385c
3 changed files with 56 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Kyoo/Controllers/RegexIdentifier.cs
View File

@ -38,8 +38,7 @@ namespace Kyoo.Controllers
/// <inheritdoc /> /// <inheritdoc />
public Task<(Collection, Show, Season, Episode)> Identify(string path) public Task<(Collection, Show, Season, Episode)> Identify(string path)
{ {
string pattern = _configuration.Value.Regex; Regex regex = new(_configuration.Value.Regex, RegexOptions.IgnoreCase | RegexOptions.Compiled);
Regex regex = new(pattern, RegexOptions.IgnoreCase | RegexOptions.Compiled);
Match match = regex.Match(path); Match match = regex.Match(path);
if (!match.Success) if (!match.Success)
@ -51,9 +50,12 @@ namespace Kyoo.Controllers
(Collection collection, Show show, Season season, Episode episode) ret = new(); (Collection collection, Show show, Season season, Episode episode) ret = new();
ret.collection.Name = match.Groups["Collection"].Value; ret.collection.Name = match.Groups["Collection"].Value;
ret.collection.Slug = Utility.ToSlug(ret.collection.Name);
ret.show.Title = match.Groups["Show"].Value; ret.show.Title = match.Groups["Show"].Value;
ret.show.Slug = Utility.ToSlug(ret.show.Title);
ret.show.Path = Path.GetDirectoryName(path); ret.show.Path = Path.GetDirectoryName(path);
ret.episode.Path = path;
if (match.Groups["StartYear"].Success && int.TryParse(match.Groups["StartYear"].Value, out int tmp)) if (match.Groups["StartYear"].Success && int.TryParse(match.Groups["StartYear"].Value, out int tmp))
ret.show.StartAir = new DateTime(tmp, 1, 1); ret.show.StartAir = new DateTime(tmp, 1, 1);
@ -70,9 +72,13 @@ namespace Kyoo.Controllers
if (match.Groups["Absolute"].Success && int.TryParse(match.Groups["Absolute"].Value, out tmp)) if (match.Groups["Absolute"].Success && int.TryParse(match.Groups["Absolute"].Value, out tmp))
ret.episode.AbsoluteNumber = tmp; ret.episode.AbsoluteNumber = tmp;
ret.show.IsMovie = ret.episode.SeasonNumber == null && ret.episode.EpisodeNumber == null if (ret.episode.SeasonNumber == null && ret.episode.EpisodeNumber == null
&& ret.episode.AbsoluteNumber == null; && ret.episode.AbsoluteNumber == null)
{
ret.show.IsMovie = true;
ret.episode.Title = ret.show.Title;
}
return Task.FromResult(ret); return Task.FromResult(ret);
} }
} }

1
Kyoo/Startup.cs
View File

@ -3,7 +3,6 @@ using System.IO;
using Autofac; using Autofac;
using Kyoo.Authentication; using Kyoo.Authentication;
using Kyoo.Controllers; using Kyoo.Controllers;
using Kyoo.Models;
using Kyoo.Models.Options; using Kyoo.Models.Options;
using Kyoo.Postgresql; using Kyoo.Postgresql;
using Kyoo.Tasks; using Kyoo.Tasks;

193
Kyoo/Tasks/RegisterEpisode.cs
View File

@ -1,4 +1,5 @@
using System; using System;
using System.Linq;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Kyoo.Controllers; using Kyoo.Controllers;
@ -52,6 +53,10 @@ namespace Kyoo.Tasks
/// </summary> /// </summary>
[Injected] public IThumbnailsManager ThumbnailsManager { private get; set; } [Injected] public IThumbnailsManager ThumbnailsManager { private get; set; }
/// <summary> /// <summary>
/// The transcoder used to extract subtitles and metadata.
/// </summary>
[Injected] public ITranscoder Transcoder { private get; set; }
/// <summary>
/// The logger used to inform the current status to the console. /// The logger used to inform the current status to the console.
/// </summary> /// </summary>
[Injected] public ILogger<RegisterEpisode> Logger { private get; set; } [Injected] public ILogger<RegisterEpisode> Logger { private get; set; }
@ -62,7 +67,7 @@ namespace Kyoo.Tasks
return new() return new()
{ {
TaskParameter.CreateRequired<string>("path", "The path of the episode file"), TaskParameter.CreateRequired<string>("path", "The path of the episode file"),
TaskParameter.Create<Library>("library", "The library in witch the episode is") TaskParameter.CreateRequired<Library>("library", "The library in witch the episode is")
}; };
} }
@ -74,42 +79,53 @@ namespace Kyoo.Tasks
try try
{ {
(Collection collection, Show show, Season season, Episode episode) = await Identifier.Identify(path);
if (library != null) if (library != null)
{
if (library.Providers == null)
await LibraryManager.Load(library, x => x.Providers);
MetadataProvider.UseProviders(library.Providers); MetadataProvider.UseProviders(library.Providers);
}
if (collection != null) (Collection collection, Show show, Season season, Episode episode) = await Identifier.Identify(path);
collection.Slug ??= Utility.ToSlug(collection.Name);
collection = await _RegisterAndFill(collection); collection = await _RegisterAndFill(collection);
show = await _RegisterAndFill(show);
// if (isMovie) Show registeredShow = await _RegisterAndFill(show);
// await libraryManager!.Create(await GetMovie(show, path)); if (registeredShow.Path != show.Path)
// else {
// { if (show.StartAir.HasValue)
// Season season = seasonNumber != null {
// ? await GetSeason(libraryManager, show, seasonNumber.Value, library) show.Slug += $"-{show.StartAir.Value.Year}";
// : null; show = await LibraryManager.Create(show);
// Episode episode = await GetEpisode(libraryManager, }
// show, else
// season, {
// episodeNumber, Logger.LogError("Duplicated show found ({Slug}) at {Path1} and {Path2}",
// absoluteNumber, show.Slug, registeredShow.Path, show.Path);
// path, return;
// library); }
// await libraryManager!.Create(episode); }
// } else
// show = registeredShow;
// await libraryManager.AddShowLink(show, library, collection);
// Console.WriteLine($"Episode at {path} registered."); if (season != null)
season.Show = show;
season = await _RegisterAndFill(season);
episode = await MetadataProvider.Get(episode);
episode.Season = season;
episode.Tracks = (await Transcoder.ExtractInfos(episode, false))
.Where(x => x.Type != StreamType.Attachment)
.ToArray();
await ThumbnailsManager.DownloadImages(episode);
await LibraryManager.Create(episode);
await LibraryManager.AddShowLink(show, library, collection);
} }
catch (DuplicatedItemException ex) catch (DuplicatedItemException ex)
{ {
Logger.LogWarning(ex, "Duplicated found at {Path}", path); Logger.LogWarning(ex, "Duplicated found at {Path}", path);
} }
catch (Exception ex)
{
Logger.LogCritical(ex, "Unknown exception thrown while registering episode at {Path}", path);
}
} }
private async Task<T> _RegisterAndFill<T>(T item) private async Task<T> _RegisterAndFill<T>(T item)
@ -125,49 +141,7 @@ namespace Kyoo.Tasks
await ThumbnailsManager.DownloadImages(item); await ThumbnailsManager.DownloadImages(item);
return await LibraryManager.CreateIfNotExists(item); return await LibraryManager.CreateIfNotExists(item);
} }
// private async Task<Show> GetShow(ILibraryManager libraryManager,
// string showTitle,
// string showPath,
// bool isMovie,
// Library library)
// {
// Show old = await libraryManager.GetOrDefault<Show>(x => x.Path == showPath);
// if (old != null)
// {
// await libraryManager.Load(old, x => x.ExternalIDs);
// return old;
// }
//
// Show show = await MetadataProvider.SearchShow(showTitle, isMovie, library);
// show.Path = showPath;
// show.People = await MetadataProvider.GetPeople(show, library);
//
// try
// {
// show = await libraryManager.Create(show);
// }
// catch (DuplicatedItemException)
// {
// old = await libraryManager.GetOrDefault<Show>(show.Slug);
// if (old != null && old.Path == showPath)
// {
// await libraryManager.Load(old, x => x.ExternalIDs);
// return old;
// }
//
// if (show.StartAir != null)
// {
// show.Slug += $"-{show.StartAir.Value.Year}";
// await libraryManager.Create(show);
// }
// else
// throw;
// }
// await ThumbnailsManager.Validate(show);
// return show;
// }
//
/* /*
* *
private async Task RegisterExternalSubtitle(string path, CancellationToken token) private async Task RegisterExternalSubtitle(string path, CancellationToken token)
@ -215,83 +189,6 @@ namespace Kyoo.Tasks
await Console.Error.WriteLineAsync($"Unknown error while registering subtitle: {ex.Message}"); await Console.Error.WriteLineAsync($"Unknown error while registering subtitle: {ex.Message}");
} }
} }
private async Task<Season> GetSeason(ILibraryManager libraryManager,
Show show,
int seasonNumber,
Library library)
{
try
{
Season season = await libraryManager.Get(show.Slug, seasonNumber);
season.Show = show;
return season;
}
catch (ItemNotFoundException)
{
Season season = new();//await MetadataProvider.GetSeason(show, seasonNumber, library);
try
{
await libraryManager.Create(season);
await ThumbnailsManager.Validate(season);
}
catch (DuplicatedItemException)
{
season = await libraryManager.Get(show.Slug, seasonNumber);
}
season.Show = show;
return season;
}
}
private async Task<Episode> GetEpisode(ILibraryManager libraryManager,
Show show,
Season season,
int? episodeNumber,
int? absoluteNumber,
string episodePath,
Library library)
{
Episode episode = new();
//await MetadataProvider.GetEpisode(show,
// episodePath,
// season?.SeasonNumber,
// episodeNumber,
// absoluteNumber,
// library);
if (episode.SeasonNumber != null)
{
season ??= await GetSeason(libraryManager, show, episode.SeasonNumber.Value, library);
episode.Season = season;
episode.SeasonID = season?.ID;
}
await ThumbnailsManager.Validate(episode);
await GetTracks(episode);
return episode;
}
private async Task<Episode> GetMovie(Show show, string episodePath)
{
Episode episode = new()
{
Title = show.Title,
Path = episodePath,
Show = show,
ShowID = show.ID,
ShowSlug = show.Slug
};
episode.Tracks = await GetTracks(episode);
return episode;
}
private async Task<ICollection<Track>> GetTracks(Episode episode)
{
episode.Tracks = (await Transcoder.ExtractInfos(episode, false))
.Where(x => x.Type != StreamType.Attachment)
.ToArray();
return episode.Tracks;
}
*/ */
} }
} }