pull/702/head
Luke Pulverenti 10 years ago
parent 9babddb271
commit 492f897f81

@ -13,7 +13,6 @@ using System.Linq;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using CommonIO; using CommonIO;
using MediaBrowser.Common.IO;
namespace MediaBrowser.Common.Implementations.ScheduledTasks namespace MediaBrowser.Common.Implementations.ScheduledTasks
{ {
@ -304,6 +303,11 @@ namespace MediaBrowser.Common.Implementations.ScheduledTasks
} }
} }
public void ReloadTriggerEvents()
{
ReloadTriggerEvents(false);
}
/// <summary> /// <summary>
/// Reloads the trigger events. /// Reloads the trigger events.
/// </summary> /// </summary>

@ -12,6 +12,7 @@ using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using CommonIO; using CommonIO;
using MediaBrowser.Common.IO; using MediaBrowser.Common.IO;
using Microsoft.Win32;
namespace MediaBrowser.Common.Implementations.ScheduledTasks namespace MediaBrowser.Common.Implementations.ScheduledTasks
{ {
@ -69,6 +70,28 @@ namespace MediaBrowser.Common.Implementations.ScheduledTasks
_fileSystem = fileSystem; _fileSystem = fileSystem;
ScheduledTasks = new IScheduledTaskWorker[] { }; ScheduledTasks = new IScheduledTaskWorker[] { };
BindToSystemEvent();
}
private void BindToSystemEvent()
{
try
{
SystemEvents.PowerModeChanged += SystemEvents_PowerModeChanged;
}
catch
{
}
}
void SystemEvents_PowerModeChanged(object sender, PowerModeChangedEventArgs e)
{
foreach (var task in ScheduledTasks)
{
task.ReloadTriggerEvents();
}
} }
/// <summary> /// <summary>

@ -19,7 +19,7 @@ namespace MediaBrowser.Common.Implementations.Security
public class PluginSecurityManager : ISecurityManager public class PluginSecurityManager : ISecurityManager
{ {
private const string MBValidateUrl = MbAdmin.HttpsUrl + "service/registration/validate"; private const string MBValidateUrl = MbAdmin.HttpsUrl + "service/registration/validate";
private const string AppstoreRegUrl = /*MbAdmin.HttpsUrl*/ "http://mb3admin.com/test/admin/" + "service/appstore/register"; private const string AppstoreRegUrl = /*MbAdmin.HttpsUrl*/ "http://mb3admin.com/admin/" + "service/appstore/register";
/// <summary> /// <summary>
/// The _is MB supporter /// The _is MB supporter
@ -199,7 +199,7 @@ namespace MediaBrowser.Common.Implementations.Security
Url = AppstoreRegUrl, Url = AppstoreRegUrl,
CancellationToken = CancellationToken.None CancellationToken = CancellationToken.None
}; };
options.RequestHeaders.Add("X-Emby-Token", /*_appHost.SystemId*/ "08606E86D043"); options.RequestHeaders.Add("X-Emby-Token", _appHost.SystemId);
options.RequestContent = parameters; options.RequestContent = parameters;
options.RequestContentType = "application/json"; options.RequestContentType = "application/json";

@ -69,5 +69,10 @@ namespace MediaBrowser.Common.ScheduledTasks
/// </summary> /// </summary>
/// <value>The unique id.</value> /// <value>The unique id.</value>
string Id { get; } string Id { get; }
/// <summary>
/// Reloads the trigger events.
/// </summary>
void ReloadTriggerEvents();
} }
} }

@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd"> <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata> <metadata>
<id>MediaBrowser.Common.Internal</id> <id>MediaBrowser.Common.Internal</id>
<version>3.0.637</version> <version>3.0.638</version>
<title>MediaBrowser.Common.Internal</title> <title>MediaBrowser.Common.Internal</title>
<authors>Luke</authors> <authors>Luke</authors>
<owners>ebr,Luke,scottisafool</owners> <owners>ebr,Luke,scottisafool</owners>
@ -12,7 +12,7 @@
<description>Contains common components shared by Emby Theater and Emby Server. Not intended for plugin developer consumption.</description> <description>Contains common components shared by Emby Theater and Emby Server. Not intended for plugin developer consumption.</description>
<copyright>Copyright © Emby 2013</copyright> <copyright>Copyright © Emby 2013</copyright>
<dependencies> <dependencies>
<dependency id="MediaBrowser.Common" version="3.0.637" /> <dependency id="MediaBrowser.Common" version="3.0.638" />
<dependency id="NLog" version="3.2.1" /> <dependency id="NLog" version="3.2.1" />
<dependency id="SimpleInjector" version="3.0.5" /> <dependency id="SimpleInjector" version="3.0.5" />
</dependencies> </dependencies>

@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd"> <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata> <metadata>
<id>MediaBrowser.Common</id> <id>MediaBrowser.Common</id>
<version>3.0.637</version> <version>3.0.638</version>
<title>MediaBrowser.Common</title> <title>MediaBrowser.Common</title>
<authors>Emby Team</authors> <authors>Emby Team</authors>
<owners>ebr,Luke,scottisafool</owners> <owners>ebr,Luke,scottisafool</owners>

@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd"> <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata> <metadata>
<id>MediaBrowser.Model.Signed</id> <id>MediaBrowser.Model.Signed</id>
<version>3.0.637</version> <version>3.0.638</version>
<title>MediaBrowser.Model - Signed Edition</title> <title>MediaBrowser.Model - Signed Edition</title>
<authors>Emby Team</authors> <authors>Emby Team</authors>
<owners>ebr,Luke,scottisafool</owners> <owners>ebr,Luke,scottisafool</owners>

@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd"> <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata> <metadata>
<id>MediaBrowser.Server.Core</id> <id>MediaBrowser.Server.Core</id>
<version>3.0.637</version> <version>3.0.638</version>
<title>Media Browser.Server.Core</title> <title>Media Browser.Server.Core</title>
<authors>Emby Team</authors> <authors>Emby Team</authors>
<owners>ebr,Luke,scottisafool</owners> <owners>ebr,Luke,scottisafool</owners>
@ -12,7 +12,7 @@
<description>Contains core components required to build plugins for Emby Server.</description> <description>Contains core components required to build plugins for Emby Server.</description>
<copyright>Copyright © Emby 2013</copyright> <copyright>Copyright © Emby 2013</copyright>
<dependencies> <dependencies>
<dependency id="MediaBrowser.Common" version="3.0.637" /> <dependency id="MediaBrowser.Common" version="3.0.638" />
<dependency id="Interfaces.IO" version="1.0.0.5" /> <dependency id="Interfaces.IO" version="1.0.0.5" />
</dependencies> </dependencies>
</metadata> </metadata>

@ -1,4 +1,4 @@
using System.Reflection; using System.Reflection;
[assembly: AssemblyVersion("3.0.*")] //[assembly: AssemblyVersion("3.0.*")]
//[assembly: AssemblyVersion("3.0.5768.5")] [assembly: AssemblyVersion("3.0.5768.6")]

Loading…
Cancel
Save