alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-04 06:48:35 +01:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

fix up some merge errors

Browse Source
This commit is contained in:
ebr11 Eric Reed spam
2012-09-17 16:53:39 -04:00
parent f385fe2f20
commit 9fbd88a713
4 changed files with 5 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
MediaBrowser.Controller/IO/DirectoryWatchers.cs
View File

@@ -41,6 +41,7 @@ namespace MediaBrowser.Controller.IO
{
Logger.LogInfo("Watching directory " + path + " for changes.");
var watcher = new FileSystemWatcher(path, "*") { };
watcher.IncludeSubdirectories = true;
watcher.Changed += watcher_Changed;

4
MediaBrowser.Controller/Kernel.cs
View File

@@ -124,6 +124,7 @@ namespace MediaBrowser.Controller
progress.Report(new TaskProgress { Description = "Loading Media Library" });
await ReloadRoot(allowInternetProviders: false).ConfigureAwait(false);
}
/// <summary>
@@ -137,8 +138,6 @@ namespace MediaBrowser.Controller
DisposeWeatherClient();
ItemController.PreBeginResolvePath -= ItemController_PreBeginResolvePath;
ItemController.BeginResolvePath -= ItemController_BeginResolvePath;
}
protected override void OnComposablePartsLoaded()
@@ -188,6 +187,7 @@ namespace MediaBrowser.Controller
DirectoryWatchers.Stop();
RootFolder = await ItemController.GetItem(MediaRootFolderPath, allowInternetProviders: allowInternetProviders).ConfigureAwait(false) as Folder;
RootFolder.ChildrenChanged += RootFolder_ChildrenChanged;
DirectoryWatchers.Start();
}

3
MediaBrowser.Controller/Resolvers/Movies/MovieResolver.cs
View File

@@ -68,7 +68,7 @@ namespace MediaBrowser.Controller.Resolvers.Movies
return new Movie()
{
Path = args.Path,
VideoType = VideoType.DVD
VideoType = VideoType.Dvd
};
}
else if (args.IsBDFolder)
@@ -83,6 +83,7 @@ namespace MediaBrowser.Controller.Resolvers.Movies
// Loop through each child file/folder and see if we find a video
foreach (var child in args.FileSystemChildren)
{
var childArgs = new ItemResolveEventArgs
{
FileInfo = child,
FileSystemChildren = new WIN32_FIND_DATA[] { },