update dialogs
This commit is contained in:
parent
2a6a6d6911
commit
4e0adb17e7
|
@ -566,5 +566,8 @@ namespace MediaBrowser.Controller.Library
|
|||
QueryResult<Tuple<BaseItem, ItemCounts>> GetArtists(InternalItemsQuery query);
|
||||
QueryResult<Tuple<BaseItem, ItemCounts>> GetAlbumArtists(InternalItemsQuery query);
|
||||
QueryResult<Tuple<BaseItem, ItemCounts>> GetAllArtists(InternalItemsQuery query);
|
||||
|
||||
void RegisterIgnoredPath(string path);
|
||||
void UnRegisterIgnoredPath(string path);
|
||||
}
|
||||
}
|
|
@ -621,9 +621,38 @@ namespace MediaBrowser.Server.Implementations.Library
|
|||
return ResolveItem(args, resolvers);
|
||||
}
|
||||
|
||||
private readonly List<string> _ignoredPaths = new List<string>();
|
||||
|
||||
public void RegisterIgnoredPath(string path)
|
||||
{
|
||||
lock (_ignoredPaths)
|
||||
{
|
||||
_ignoredPaths.Add(path);
|
||||
}
|
||||
}
|
||||
public void UnRegisterIgnoredPath(string path)
|
||||
{
|
||||
lock (_ignoredPaths)
|
||||
{
|
||||
_ignoredPaths.Remove(path);
|
||||
}
|
||||
}
|
||||
|
||||
public bool IgnoreFile(FileSystemMetadata file, BaseItem parent)
|
||||
{
|
||||
return EntityResolutionIgnoreRules.Any(r => r.ShouldIgnore(file, parent));
|
||||
if (EntityResolutionIgnoreRules.Any(r => r.ShouldIgnore(file, parent)))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
//lock (_ignoredPaths)
|
||||
{
|
||||
if (_ignoredPaths.Contains(file.FullName, StringComparer.OrdinalIgnoreCase))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public IEnumerable<FileSystemMetadata> NormalizeRootPathList(IEnumerable<FileSystemMetadata> paths)
|
||||
|
|
|
@ -993,6 +993,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
|
|||
recordPath = recorder.GetOutputPath(mediaStreamInfo, recordPath);
|
||||
recordPath = EnsureFileUnique(recordPath, timer.Id);
|
||||
|
||||
_libraryManager.RegisterIgnoredPath(recordPath);
|
||||
_libraryMonitor.ReportFileSystemChangeBeginning(recordPath);
|
||||
_fileSystem.CreateDirectory(Path.GetDirectoryName(recordPath));
|
||||
activeRecordingInfo.Path = recordPath;
|
||||
|
@ -1044,6 +1045,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
|
|||
semaphore.Release();
|
||||
}
|
||||
|
||||
_libraryManager.UnRegisterIgnoredPath(recordPath);
|
||||
_libraryMonitor.ReportFileSystemChangeComplete(recordPath, true);
|
||||
|
||||
ActiveRecordingInfo removed;
|
||||
|
|
|
@ -42,12 +42,6 @@ namespace MediaBrowser.Server.Startup.Common.Migrations
|
|||
{
|
||||
var updateLevel = _config.Configuration.SystemUpdateLevel;
|
||||
|
||||
if (updateLevel == PackageVersionClass.Dev)
|
||||
{
|
||||
// It's already dev, there's nothing to check
|
||||
return;
|
||||
}
|
||||
|
||||
await CheckVersion(currentVersion, updateLevel, CancellationToken.None).ConfigureAwait(false);
|
||||
}
|
||||
catch
|
||||
|
|
Loading…
Reference in New Issue
Block a user