michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

Browse Source
This commit is contained in:
Eric Reed 2013-05-14 11:14:08 -04:00
commit 3495321514
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
MediaBrowser.Server.Implementations/IO/DirectoryWatchers.cs
View File

@ -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;
}

2
MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumDiscResolver.cs
View File

@ -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>