aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Implementations/FileOrganization
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2015-02-15 19:33:06 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2015-02-15 19:33:06 -0500
commit8051ea9b1bebcccfa1471c1a3db0e03fd7a70bcd (patch)
tree2d3762a3bc0b2f581043aed093d06077d75c5926 /MediaBrowser.Server.Implementations/FileOrganization
parent18ff8aba74593f4ad47aba5f001c812b2c9393fe (diff)
update javascript connection manager to latest feature set
Diffstat (limited to 'MediaBrowser.Server.Implementations/FileOrganization')
-rw-r--r--MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs17
1 files changed, 13 insertions, 4 deletions
diff --git a/MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs b/MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs
index 10e50e497..7415fe092 100644
--- a/MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs
+++ b/MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs
@@ -210,7 +210,7 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
try
{
- _fileSystem.DeleteFile(path);
+ DeleteLibraryFile(path);
}
catch (IOException ex)
{
@@ -224,6 +224,15 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
}
}
+ private void DeleteLibraryFile(string path)
+ {
+ var filename = Path.GetFileNameWithoutExtension(path);
+
+ _fileSystem.DeleteFile(path);
+
+ // Now find other files
+ }
+
private List<string> GetOtherDuplicatePaths(string targetPath, Series series, int seasonNumber, int episodeNumber, int? endingEpisodeNumber)
{
var episodePaths = series.GetRecursiveChildren()
@@ -281,11 +290,11 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
Directory.CreateDirectory(Path.GetDirectoryName(result.TargetPath));
- var copy = File.Exists(result.TargetPath);
+ var targetAlreadyExists = File.Exists(result.TargetPath);
try
{
- if (copy || options.CopyOriginalFile)
+ if (targetAlreadyExists || options.CopyOriginalFile)
{
File.Copy(result.OriginalPath, result.TargetPath, true);
}
@@ -312,7 +321,7 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
_libraryMonitor.ReportFileSystemChangeComplete(result.TargetPath, true);
}
- if (copy && !options.CopyOriginalFile)
+ if (targetAlreadyExists && !options.CopyOriginalFile)
{
try
{