diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-05-04 15:05:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-04 15:05:22 -0400 |
| commit | 6e53aa0e076c2ce2bd7b1a462196b099c77f90e5 (patch) | |
| tree | 0fb73d80406fffe26b77c40c288389a291ddd3af /Emby.Server.Core | |
| parent | fb74ee3bb616f7532c79bec0113a14fec3a65be1 (diff) | |
| parent | 364c8206bf500ac466d5360ddfe01b67fa8b59a9 (diff) | |
Merge pull request #2613 from MediaBrowser/dev
Dev
Diffstat (limited to 'Emby.Server.Core')
| -rw-r--r-- | Emby.Server.Core/ApplicationHost.cs | 2 | ||||
| -rw-r--r-- | Emby.Server.Core/IO/LibraryMonitor.cs | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/Emby.Server.Core/ApplicationHost.cs b/Emby.Server.Core/ApplicationHost.cs index 994b942e9..78bdc1189 100644 --- a/Emby.Server.Core/ApplicationHost.cs +++ b/Emby.Server.Core/ApplicationHost.cs @@ -1145,7 +1145,7 @@ namespace Emby.Server.Core { if (!FileSystemManager.FileExists(certPath)) { - FileSystemManager.CreateDirectory(Path.GetDirectoryName(certPath)); + FileSystemManager.CreateDirectory(FileSystemManager.GetDirectoryName(certPath)); try { diff --git a/Emby.Server.Core/IO/LibraryMonitor.cs b/Emby.Server.Core/IO/LibraryMonitor.cs index ae7b66597..0f6a2e9a2 100644 --- a/Emby.Server.Core/IO/LibraryMonitor.cs +++ b/Emby.Server.Core/IO/LibraryMonitor.cs @@ -453,7 +453,7 @@ namespace Emby.Server.Core.IO // If the parent of an ignored path has a change event, ignore that too if (tempIgnorePaths.Any(i => { - if (string.Equals(i, path, StringComparison.OrdinalIgnoreCase)) + if (_fileSystem.AreEqual(i, path)) { Logger.Debug("Ignoring change to {0}", path); return true; @@ -466,10 +466,10 @@ namespace Emby.Server.Core.IO } // Go up a level - var parent = Path.GetDirectoryName(i); + var parent = _fileSystem.GetDirectoryName(i); if (!string.IsNullOrEmpty(parent)) { - if (string.Equals(parent, path, StringComparison.OrdinalIgnoreCase)) + if (_fileSystem.AreEqual(parent, path)) { Logger.Debug("Ignoring change to {0}", path); return true; @@ -492,7 +492,7 @@ namespace Emby.Server.Core.IO private void CreateRefresher(string path) { - var parentPath = Path.GetDirectoryName(path); + var parentPath = _fileSystem.GetDirectoryName(path); lock (_activeRefreshers) { @@ -500,7 +500,7 @@ namespace Emby.Server.Core.IO foreach (var refresher in refreshers) { // Path is already being refreshed - if (string.Equals(path, refresher.Path, StringComparison.Ordinal)) + if (_fileSystem.AreEqual(path, refresher.Path)) { refresher.RestartTimer(); return; @@ -521,7 +521,7 @@ namespace Emby.Server.Core.IO } // They are siblings. Rebase the refresher to the parent folder. - if (string.Equals(parentPath, Path.GetDirectoryName(refresher.Path), StringComparison.Ordinal)) + if (string.Equals(parentPath, _fileSystem.GetDirectoryName(refresher.Path), StringComparison.Ordinal)) { refresher.ResetPath(parentPath, path); return; |