From c4f587dd94a4f21e033a6643493a76e5838f283e Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 12 Mar 2014 15:56:12 -0400 Subject: live tv stream adjustments, add additional dlna params --- .../FileOrganization/EpisodeFileOrganizer.cs | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'MediaBrowser.Server.Implementations/FileOrganization') diff --git a/MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs b/MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs index e5ffd639b..5d326f1ca 100644 --- a/MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs +++ b/MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs @@ -173,25 +173,23 @@ namespace MediaBrowser.Server.Implementations.FileOrganization if (!overwriteExisting) { - if (fileExists || otherDuplicatePaths.Count > 0) + if (options.CopyOriginalFile && fileExists && IsSameEpisode(sourcePath, newPath)) { + _logger.Info("File {0} already copied to new path {1}, stopping organization", sourcePath, newPath); result.Status = FileSortingStatus.SkippedExisting; result.StatusMessage = string.Empty; - result.DuplicatePaths = otherDuplicatePaths; return; } - - if (options.CopyOriginalFile && fileExists && IsSameEpisode(sourcePath, newPath)) + + if (fileExists || otherDuplicatePaths.Count > 0) { - _logger.Info("File {0} already copied to new path {1}, stopping organization", sourcePath, newPath); result.Status = FileSortingStatus.SkippedExisting; result.StatusMessage = string.Empty; + result.DuplicatePaths = otherDuplicatePaths; return; } } - - PerformFileSorting(options, result); if (overwriteExisting) -- cgit v1.2.3