aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukePulverenti <luke.pulverenti@gmail.com>2013-03-04 23:29:43 -0500
committerLukePulverenti <luke.pulverenti@gmail.com>2013-03-04 23:29:43 -0500
commitbf95cfe2e50517df46e6f849aba58b6fed2141c7 (patch)
tree5e6ab637c2c999895b1ed93ad93fce49253abcfb
parentbf9e24502c26bc130960cebc6b1be16635070bc8 (diff)
removed the IsCorePlugin property
-rw-r--r--MediaBrowser.Api/MediaBrowser.Api.csproj1
-rw-r--r--MediaBrowser.Api/Plugin.cs52
-rw-r--r--MediaBrowser.Common/Plugins/BasePlugin.cs13
-rw-r--r--MediaBrowser.Common/Plugins/IPlugin.cs6
-rw-r--r--MediaBrowser.Model/Plugins/PluginInfo.cs7
-rw-r--r--MediaBrowser.Server.Implementations/Updates/InstallationManager.cs5
-rw-r--r--MediaBrowser.WebDashboard/Html/scripts/PluginUpdatesPage.js5
-rw-r--r--MediaBrowser.WebDashboard/Html/scripts/PluginsPage.js10
8 files changed, 2 insertions, 97 deletions
diff --git a/MediaBrowser.Api/MediaBrowser.Api.csproj b/MediaBrowser.Api/MediaBrowser.Api.csproj
index 44e7947e2..c7bba4e9a 100644
--- a/MediaBrowser.Api/MediaBrowser.Api.csproj
+++ b/MediaBrowser.Api/MediaBrowser.Api.csproj
@@ -115,7 +115,6 @@
<Compile Include="UserLibrary\UserLibraryService.cs" />
<Compile Include="UserLibrary\YearsService.cs" />
<Compile Include="UserService.cs" />
- <Compile Include="Plugin.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="WeatherService.cs" />
<Compile Include="WebSocket\LogFileWebSocketListener.cs" />
diff --git a/MediaBrowser.Api/Plugin.cs b/MediaBrowser.Api/Plugin.cs
deleted file mode 100644
index 321267b04..000000000
--- a/MediaBrowser.Api/Plugin.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using MediaBrowser.Common.Configuration;
-using MediaBrowser.Common.Kernel;
-using MediaBrowser.Common.Plugins;
-using MediaBrowser.Model.Plugins;
-using MediaBrowser.Model.Serialization;
-
-namespace MediaBrowser.Api
-{
- /// <summary>
- /// Class Plugin
- /// </summary>
- public class Plugin : BasePlugin<BasePluginConfiguration>
- {
- /// <summary>
- /// Initializes a new instance of the <see cref="Plugin" /> class.
- /// </summary>
- /// <param name="appPaths">The app paths.</param>
- /// <param name="xmlSerializer">The XML serializer.</param>
- public Plugin(IApplicationPaths appPaths, IXmlSerializer xmlSerializer)
- : base(appPaths, xmlSerializer)
- {
- Instance = this;
- }
-
- /// <summary>
- /// Gets the name of the plugin
- /// </summary>
- /// <value>The name.</value>
- public override string Name
- {
- get { return "Web Api"; }
- }
-
- /// <summary>
- /// Gets a value indicating whether this instance is a core plugin.
- /// </summary>
- /// <value><c>true</c> if this instance is a core plugin; otherwise, <c>false</c>.</value>
- public override bool IsCorePlugin
- {
- get
- {
- return true;
- }
- }
-
- /// <summary>
- /// Gets the instance.
- /// </summary>
- /// <value>The instance.</value>
- public static Plugin Instance { get; private set; }
- }
-}
diff --git a/MediaBrowser.Common/Plugins/BasePlugin.cs b/MediaBrowser.Common/Plugins/BasePlugin.cs
index 4cff2eeb9..9c4a8e8ff 100644
--- a/MediaBrowser.Common/Plugins/BasePlugin.cs
+++ b/MediaBrowser.Common/Plugins/BasePlugin.cs
@@ -44,18 +44,6 @@ namespace MediaBrowser.Common.Plugins
}
/// <summary>
- /// Gets a value indicating whether this instance is a core plugin.
- /// </summary>
- /// <value><c>true</c> if this instance is a core plugin; otherwise, <c>false</c>.</value>
- public virtual bool IsCorePlugin
- {
- get
- {
- return false;
- }
- }
-
- /// <summary>
/// Gets a value indicating whether this instance is first run.
/// </summary>
/// <value><c>true</c> if this instance is first run; otherwise, <c>false</c>.</value>
@@ -316,7 +304,6 @@ namespace MediaBrowser.Common.Plugins
AssemblyFileName = AssemblyFileName,
ConfigurationDateLastModified = ConfigurationDateLastModified,
Description = Description,
- IsCorePlugin = IsCorePlugin,
Id = Id,
EnableAutoUpdate = Configuration.EnableAutoUpdate,
UpdateClass = Configuration.UpdateClass,
diff --git a/MediaBrowser.Common/Plugins/IPlugin.cs b/MediaBrowser.Common/Plugins/IPlugin.cs
index ace82d83f..12aaa3fe7 100644
--- a/MediaBrowser.Common/Plugins/IPlugin.cs
+++ b/MediaBrowser.Common/Plugins/IPlugin.cs
@@ -21,12 +21,6 @@ namespace MediaBrowser.Common.Plugins
string Description { get; }
/// <summary>
- /// Gets a value indicating whether this instance is a core plugin.
- /// </summary>
- /// <value><c>true</c> if this instance is a core plugin; otherwise, <c>false</c>.</value>
- bool IsCorePlugin { get; }
-
- /// <summary>
/// Gets the type of configuration this plugin uses
/// </summary>
/// <value>The type of the configuration.</value>
diff --git a/MediaBrowser.Model/Plugins/PluginInfo.cs b/MediaBrowser.Model/Plugins/PluginInfo.cs
index 0fe6fb6db..4aa5f5a5c 100644
--- a/MediaBrowser.Model/Plugins/PluginInfo.cs
+++ b/MediaBrowser.Model/Plugins/PluginInfo.cs
@@ -60,13 +60,6 @@ namespace MediaBrowser.Model.Plugins
public string Description { get; set; }
/// <summary>
- /// Gets or sets a value indicating whether this instance is core plugin.
- /// </summary>
- /// <value><c>true</c> if this instance is core plugin; otherwise, <c>false</c>.</value>
- [ProtoMember(8)]
- public bool IsCorePlugin { get; set; }
-
- /// <summary>
/// Gets or sets the unique id.
/// </summary>
/// <value>The unique id.</value>
diff --git a/MediaBrowser.Server.Implementations/Updates/InstallationManager.cs b/MediaBrowser.Server.Implementations/Updates/InstallationManager.cs
index bfba00a8c..e17ed0301 100644
--- a/MediaBrowser.Server.Implementations/Updates/InstallationManager.cs
+++ b/MediaBrowser.Server.Implementations/Updates/InstallationManager.cs
@@ -445,11 +445,6 @@ namespace MediaBrowser.Server.Implementations.Updates
/// <exception cref="System.ArgumentException"></exception>
public void UninstallPlugin(IPlugin plugin)
{
- if (plugin.IsCorePlugin)
- {
- throw new ArgumentException(string.Format("{0} cannot be uninstalled because it is a core plugin.", plugin.Name));
- }
-
plugin.OnUninstalling();
// Remove it the quick way for now
diff --git a/MediaBrowser.WebDashboard/Html/scripts/PluginUpdatesPage.js b/MediaBrowser.WebDashboard/Html/scripts/PluginUpdatesPage.js
index a89169c53..56bc6b4cf 100644
--- a/MediaBrowser.WebDashboard/Html/scripts/PluginUpdatesPage.js
+++ b/MediaBrowser.WebDashboard/Html/scripts/PluginUpdatesPage.js
@@ -12,11 +12,6 @@
loadPlugins: function (plugins) {
- plugins = plugins.filter(function (p) {
-
- return !p.IsCorePlugin;
- });
-
var elem = $('#tbodyPluginUpdates', $.mobile.activePage).html('');
for (var i = 0, length = plugins.length; i < length; i++) {
diff --git a/MediaBrowser.WebDashboard/Html/scripts/PluginsPage.js b/MediaBrowser.WebDashboard/Html/scripts/PluginsPage.js
index e9098427d..c8ffe02d8 100644
--- a/MediaBrowser.WebDashboard/Html/scripts/PluginsPage.js
+++ b/MediaBrowser.WebDashboard/Html/scripts/PluginsPage.js
@@ -25,7 +25,7 @@
plugins = plugins.sort(function (plugin1, plugin2) {
- return (plugin1.IsCorePlugin.toString() + plugin1.Name) > (plugin2.IsCorePlugin.toString() + plugin2.Name) ? 1 : -1;
+ return (plugin1.Name) > (plugin2.Name) ? 1 : -1;
});
@@ -35,10 +35,6 @@
var plugin = plugins[i];
- if (plugin.IsCorePlugin) {
- continue;
- }
-
var configPage = $.grep(pluginConfigurationPages, function (pluginConfigurationPage) {
return pluginConfigurationPage.PluginId == plugin.Id;
})[0];
@@ -55,9 +51,7 @@
html += "</a>";
- if (!plugin.IsCorePlugin) {
- html += "<a data-id='" + plugin.Id + "' data-pluginname='" + plugin.Name + "' onclick='PluginsPage.deletePlugin(this);' href='#'>Delete</a>";
- }
+ html += "<a data-id='" + plugin.Id + "' data-pluginname='" + plugin.Name + "' onclick='PluginsPage.deletePlugin(this);' href='#'>Delete</a>";
html += "</li>";
}