From 9fbd88a7131fd75722ae105ff114523c042eb497 Mon Sep 17 00:00:00 2001 From: ebr11 Eric Reed spam Date: Mon, 17 Sep 2012 16:53:39 -0400 Subject: fix up some merge errors --- MediaBrowser.Controller/IO/DirectoryWatchers.cs | 1 + MediaBrowser.Controller/Kernel.cs | 4 ++-- MediaBrowser.Controller/Resolvers/Movies/MovieResolver.cs | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) (limited to 'MediaBrowser.Controller') diff --git a/MediaBrowser.Controller/IO/DirectoryWatchers.cs b/MediaBrowser.Controller/IO/DirectoryWatchers.cs index 5d5381d9e4..91f74e6777 100644 --- a/MediaBrowser.Controller/IO/DirectoryWatchers.cs +++ b/MediaBrowser.Controller/IO/DirectoryWatchers.cs @@ -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; diff --git a/MediaBrowser.Controller/Kernel.cs b/MediaBrowser.Controller/Kernel.cs index 2ea6a44cfc..f26783480b 100644 --- a/MediaBrowser.Controller/Kernel.cs +++ b/MediaBrowser.Controller/Kernel.cs @@ -124,6 +124,7 @@ namespace MediaBrowser.Controller progress.Report(new TaskProgress { Description = "Loading Media Library" }); await ReloadRoot(allowInternetProviders: false).ConfigureAwait(false); + } /// @@ -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(); } diff --git a/MediaBrowser.Controller/Resolvers/Movies/MovieResolver.cs b/MediaBrowser.Controller/Resolvers/Movies/MovieResolver.cs index 8ac80f8986..e29af64f8d 100644 --- a/MediaBrowser.Controller/Resolvers/Movies/MovieResolver.cs +++ b/MediaBrowser.Controller/Resolvers/Movies/MovieResolver.cs @@ -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[] { }, -- cgit v1.2.3