From 182f1da03e668fe7b99113fc88721fa95bf18ad7 Mon Sep 17 00:00:00 2001 From: softworkz Date: Sun, 10 Jan 2016 06:19:19 +0100 Subject: Added OmdbEpisodeProvider as an alternative source for series episodes This new episode provider implementation does not bulk-download or cache episode data. It is only meant to be a backup source for situations where media is not recognized by the default provider (TheTvDb). --- .../FileOrganization/EpisodeFileOrganizer.cs | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs') diff --git a/MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs b/MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs index ef226a934..7c803793a 100644 --- a/MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs +++ b/MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs @@ -427,11 +427,18 @@ namespace MediaBrowser.Server.Implementations.FileOrganization }, cancellationToken).ConfigureAwait(false); var episode = searchResults.FirstOrDefault(); + + string episodeName = string.Empty; if (episode == null) { - _logger.Warn("No provider metadata found for {0} season {1} episode {2}", series.Name, seasonNumber, episodeNumber); - return null; + var msg = string.Format("No provider metadata found for {0} season {1} episode {2}", series.Name, seasonNumber, episodeNumber); + _logger.Warn(msg); + //throw new Exception(msg); + } + else + { + episodeName = episode.Name; } var newPath = GetSeasonFolderPath(series, seasonNumber, options); @@ -449,7 +456,7 @@ namespace MediaBrowser.Server.Implementations.FileOrganization // Remove additional 4 chars to prevent PathTooLongException for downloaded subtitles (eg. filename.ext.eng.srt) maxFilenameLength -= 4; - var episodeFileName = GetEpisodeFileName(sourcePath, series.Name, seasonNumber, episodeNumber, endingEpisodeNumber, episode.Name, options, maxFilenameLength); + var episodeFileName = GetEpisodeFileName(sourcePath, series.Name, seasonNumber, episodeNumber, endingEpisodeNumber, episodeName, options, maxFilenameLength); if (string.IsNullOrEmpty(episodeFileName)) { -- cgit v1.2.3 From 9fbb304c475d10fd238c16cbbab9a81ebdea0593 Mon Sep 17 00:00:00 2001 From: softworkz Date: Sun, 10 Jan 2016 06:56:32 +0100 Subject: Allow Auto-Organize to succeed even if episode title cannot be determined --- .../FileOrganization/EpisodeFileOrganizer.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs') diff --git a/MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs b/MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs index 7c803793a..c27d266c3 100644 --- a/MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs +++ b/MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs @@ -512,7 +512,7 @@ namespace MediaBrowser.Server.Implementations.FileOrganization { seriesName = _fileSystem.GetValidFilename(seriesName).Trim(); - if (episodeTitle == null) + if (string.IsNullOrEmpty(episodeTitle)) { episodeTitle = string.Empty; } -- cgit v1.2.3