aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller
diff options
context:
space:
mode:
authorLukePulverenti <luke.pulverenti@gmail.com>2013-02-22 20:24:04 -0500
committerLukePulverenti <luke.pulverenti@gmail.com>2013-02-22 20:24:04 -0500
commit57cb08085d61682719c6c2804c37aa6aae6fd470 (patch)
tree5b890fce8cc1eee01f2598a0b4039e7c59175f2b /MediaBrowser.Controller
parent6a5bf9cc780c6cd878be4c5111d64226208f0597 (diff)
fix broken images
Diffstat (limited to 'MediaBrowser.Controller')
-rw-r--r--MediaBrowser.Controller/Entities/IVirtualFolderCreator.cs15
-rw-r--r--MediaBrowser.Controller/Kernel.cs4
-rw-r--r--MediaBrowser.Controller/Library/LibraryManager.cs4
-rw-r--r--MediaBrowser.Controller/MediaBrowser.Controller.csproj1
4 files changed, 20 insertions, 4 deletions
diff --git a/MediaBrowser.Controller/Entities/IVirtualFolderCreator.cs b/MediaBrowser.Controller/Entities/IVirtualFolderCreator.cs
new file mode 100644
index 0000000000..57e9e8d5d9
--- /dev/null
+++ b/MediaBrowser.Controller/Entities/IVirtualFolderCreator.cs
@@ -0,0 +1,15 @@
+
+namespace MediaBrowser.Controller.Entities
+{
+ /// <summary>
+ /// Interface IVirtualFolderCreator
+ /// </summary>
+ public interface IVirtualFolderCreator
+ {
+ /// <summary>
+ /// Gets the folder.
+ /// </summary>
+ /// <returns>Folder.</returns>
+ BasePluginFolder GetFolder();
+ }
+}
diff --git a/MediaBrowser.Controller/Kernel.cs b/MediaBrowser.Controller/Kernel.cs
index 25a0494354..6bd48a5020 100644
--- a/MediaBrowser.Controller/Kernel.cs
+++ b/MediaBrowser.Controller/Kernel.cs
@@ -230,8 +230,7 @@ namespace MediaBrowser.Controller
/// Gets the list of BasePluginFolders added by plugins
/// </summary>
/// <value>The plugin folders.</value>
- [ImportMany(typeof(BasePluginFolder))]
- internal IEnumerable<BasePluginFolder> PluginFolders { get; private set; }
+ internal IEnumerable<IVirtualFolderCreator> PluginFolderCreators { get; private set; }
/// <summary>
/// Gets the list of available user repositories
@@ -387,6 +386,7 @@ namespace MediaBrowser.Controller
IntroProviders = GetExports<IIntroProvider>(allTypes);
PluginConfigurationPages = GetExports<IPluginConfigurationPage>(allTypes);
ImageEnhancers = GetExports<IImageEnhancer>(allTypes);
+ PluginFolderCreators = GetExports<IVirtualFolderCreator>(allTypes);
}
/// <summary>
diff --git a/MediaBrowser.Controller/Library/LibraryManager.cs b/MediaBrowser.Controller/Library/LibraryManager.cs
index 4087f9ef86..dfaef12cbf 100644
--- a/MediaBrowser.Controller/Library/LibraryManager.cs
+++ b/MediaBrowser.Controller/Library/LibraryManager.cs
@@ -186,9 +186,9 @@ namespace MediaBrowser.Controller.Library
var rootFolder = Kernel.ItemRepository.RetrieveItem(rootFolderPath.GetMBId(typeof(AggregateFolder))) as AggregateFolder ?? (AggregateFolder)GetItem(rootFolderPath);
// Add in the plug-in folders
- foreach (var child in Kernel.PluginFolders)
+ foreach (var child in Kernel.PluginFolderCreators)
{
- rootFolder.AddVirtualChild(child);
+ rootFolder.AddVirtualChild(child.GetFolder());
}
return rootFolder;
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index 26107b9c9e..cfd14f2b71 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -95,6 +95,7 @@
<Compile Include="Entities\Genre.cs" />
<Compile Include="Entities\ICollectionFolder.cs" />
<Compile Include="Entities\IndexFolder.cs" />
+ <Compile Include="Entities\IVirtualFolderCreator.cs" />
<Compile Include="Entities\Movies\BoxSet.cs" />
<Compile Include="Entities\Movies\Movie.cs" />
<Compile Include="Entities\Person.cs" />