updating to server changes

This commit is contained in:
LukePulverenti 2013-02-23 02:58:00 -05:00
parent b971311468
commit 07fbe3949f
20 changed files with 60 additions and 78 deletions

View File

@ -1,6 +1,5 @@
using MediaBrowser.Controller.Plugins;
using System;
using System.ComponentModel.Composition;
using System.IO;
namespace MediaBrowser.Plugins.Dlna.Configuration
@ -8,7 +7,6 @@ namespace MediaBrowser.Plugins.Dlna.Configuration
/// <summary>
/// Class DlnaConfigurationPage
/// </summary>
[Export(typeof(IPluginConfigurationPage))]
class DlnaConfigurationPage : IPluginConfigurationPage
{
/// <summary>

View File

@ -36,23 +36,22 @@
<RunPostBuildEvent>Always</RunPostBuildEvent>
</PropertyGroup>
<ItemGroup>
<Reference Include="MediaBrowser.Common, Version=2.9.4801.932, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="MediaBrowser.Common, Version=3.0.4802.2854, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\MediaBrowser.Common.1.0.1\lib\net45\MediaBrowser.Common.dll</HintPath>
<HintPath>..\packages\MediaBrowser.Common.1.0.2\lib\net45\MediaBrowser.Common.dll</HintPath>
</Reference>
<Reference Include="MediaBrowser.Controller, Version=2.9.4801.1645, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="MediaBrowser.Controller, Version=3.0.4802.4914, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\MediaBrowser.Server.Core.1.0.0\lib\net45\MediaBrowser.Controller.dll</HintPath>
<HintPath>..\packages\MediaBrowser.Server.Core.3.0.0\lib\net45\MediaBrowser.Controller.dll</HintPath>
</Reference>
<Reference Include="MediaBrowser.Model, Version=2.9.4801.931, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="MediaBrowser.Model, Version=3.0.4802.2853, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\MediaBrowser.Common.1.0.1\lib\net45\MediaBrowser.Model.dll</HintPath>
<HintPath>..\packages\MediaBrowser.Common.1.0.2\lib\net45\MediaBrowser.Model.dll</HintPath>
</Reference>
<Reference Include="Platinum.Managed">
<HintPath>..\ThirdParty\UPnP\Libs\Platinum.Managed.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />

View File

@ -1,24 +1,21 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.Composition;
using System.IO;
using System.Linq;
using System.Reflection;
using MediaBrowser.Common.Extensions;
using MediaBrowser.Common.Net;
using MediaBrowser.Common.Net;
using MediaBrowser.Common.Plugins;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.Audio;
using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Model.Entities;
using MediaBrowser.Plugins.Dlna.Configuration;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Reflection;
namespace MediaBrowser.Plugins.Dlna
{
/// <summary>
/// Class Plugin
/// </summary>
[Export(typeof(IPlugin))]
public class Plugin : BasePlugin<PluginConfiguration>
{
//these are Neptune values, they probably belong in the managed wrapper somewhere, but they aren't

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="MediaBrowser.Common" version="1.0.1" targetFramework="net45" />
<package id="MediaBrowser.Server.Core" version="1.0.0" targetFramework="net45" />
<package id="MediaBrowser.Common" version="1.0.2" targetFramework="net45" />
<package id="MediaBrowser.Server.Core" version="3.0.0" targetFramework="net45" />
</packages>

View File

@ -37,24 +37,23 @@
<RunPostBuildEvent>Always</RunPostBuildEvent>
</PropertyGroup>
<ItemGroup>
<Reference Include="MediaBrowser.Common, Version=2.9.4801.932, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="MediaBrowser.Common, Version=3.0.4802.2854, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\MediaBrowser.Common.1.0.1\lib\net45\MediaBrowser.Common.dll</HintPath>
<HintPath>..\packages\MediaBrowser.Common.1.0.2\lib\net45\MediaBrowser.Common.dll</HintPath>
</Reference>
<Reference Include="MediaBrowser.Model, Version=2.9.4801.931, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="MediaBrowser.Model, Version=3.0.4802.2853, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\MediaBrowser.Common.1.0.1\lib\net45\MediaBrowser.Model.dll</HintPath>
<HintPath>..\packages\MediaBrowser.Common.1.0.2\lib\net45\MediaBrowser.Model.dll</HintPath>
</Reference>
<Reference Include="MediaBrowser.UI, Version=2.9.4801.2519, Culture=neutral, processorArchitecture=x86">
<Reference Include="MediaBrowser.UI, Version=2.9.4802.4889, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\MediaBrowser.Theater.Core.1.0.0\lib\net45\MediaBrowser.UI.dll</HintPath>
<HintPath>..\packages\MediaBrowser.Theater.Core.3.0.0\lib\net45\MediaBrowser.UI.dll</HintPath>
</Reference>
<Reference Include="MediaBrowser.UI.Controls, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\MediaBrowser.Theater.Core.1.0.0\lib\net45\MediaBrowser.UI.Controls.dll</HintPath>
<HintPath>..\packages\MediaBrowser.Theater.Core.3.0.0\lib\net45\MediaBrowser.UI.Controls.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />

View File

@ -7,7 +7,6 @@ using MediaBrowser.UI.Playback;
using MediaBrowser.UI.Playback.ExternalPlayer;
using System;
using System.Collections.Generic;
using System.ComponentModel.Composition;
using System.IO;
using System.Linq;
using System.Net.Http;
@ -19,7 +18,6 @@ namespace MediaBrowser.Plugins.MpcHc
/// <summary>
/// Class GenericExternalPlayer
/// </summary>
[Export(typeof(BaseMediaPlayer))]
public class MpcHcMediaPlayer : BaseExternalPlayer
{
/// <summary>
@ -32,8 +30,7 @@ namespace MediaBrowser.Plugins.MpcHc
/// </summary>
private SemaphoreSlim MpcHttpInterfaceResourcePool = new SemaphoreSlim(1, 1);
[ImportingConstructor]
public MpcHcMediaPlayer([Import("logger")] ILogger logger)
public MpcHcMediaPlayer(ILogger logger)
: base(logger)
{
}

View File

@ -1,14 +1,12 @@
using MediaBrowser.Common.Plugins;
using MediaBrowser.Model.Plugins;
using System;
using System.ComponentModel.Composition;
namespace MediaBrowser.Plugins.MpcHc
{
/// <summary>
/// Class Plugin
/// </summary>
[Export(typeof(IPlugin))]
public class Plugin : BaseUiPlugin<BasePluginConfiguration>
{
/// <summary>

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="MediaBrowser.Common" version="1.0.1" targetFramework="net45" />
<package id="MediaBrowser.Theater.Core" version="1.0.0" targetFramework="net45" />
<package id="MediaBrowser.Common" version="1.0.2" targetFramework="net45" />
<package id="MediaBrowser.Theater.Core" version="3.0.0" targetFramework="net45" />
</packages>

View File

@ -37,24 +37,23 @@
<RunPostBuildEvent>Always</RunPostBuildEvent>
</PropertyGroup>
<ItemGroup>
<Reference Include="MediaBrowser.Common, Version=2.9.4801.932, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="MediaBrowser.Common, Version=3.0.4802.2854, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\MediaBrowser.Common.1.0.1\lib\net45\MediaBrowser.Common.dll</HintPath>
<HintPath>..\packages\MediaBrowser.Common.1.0.2\lib\net45\MediaBrowser.Common.dll</HintPath>
</Reference>
<Reference Include="MediaBrowser.Model, Version=2.9.4801.931, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="MediaBrowser.Model, Version=3.0.4802.2853, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\MediaBrowser.Common.1.0.1\lib\net45\MediaBrowser.Model.dll</HintPath>
<HintPath>..\packages\MediaBrowser.Common.1.0.2\lib\net45\MediaBrowser.Model.dll</HintPath>
</Reference>
<Reference Include="MediaBrowser.UI, Version=2.9.4801.2519, Culture=neutral, processorArchitecture=x86">
<Reference Include="MediaBrowser.UI, Version=2.9.4802.4889, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\MediaBrowser.Theater.Core.1.0.0\lib\net45\MediaBrowser.UI.dll</HintPath>
<HintPath>..\packages\MediaBrowser.Theater.Core.3.0.0\lib\net45\MediaBrowser.UI.dll</HintPath>
</Reference>
<Reference Include="MediaBrowser.UI.Controls, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\MediaBrowser.Theater.Core.1.0.0\lib\net45\MediaBrowser.UI.Controls.dll</HintPath>
<HintPath>..\packages\MediaBrowser.Theater.Core.3.0.0\lib\net45\MediaBrowser.UI.Controls.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="Microsoft.CSharp" />

View File

@ -1,14 +1,12 @@
using MediaBrowser.Common.Plugins;
using MediaBrowser.Model.Plugins;
using System;
using System.ComponentModel.Composition;
namespace MediaBrowser.Plugins.Tmt5
{
/// <summary>
/// Class Plugin
/// </summary>
[Export(typeof(IPlugin))]
public class Plugin : BaseUiPlugin<BasePluginConfiguration>
{
/// <summary>

View File

@ -7,7 +7,6 @@ using MediaBrowser.UI.Playback.ExternalPlayer;
using System;
using System.Collections.Generic;
using System.Collections.Specialized;
using System.ComponentModel.Composition;
using System.Diagnostics;
using System.Globalization;
using System.IO;
@ -18,11 +17,9 @@ namespace MediaBrowser.Plugins.Tmt5
/// <summary>
/// Class GenericExternalPlayer
/// </summary>
[Export(typeof(BaseMediaPlayer))]
public class Tmt5MediaPlayer : BaseExternalPlayer
{
[ImportingConstructor]
public Tmt5MediaPlayer([Import("logger")] ILogger logger)
public Tmt5MediaPlayer(ILogger logger)
: base(logger)
{
}

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="MediaBrowser.Common" version="1.0.1" targetFramework="net45" />
<package id="MediaBrowser.Theater.Core" version="1.0.0" targetFramework="net45" />
<package id="MediaBrowser.Common" version="1.0.2" targetFramework="net45" />
<package id="MediaBrowser.Theater.Core" version="3.0.0" targetFramework="net45" />
</packages>

View File

@ -1,6 +1,5 @@
using MediaBrowser.Controller.Plugins;
using System;
using System.ComponentModel.Composition;
using System.IO;
namespace MediaBrowser.Plugins.Trailers.Configuration
@ -8,7 +7,6 @@ namespace MediaBrowser.Plugins.Trailers.Configuration
/// <summary>
/// Class TrailerConfigurationPage
/// </summary>
[Export(typeof(IPluginConfigurationPage))]
class TrailerConfigurationPage : IPluginConfigurationPage
{
/// <summary>

View File

@ -1,12 +1,10 @@
using MediaBrowser.Controller.Entities;
using System.ComponentModel.Composition;
namespace MediaBrowser.Plugins.Trailers.Entities
{
/// <summary>
/// Class TrailerCollectionFolder
/// </summary>
[Export(typeof(BasePluginFolder))]
class TrailerCollectionFolder : BasePluginFolder
{
/// <summary>

View File

@ -35,20 +35,18 @@
<RunPostBuildEvent>Always</RunPostBuildEvent>
</PropertyGroup>
<ItemGroup>
<Reference Include="MediaBrowser.Common, Version=2.9.4801.932, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="MediaBrowser.Common, Version=3.0.4802.2854, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\MediaBrowser.Common.1.0.1\lib\net45\MediaBrowser.Common.dll</HintPath>
<HintPath>..\packages\MediaBrowser.Common.1.0.2\lib\net45\MediaBrowser.Common.dll</HintPath>
</Reference>
<Reference Include="MediaBrowser.Controller, Version=2.9.4801.1645, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\MediaBrowser.Server.Core.1.0.0\lib\net45\MediaBrowser.Controller.dll</HintPath>
<Reference Include="MediaBrowser.Controller">
<HintPath>..\packages\MediaBrowser.Server.Core.3.0.0\lib\net45\MediaBrowser.Controller.dll</HintPath>
</Reference>
<Reference Include="MediaBrowser.Model, Version=2.9.4801.931, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="MediaBrowser.Model, Version=3.0.4802.2853, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\MediaBrowser.Common.1.0.1\lib\net45\MediaBrowser.Model.dll</HintPath>
<HintPath>..\packages\MediaBrowser.Common.1.0.2\lib\net45\MediaBrowser.Model.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />

View File

@ -1,10 +1,10 @@
using MediaBrowser.Common.Plugins;
using MediaBrowser.Common.ScheduledTasks;
using MediaBrowser.Controller.ScheduledTasks;
using MediaBrowser.Model.Plugins;
using MediaBrowser.Plugins.Trailers.Configuration;
using MediaBrowser.Plugins.Trailers.ScheduledTasks;
using System;
using System.ComponentModel.Composition;
using System.IO;
namespace MediaBrowser.Plugins.Trailers
@ -12,7 +12,6 @@ namespace MediaBrowser.Plugins.Trailers
/// <summary>
/// Class Plugin
/// </summary>
[Export(typeof(IPlugin))]
public class Plugin : BasePlugin<PluginConfiguration>
{
/// <summary>
@ -42,13 +41,22 @@ namespace MediaBrowser.Plugins.Trailers
/// <value>The instance.</value>
public static Plugin Instance { get; private set; }
private ITaskManager TaskManager { get; set; }
/// <summary>
/// Initializes a new instance of the <see cref="Plugin" /> class.
/// </summary>
public Plugin()
public Plugin(ITaskManager taskManager)
: base()
{
if (taskManager == null)
{
throw new ArgumentNullException("taskManager");
}
Instance = this;
TaskManager = taskManager;
}
/// <summary>
@ -92,7 +100,7 @@ namespace MediaBrowser.Plugins.Trailers
if (isFirstRun)
{
Kernel.TaskManager.QueueScheduledTask<CurrentTrailerDownloadTask>();
TaskManager.QueueScheduledTask<CurrentTrailerDownloadTask>();
}
}
@ -112,7 +120,7 @@ namespace MediaBrowser.Plugins.Trailers
if (pathChanged)
{
_downloadPath = null;
Kernel.TaskManager.QueueScheduledTask<RefreshMediaLibraryTask>();
TaskManager.QueueScheduledTask<RefreshMediaLibraryTask>();
}
}
}

View File

@ -3,7 +3,6 @@ using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Plugins.Trailers.Entities;
using System;
using System.ComponentModel.Composition;
using System.IO;
using System.Threading;
using System.Threading.Tasks;
@ -13,7 +12,6 @@ namespace MediaBrowser.Plugins.Trailers.Providers
/// <summary>
/// Class TrailerFromJsonProvider
/// </summary>
[Export(typeof(BaseMetadataProvider))]
class TrailerFromJsonProvider : BaseMetadataProvider
{
/// <summary>

View File

@ -2,7 +2,6 @@
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Resolvers;
using System;
using System.ComponentModel.Composition;
using System.Linq;
namespace MediaBrowser.Plugins.Trailers.Resolvers
@ -10,7 +9,6 @@ namespace MediaBrowser.Plugins.Trailers.Resolvers
/// <summary>
/// Class TrailerResolver
/// </summary>
[Export(typeof(IBaseItemResolver))]
public class TrailerResolver : BaseVideoResolver<Trailer>
{
/// <summary>

View File

@ -3,12 +3,11 @@ using MediaBrowser.Common.ScheduledTasks;
using MediaBrowser.Common.Serialization;
using MediaBrowser.Controller;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Model.Logging;
using MediaBrowser.Model.Net;
using MediaBrowser.Model.Tasks;
using MediaBrowser.Plugins.Trailers.Entities;
using System;
using System.Collections.Generic;
using System.ComponentModel.Composition;
using System.IO;
using System.Linq;
using System.Threading;
@ -19,9 +18,12 @@ namespace MediaBrowser.Plugins.Trailers.ScheduledTasks
/// <summary>
/// Downloads trailers from the web at scheduled times
/// </summary>
[Export(typeof(IScheduledTask))]
public class CurrentTrailerDownloadTask : BaseScheduledTask<Kernel>
{
public CurrentTrailerDownloadTask(Kernel kernel, ITaskManager taskManager, ILogger logger) : base(kernel, taskManager, logger)
{
}
/// <summary>
/// Creates the triggers that define when the task will run
/// </summary>

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="MediaBrowser.Common" version="1.0.1" targetFramework="net45" />
<package id="MediaBrowser.Server.Core" version="1.0.0" targetFramework="net45" />
<package id="MediaBrowser.Common" version="1.0.2" targetFramework="net45" />
<package id="MediaBrowser.Server.Core" version="3.0.0" targetFramework="net45" />
</packages>