mirror of
https://github.com/Sonarr/Sonarr.git
synced 2024-10-30 23:42:33 +01:00
Merge branch 'markus101'
This commit is contained in:
commit
b98aab87ae
@ -85,7 +85,7 @@ namespace NzbDrone.Core.Test
|
||||
}
|
||||
|
||||
//assert
|
||||
seasonsNumbers.Should().HaveCount(7);
|
||||
seasonsNumbers.Should().HaveCount(8);
|
||||
seasons[1].Should().HaveCount(23);
|
||||
seasons[2].Should().HaveCount(19);
|
||||
seasons[3].Should().HaveCount(16);
|
||||
|
@ -84,6 +84,10 @@ namespace NzbDrone.Core.Providers.Jobs
|
||||
|
||||
var importedFiles = _diskScanProvider.Scan(series, subfolder);
|
||||
importedFiles.ForEach(file => _diskScanProvider.MoveEpisodeFile(file));
|
||||
|
||||
//Delete the folder only if all files were removed
|
||||
if (_diskProvider.GetFiles(subfolder, "*.*", SearchOption.AllDirectories).Length == 0)
|
||||
_diskProvider.DeleteFolder(subfolder, false);
|
||||
}
|
||||
|
||||
Logger.Debug("New Download Scan Job completed successfully");
|
||||
|
@ -54,7 +54,7 @@ namespace NzbDrone.Web.Controllers
|
||||
{
|
||||
Path = r.Path,
|
||||
CleanPath = r.Path.Replace(Path.DirectorySeparatorChar, '|').Replace(Path.VolumeSeparatorChar, '^').Replace('\'', '`')
|
||||
}).ToList();
|
||||
});
|
||||
ViewData["RootDirs"] = rootDirs;
|
||||
ViewData["DirSep"] = Path.DirectorySeparatorChar.ToString().Replace(Path.DirectorySeparatorChar, '|');
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user