michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

parse episode index number at resolve time

Browse Source
This commit is contained in:
Luke Pulverenti 2013-05-19 13:05:33 -04:00
parent b2163c77dc
commit f9c00a6145
3 changed files with 43 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
MediaBrowser.Controller/Library/TVUtils.cs
View File

@ -1,4 +1,5 @@
using MediaBrowser.Controller.Resolvers;
using System.Globalization;
using MediaBrowser.Controller.Resolvers;
using System;
using System.Collections.Generic;
using System.IO;
@ -184,8 +185,7 @@ namespace MediaBrowser.Controller.Library
}
else
{
if (EntityResolutionHelper.IsVideoFile(child.FullName) &&
!string.IsNullOrEmpty(EpisodeNumberFromFile(child.FullName, false)))
if (EntityResolutionHelper.IsVideoFile(child.FullName) && GetEpisodeNumberFromFile(child.FullName, false).HasValue)
{
return true;
}
@ -201,14 +201,14 @@ namespace MediaBrowser.Controller.Library
/// <param name="fullPath">The full path.</param>
/// <param name="isInSeason">if set to <c>true</c> [is in season].</param>
/// <returns>System.String.</returns>
public static string EpisodeNumberFromFile(string fullPath, bool isInSeason)
public static int? GetEpisodeNumberFromFile(string fullPath, bool isInSeason)
{
string fl = fullPath.ToLower();
foreach (var r in EpisodeExpressions)
{
Match m = r.Match(fl);
if (m.Success)
return m.Groups["epnumber"].Value;
return ParseEpisodeNumber(m.Groups["epnumber"].Value);
}
if (isInSeason)
{
@ -217,13 +217,27 @@ namespace MediaBrowser.Controller.Library
if (match != null)
{
return match.Value;
return ParseEpisodeNumber(match.Value);
}
}
return null;
}
private static readonly CultureInfo UsCulture = new CultureInfo("en-US");
private static int? ParseEpisodeNumber(string val)
{
int num;
if (!string.IsNullOrEmpty(val) && int.TryParse(val, NumberStyles.Integer, UsCulture, out num))
{
return num;
}
return null;
}
/// <summary>
/// Seasons the number from episode file.
/// </summary>

6
MediaBrowser.Controller/Providers/TV/RemoteEpisodeProvider.cs
View File

@ -144,18 +144,16 @@ namespace MediaBrowser.Controller.Providers.TV
{
string location = episode.Path;
string epNum = TVUtils.EpisodeNumberFromFile(location, episode.Season != null);
var episodeNumber = episode.IndexNumber ?? TVUtils.GetEpisodeNumberFromFile(location, episode.Season != null);
var status = ProviderRefreshStatus.Success;
if (epNum == null)
if (episodeNumber == null)
{
Logger.Warn("TvDbProvider: Could not determine episode number for: " + episode.Path);
return status;
}
var episodeNumber = Int32.Parse(epNum);
episode.IndexNumber = episodeNumber;
var usingAbsoluteData = false;

31
MediaBrowser.Server.Implementations/Library/Resolvers/TV/EpisodeResolver.cs
View File

@ -18,30 +18,41 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.TV
/// <returns>Episode.</returns>
protected override Episode Resolve(ItemResolveArgs args)
{
var isInSeason = args.Parent is Season;
// If the parent is a Season or Series, then this is an Episode if the VideoResolver returns something
if (args.Parent is Season || args.Parent is Series)
if (isInSeason || args.Parent is Series)
{
if (args.IsDirectory)
{
if (args.ContainsFileSystemEntryByName("video_ts"))
{
return new Episode
{
Path = args.Path,
VideoType = VideoType.Dvd
};
{
IndexNumber = TVUtils.GetEpisodeNumberFromFile(args.Path, isInSeason),
Path = args.Path,
VideoType = VideoType.Dvd
};
}
if (args.ContainsFileSystemEntryByName("bdmv"))
{
return new Episode
{
Path = args.Path,
VideoType = VideoType.BluRay
};
{
IndexNumber = TVUtils.GetEpisodeNumberFromFile(args.Path, isInSeason),
Path = args.Path,
VideoType = VideoType.BluRay
};
}
}
return base.Resolve(args);
var episide = base.Resolve(args);
if (episide != null)
{
episide.IndexNumber = TVUtils.GetEpisodeNumberFromFile(args.Path, isInSeason);
}
return episide;
}
return null;