diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-03-30 14:03:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-30 14:03:40 -0400 |
| commit | bfb177f8b64f611b8fb2376d86799085f3ef9204 (patch) | |
| tree | 7bf0cc412a66acbe5e8fa94f8f4487b6d00d43a2 /Emby.Server.Implementations | |
| parent | 4165bcb1940e843a0a7b0dfe708b27f182e58bf3 (diff) | |
| parent | 46646b95fde4701e9a879f11e66ad461f805a6a4 (diff) | |
Merge pull request #2558 from MediaBrowser/dev
Dev
Diffstat (limited to 'Emby.Server.Implementations')
3 files changed, 6 insertions, 6 deletions
diff --git a/Emby.Server.Implementations/FileOrganization/TvFolderOrganizer.cs b/Emby.Server.Implementations/FileOrganization/TvFolderOrganizer.cs index c885f03ac..2cbf2613e 100644 --- a/Emby.Server.Implementations/FileOrganization/TvFolderOrganizer.cs +++ b/Emby.Server.Implementations/FileOrganization/TvFolderOrganizer.cs @@ -178,18 +178,18 @@ namespace Emby.Server.Implementations.FileOrganization /// <param name="extensions">The extensions.</param> private void DeleteLeftOverFiles(string path, IEnumerable<string> extensions) { - var eligibleFiles = _fileSystem.GetFiles(path, extensions.ToArray(), false, true) + var eligibleFiles = _fileSystem.GetFilePaths(path, extensions.ToArray(), false, true) .ToList(); foreach (var file in eligibleFiles) { try { - _fileSystem.DeleteFile(file.FullName); + _fileSystem.DeleteFile(file); } catch (Exception ex) { - _logger.ErrorException("Error deleting file {0}", ex, file.FullName); + _logger.ErrorException("Error deleting file {0}", ex, file); } } } diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs index 17e678615..dbb0160a5 100644 --- a/Emby.Server.Implementations/Library/LibraryManager.cs +++ b/Emby.Server.Implementations/Library/LibraryManager.cs @@ -1255,9 +1255,9 @@ namespace Emby.Server.Implementations.Library private string GetCollectionType(string path) { - return _fileSystem.GetFiles(path, new[] { ".collection" }, true, false) + return _fileSystem.GetFilePaths(path, new[] { ".collection" }, true, false) .Select(i => _fileSystem.GetFileNameWithoutExtension(i)) - .FirstOrDefault(); + .FirstOrDefault(i => !string.IsNullOrWhiteSpace(i)); } /// <summary> diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs index 8fa1bbe23..0a21603ee 100644 --- a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs +++ b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs @@ -382,7 +382,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun { id = "native"; } - id += "_" + url.GetMD5().ToString("N"); + id += "_" + channelId.GetMD5().ToString("N") + "_" + url.GetMD5().ToString("N"); var mediaSource = new MediaSourceInfo { |