live tv stream adjustments, add additional dlna params

This commit is contained in:
Luke Pulverenti
2014-03-12 15:56:12 -04:00
parent a5b807e433
commit c4f587dd94
36 changed files with 206 additions and 173 deletions

View File

@@ -173,14 +173,6 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
if (!overwriteExisting)
{
if (fileExists || otherDuplicatePaths.Count > 0)
{
result.Status = FileSortingStatus.SkippedExisting;
result.StatusMessage = string.Empty;
result.DuplicatePaths = otherDuplicatePaths;
return;
}
if (options.CopyOriginalFile && fileExists && IsSameEpisode(sourcePath, newPath))
{
_logger.Info("File {0} already copied to new path {1}, stopping organization", sourcePath, newPath);
@@ -188,10 +180,16 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
result.StatusMessage = string.Empty;
return;
}
if (fileExists || otherDuplicatePaths.Count > 0)
{
result.Status = FileSortingStatus.SkippedExisting;
result.StatusMessage = string.Empty;
result.DuplicatePaths = otherDuplicatePaths;
return;
}
}
PerformFileSorting(options, result);
if (overwriteExisting)