pt
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

updated nuget

This commit is contained in:
Luke Pulverenti 2014-05-08 21:49:12 -04:00
parent dce9093ba1
commit a938d0854d
7 changed files with 18 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
MediaBrowser.Model/ApiClient/IApiClient.cs
View File

@ -601,17 +601,17 @@ namespace MediaBrowser.Model.ApiClient
/// Sets the index of the audio stream. /// Sets the index of the audio stream.
/// </summary> /// </summary>
/// <param name="sessionId">The session identifier.</param> /// <param name="sessionId">The session identifier.</param>
/// <param name="volume">The volume.</param> /// <param name="index">The index.</param>
/// <returns>Task.</returns> /// <returns>Task.</returns>
Task SetAudioStreamIndex(string sessionId, int? volume); Task SetAudioStreamIndex(string sessionId, int index);
/// <summary> /// <summary>
/// Sets the index of the subtitle stream. /// Sets the index of the subtitle stream.
/// </summary> /// </summary>
/// <param name="sessionId">The session identifier.</param> /// <param name="sessionId">The session identifier.</param>
/// <param name="volume">The volume.</param> /// <param name="index">The index.</param>
/// <returns>Task.</returns> /// <returns>Task.</returns>
Task SetSubtitleStreamIndex(string sessionId, int? volume); Task SetSubtitleStreamIndex(string sessionId, int? index);
/// <summary> /// <summary>
/// Instructs the client to display a message to the user /// Instructs the client to display a message to the user

8
MediaBrowser.Model/ApiClient/IServerEvents.cs
View File

@ -19,10 +19,6 @@ namespace MediaBrowser.Model.ApiClient
/// </summary> /// </summary>
event EventHandler<GenericEventArgs<string>> UserDeleted; event EventHandler<GenericEventArgs<string>> UserDeleted;
/// <summary> /// <summary>
/// Occurs when [scheduled task started].
/// </summary>
event EventHandler<GenericEventArgs<string>> ScheduledTaskStarted;
/// <summary>
/// Occurs when [scheduled task ended]. /// Occurs when [scheduled task ended].
/// </summary> /// </summary>
event EventHandler<GenericEventArgs<TaskResult>> ScheduledTaskEnded; event EventHandler<GenericEventArgs<TaskResult>> ScheduledTaskEnded;
@ -97,7 +93,7 @@ namespace MediaBrowser.Model.ApiClient
/// <summary> /// <summary>
/// Occurs when [send text command]. /// Occurs when [send text command].
/// </summary> /// </summary>
event EventHandler<GenericEventArgs<string>> SendTextCommand; event EventHandler<GenericEventArgs<string>> SendStringCommand;
/// <summary> /// <summary>
/// Occurs when [set volume command]. /// Occurs when [set volume command].
/// </summary> /// </summary>
@ -109,7 +105,7 @@ namespace MediaBrowser.Model.ApiClient
/// <summary> /// <summary>
/// Occurs when [set video stream index command]. /// Occurs when [set video stream index command].
/// </summary> /// </summary>
event EventHandler<GenericEventArgs<int>> SetVideoStreamIndexCommand; event EventHandler<GenericEventArgs<int>> SetSubtitleStreamIndexCommand;
/// <summary> /// <summary>
/// Occurs when [sessions updated]. /// Occurs when [sessions updated].
/// </summary> /// </summary>

16
MediaBrowser.Server.Implementations/EntryPoints/ServerEventNotifier.cs
View File

@ -1,5 +1,4 @@
using MediaBrowser.Common.Events; using MediaBrowser.Common.Net;
using MediaBrowser.Common.Net;
using MediaBrowser.Common.Plugins; using MediaBrowser.Common.Plugins;
using MediaBrowser.Common.ScheduledTasks; using MediaBrowser.Common.ScheduledTasks;
using MediaBrowser.Common.Updates; using MediaBrowser.Common.Updates;
@ -54,8 +53,12 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
/// Initializes a new instance of the <see cref="ServerEventNotifier" /> class. /// Initializes a new instance of the <see cref="ServerEventNotifier" /> class.
/// </summary> /// </summary>
/// <param name="serverManager">The server manager.</param> /// <param name="serverManager">The server manager.</param>
/// <param name="logger">The logger.</param> /// <param name="appHost">The application host.</param>
/// <param name="userManager">The user manager.</param> /// <param name="userManager">The user manager.</param>
/// <param name="installationManager">The installation manager.</param>
/// <param name="taskManager">The task manager.</param>
/// <param name="dtoService">The dto service.</param>
/// <param name="sessionManager">The session manager.</param>
public ServerEventNotifier(IServerManager serverManager, IServerApplicationHost appHost, IUserManager userManager, IInstallationManager installationManager, ITaskManager taskManager, IDtoService dtoService, ISessionManager sessionManager) public ServerEventNotifier(IServerManager serverManager, IServerApplicationHost appHost, IUserManager userManager, IInstallationManager installationManager, ITaskManager taskManager, IDtoService dtoService, ISessionManager sessionManager)
{ {
_serverManager = serverManager; _serverManager = serverManager;
@ -80,7 +83,6 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
_installationManager.PackageInstallationCompleted += _installationManager_PackageInstallationCompleted; _installationManager.PackageInstallationCompleted += _installationManager_PackageInstallationCompleted;
_installationManager.PackageInstallationFailed += _installationManager_PackageInstallationFailed; _installationManager.PackageInstallationFailed += _installationManager_PackageInstallationFailed;
_taskManager.TaskExecuting += _taskManager_TaskExecuting;
_taskManager.TaskCompleted += _taskManager_TaskCompleted; _taskManager.TaskCompleted += _taskManager_TaskCompleted;
} }
@ -109,12 +111,6 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
_serverManager.SendWebSocketMessage("ScheduledTaskEnded", e.Argument); _serverManager.SendWebSocketMessage("ScheduledTaskEnded", e.Argument);
} }
void _taskManager_TaskExecuting(object sender, EventArgs e)
{
var task = (IScheduledTask)sender;
_serverManager.SendWebSocketMessage("ScheduledTaskStarted", task.Name);
}
/// <summary> /// <summary>
/// Installations the manager_ plugin uninstalled. /// Installations the manager_ plugin uninstalled.
/// </summary> /// </summary>

3
MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
View File

@ -2069,9 +2069,6 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>
<None Include="packages.config" /> <None Include="packages.config" />
<None Include="WebMarkupMin.Configuration.xsd">
<SubType>Designer</SubType>
</None>
</ItemGroup> </ItemGroup>
<ItemGroup /> <ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

6
Nuget/MediaBrowser.Common.Internal.nuspec
View File

@ -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.362</version> <version>3.0.365</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,9 +12,9 @@
<description>Contains common components shared by Media Browser Theater and Media Browser Server. Not intended for plugin developer consumption.</description> <description>Contains common components shared by Media Browser Theater and Media Browser Server. Not intended for plugin developer consumption.</description>
<copyright>Copyright © Media Browser 2013</copyright> <copyright>Copyright © Media Browser 2013</copyright>
<dependencies> <dependencies>
<dependency id="MediaBrowser.Common" version="3.0.362" /> <dependency id="MediaBrowser.Common" version="3.0.365" />
<dependency id="NLog" version="2.1.0" /> <dependency id="NLog" version="2.1.0" />
<dependency id="SimpleInjector" version="2.4.1" /> <dependency id="SimpleInjector" version="2.5.0" />
<dependency id="sharpcompress" version="0.10.2" /> <dependency id="sharpcompress" version="0.10.2" />
</dependencies> </dependencies>
</metadata> </metadata>

2
Nuget/MediaBrowser.Common.nuspec
View File

@ -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.362</version> <version>3.0.365</version>
<title>MediaBrowser.Common</title> <title>MediaBrowser.Common</title>
<authors>Media Browser Team</authors> <authors>Media Browser Team</authors>
<owners>ebr,Luke,scottisafool</owners> <owners>ebr,Luke,scottisafool</owners>

4
Nuget/MediaBrowser.Server.Core.nuspec
View File

@ -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.362</version> <version>3.0.365</version>
<title>Media Browser.Server.Core</title> <title>Media Browser.Server.Core</title>
<authors>Media Browser Team</authors> <authors>Media Browser 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 Media Browser Server.</description> <description>Contains core components required to build plugins for Media Browser Server.</description>
<copyright>Copyright © Media Browser 2013</copyright> <copyright>Copyright © Media Browser 2013</copyright>
<dependencies> <dependencies>
<dependency id="MediaBrowser.Common" version="3.0.362" /> <dependency id="MediaBrowser.Common" version="3.0.365" />
</dependencies> </dependencies>
</metadata> </metadata>
<files> <files>