diff options
| author | 7illusions <z@7illusions.com> | 2014-03-12 21:04:37 +0100 |
|---|---|---|
| committer | 7illusions <z@7illusions.com> | 2014-03-12 21:04:37 +0100 |
| commit | b2df3d648d64982528907bbd716b2c1984fb1345 (patch) | |
| tree | 7bc6bed22253d3dcc468e155c74e30bae7a468fb /MediaBrowser.Server.Implementations/FileOrganization | |
| parent | 438b0078ccd07e39cbf95b737d676a39192d064c (diff) | |
| parent | 37a69d78e1064afaa14e333abd0ede71b92dd216 (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Diffstat (limited to 'MediaBrowser.Server.Implementations/FileOrganization')
| -rw-r--r-- | MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs | 12 |
1 files changed, 5 insertions, 7 deletions
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) |