diff options
| author | Eric Reed <ebr@mediabrowser3.com> | 2013-05-14 11:14:08 -0400 |
|---|---|---|
| committer | Eric Reed <ebr@mediabrowser3.com> | 2013-05-14 11:14:08 -0400 |
| commit | 349532151407ef24cc3954ecf1ca19bb0bc698a9 (patch) | |
| tree | fb91ab9837c2a99049deb6e63b12118a1ab563e2 /MediaBrowser.Server.Implementations | |
| parent | 21419f7bfab9913f5ee0319ffbf35aa934d1db60 (diff) | |
| parent | 0adf788c400e5a25ef50ea97d189cc3c9b8e397c (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Diffstat (limited to 'MediaBrowser.Server.Implementations')
| -rw-r--r-- | MediaBrowser.Server.Implementations/IO/DirectoryWatchers.cs | 6 | ||||
| -rw-r--r-- | MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumDiscResolver.cs | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/MediaBrowser.Server.Implementations/IO/DirectoryWatchers.cs b/MediaBrowser.Server.Implementations/IO/DirectoryWatchers.cs index 7c362a919..441e46f41 100644 --- a/MediaBrowser.Server.Implementations/IO/DirectoryWatchers.cs +++ b/MediaBrowser.Server.Implementations/IO/DirectoryWatchers.cs @@ -369,7 +369,7 @@ namespace MediaBrowser.Server.Implementations.IO lock (_timerLock) { // Extend the timer as long as any of the paths are still being written to. - if (_affectedPaths.Any(p => !FileSystem.GetFileSystemInfo(p.Key).Attributes.HasFlag(FileAttributes.ReadOnly) && IsFileLocked(p.Key))) + if (_affectedPaths.Any(p => IsFileLocked(p.Key))) { Logger.Info("Timer extended."); _updateTimer.Change(TimeSpan.FromSeconds(ConfigurationManager.Configuration.FileWatcherDelay), TimeSpan.FromMilliseconds(-1)); @@ -400,7 +400,9 @@ namespace MediaBrowser.Server.Implementations.IO { var data = FileSystem.GetFileSystemInfo(path); - if (!data.Exists || data.Attributes.HasFlag(FileAttributes.Directory)) + if (!data.Exists + || data.Attributes.HasFlag(FileAttributes.Directory) + || data.Attributes.HasFlag(FileAttributes.ReadOnly)) { return false; } diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumDiscResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumDiscResolver.cs index 9a1065db5..393002a6e 100644 --- a/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumDiscResolver.cs +++ b/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumDiscResolver.cs @@ -15,7 +15,7 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Audio /// <value>The priority.</value> public override ResolverPriority Priority { - get { return ResolverPriority.Third; } // we need to be ahead of the generic folder resolver but behind the movie one + get { return ResolverPriority.Second; } // we need to be ahead of the generic folder resolver but behind the movie one } /// <summary> |