diff options
| author | ebr11 Eric Reed spam <ebr11 Eric Reed spam@reedsplace.com> | 2012-09-17 16:53:39 -0400 |
|---|---|---|
| committer | ebr11 Eric Reed spam <ebr11 Eric Reed spam@reedsplace.com> | 2012-09-17 16:53:39 -0400 |
| commit | 9fbd88a7131fd75722ae105ff114523c042eb497 (patch) | |
| tree | e3baaaa2a5283726c4d6188de35337ba022ead7f /MediaBrowser.Controller | |
| parent | f385fe2f201c6727b04acb4b8b57f2b9fc086dd4 (diff) | |
fix up some merge errors
Diffstat (limited to 'MediaBrowser.Controller')
| -rw-r--r-- | MediaBrowser.Controller/IO/DirectoryWatchers.cs | 1 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Kernel.cs | 4 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Resolvers/Movies/MovieResolver.cs | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/MediaBrowser.Controller/IO/DirectoryWatchers.cs b/MediaBrowser.Controller/IO/DirectoryWatchers.cs index 5d5381d9e..91f74e677 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 2ea6a44cf..f26783480 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);
+
}
/// <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();
}
diff --git a/MediaBrowser.Controller/Resolvers/Movies/MovieResolver.cs b/MediaBrowser.Controller/Resolvers/Movies/MovieResolver.cs index 8ac80f898..e29af64f8 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[] { },
|