michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2416 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2017-01-24 16:22:07 -05:00 committed by GitHub
commit 8132e3e03b
13 changed files with 120 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Emby.Dlna/PlayTo/Device.cs
View File

@ -440,6 +440,11 @@ namespace Emby.Dlna.PlayTo
{
var transportState = await GetTransportInfo().ConfigureAwait(false);
if (_disposed)
{
return;
}
DateLastActivity = DateTime.UtcNow;
if (transportState.HasValue)
@ -530,6 +535,11 @@ namespace Emby.Dlna.PlayTo
private async Task GetVolume()
{
if (_disposed)
{
return;
}
var command = RendererCommands.ServiceActions.FirstOrDefault(c => c.Name == "GetVolume");
if (command == null)
return;
@ -563,6 +573,11 @@ namespace Emby.Dlna.PlayTo
private async Task GetMute()
{
if (_disposed)
{
return;
}
var command = RendererCommands.ServiceActions.FirstOrDefault(c => c.Name == "GetMute");
if (command == null)
return;
@ -793,6 +808,11 @@ namespace Emby.Dlna.PlayTo
private async Task GetAVProtocolAsync()
{
if (_disposed)
{
return;
}
var avService = GetAvTransportService();
if (avService == null)
return;
@ -807,6 +827,11 @@ namespace Emby.Dlna.PlayTo
private async Task GetRenderingProtocolAsync()
{
if (_disposed)
{
return;
}
var avService = GetServiceRenderingControl();
if (avService == null)

20
Emby.Dlna/PlayTo/PlayToController.cs
View File

@ -149,6 +149,11 @@ namespace Emby.Dlna.PlayTo
async void _device_MediaChanged(object sender, MediaChangedEventArgs e)
{
if (_disposed)
{
return;
}
try
{
var streamInfo = await StreamParams.ParseFromUrl(e.OldMediaInfo.Url, _libraryManager, _mediaSourceManager).ConfigureAwait(false);
@ -176,6 +181,11 @@ namespace Emby.Dlna.PlayTo
async void _device_PlaybackStopped(object sender, PlaybackStoppedEventArgs e)
{
if (_disposed)
{
return;
}
try
{
var streamInfo = await StreamParams.ParseFromUrl(e.MediaInfo.Url, _libraryManager, _mediaSourceManager)
@ -239,6 +249,11 @@ namespace Emby.Dlna.PlayTo
async void _device_PlaybackStart(object sender, PlaybackStartEventArgs e)
{
if (_disposed)
{
return;
}
try
{
var info = await StreamParams.ParseFromUrl(e.MediaInfo.Url, _libraryManager, _mediaSourceManager).ConfigureAwait(false);
@ -258,6 +273,11 @@ namespace Emby.Dlna.PlayTo
async void _device_PlaybackProgress(object sender, PlaybackProgressEventArgs e)
{
if (_disposed)
{
return;
}
try
{
var info = await StreamParams.ParseFromUrl(e.MediaInfo.Url, _libraryManager, _mediaSourceManager).ConfigureAwait(false);

22
Emby.Dlna/PlayTo/PlayToManager.cs
View File

@ -43,6 +43,7 @@ namespace Emby.Dlna.PlayTo
private readonly List<string> _nonRendererUrls = new List<string>();
private DateTime _lastRendererClear;
private bool _disposed;
public PlayToManager(ILogger logger, ISessionManager sessionManager, ILibraryManager libraryManager, IUserManager userManager, IDlnaManager dlnaManager, IServerApplicationHost appHost, IImageProcessor imageProcessor, IDeviceDiscovery deviceDiscovery, IHttpClient httpClient, IServerConfigurationManager config, IUserDataManager userDataManager, ILocalizationManager localization, IMediaSourceManager mediaSourceManager, IMediaEncoder mediaEncoder, ITimerFactory timerFactory)
{
@ -70,6 +71,11 @@ namespace Emby.Dlna.PlayTo
async void _deviceDiscovery_DeviceDiscovered(object sender, GenericEventArgs<UpnpDeviceInfo> e)
{
if (_disposed)
{
return;
}
var info = e.Argument;
string usn;
@ -121,6 +127,11 @@ namespace Emby.Dlna.PlayTo
}
}
if (_disposed)
{
return;
}
_logger.Debug("Logging session activity from location {0}", location);
var sessionInfo = await _sessionManager.LogSessionActivity(device.Properties.ClientType, _appHost.ApplicationVersion.ToString(), device.Properties.UUID, device.Properties.Name, uri.OriginalString, null)
.ConfigureAwait(false);
@ -129,6 +140,11 @@ namespace Emby.Dlna.PlayTo
if (controller == null)
{
if (_disposed)
{
return;
}
string serverAddress;
if (info.LocalIpAddress == null)
{
@ -187,6 +203,11 @@ namespace Emby.Dlna.PlayTo
catch (Exception ex)
{
_logger.ErrorException("Error creating PlayTo device.", ex);
lock (_nonRendererUrls)
{
_nonRendererUrls.Add(location);
}
}
}
@ -202,6 +223,7 @@ namespace Emby.Dlna.PlayTo
public void Dispose()
{
_disposed = true;
_deviceDiscovery.DeviceDiscovered -= _deviceDiscovery_DeviceDiscovered;
}
}

3
Emby.Dlna/Ssdp/DeviceDiscovery.cs
View File

@ -104,7 +104,8 @@ namespace Emby.Dlna.Ssdp
Argument = new UpnpDeviceInfo
{
Location = e.DiscoveredDevice.DescriptionLocation,
Headers = headers
Headers = headers,
LocalIpAddress = e.LocalIpAddress
}
};

3
Emby.Server.Core/ApplicationHost.cs
View File

@ -491,7 +491,8 @@ namespace Emby.Server.Core
{
var migrations = new List<IVersionMigration>
{
new LibraryScanMigration(ServerConfigurationManager, TaskManager)
new LibraryScanMigration(ServerConfigurationManager, TaskManager),
new GuideMigration(ServerConfigurationManager, TaskManager)
};
foreach (var task in migrations)

17
Emby.Server.Core/EntryPoints/ExternalPortForwarding.cs
View File

@ -11,6 +11,7 @@ using MediaBrowser.Model.Events;
using MediaBrowser.Model.Logging;
using MediaBrowser.Model.Threading;
using Mono.Nat;
using System.Threading.Tasks;
namespace Emby.Server.Core.EntryPoints
{
@ -223,7 +224,7 @@ namespace Emby.Server.Core.EntryPoints
private List<string> _createdRules = new List<string>();
private List<string> _usnsHandled = new List<string>();
private void CreateRules(INatDevice device)
private async void CreateRules(INatDevice device)
{
if (_disposed)
{
@ -239,12 +240,16 @@ namespace Emby.Server.Core.EntryPoints
{
_createdRules.Add(address);
CreatePortMap(device, _appHost.HttpPort, _config.Configuration.PublicPort);
CreatePortMap(device, _appHost.HttpsPort, _config.Configuration.PublicHttpsPort);
var success = await CreatePortMap(device, _appHost.HttpPort, _config.Configuration.PublicPort).ConfigureAwait(false);
if (success)
{
await CreatePortMap(device, _appHost.HttpsPort, _config.Configuration.PublicHttpsPort).ConfigureAwait(false);
}
}
}
private async void CreatePortMap(INatDevice device, int privatePort, int publicPort)
private async Task<bool> CreatePortMap(INatDevice device, int privatePort, int publicPort)
{
_logger.Debug("Creating port map on port {0}", privatePort);
@ -255,10 +260,14 @@ namespace Emby.Server.Core.EntryPoints
Description = _appHost.Name
}).ConfigureAwait(false);
return true;
}
catch (Exception ex)
{
_logger.Error("Error creating port map: " + ex.Message);
return false;
}
}

1
Emby.Server.Implementations/Emby.Server.Implementations.csproj
View File

@ -182,6 +182,7 @@
<Compile Include="MediaEncoder\EncodingManager.cs" />
<Compile Include="Migrations\IVersionMigration.cs" />
<Compile Include="Migrations\LibraryScanMigration.cs" />
<Compile Include="Migrations\GuideMigration.cs" />
<Compile Include="Migrations\UpdateLevelMigration.cs" />
<Compile Include="News\NewsEntryPoint.cs" />
<Compile Include="News\NewsService.cs" />

6
RSSDP/DeviceAvailableEventArgs.cs
View File

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using MediaBrowser.Model.Net;
namespace Rssdp
{
@ -11,10 +12,11 @@ namespace Rssdp
/// </summary>
public sealed class DeviceAvailableEventArgs : EventArgs
{
public IpAddressInfo LocalIpAddress { get; set; }
#region Fields
#region Fields
private readonly DiscoveredSsdpDevice _DiscoveredDevice;
private readonly DiscoveredSsdpDevice _DiscoveredDevice;
private readonly bool _IsNewlyDiscovered;
#endregion

6
RSSDP/ResponseReceivedEventArgs.cs
View File

@ -15,9 +15,11 @@ namespace Rssdp.Infrastructure
public sealed class ResponseReceivedEventArgs : EventArgs
{
#region Fields
public IpAddressInfo LocalIpAddress { get; set; }
private readonly HttpResponseMessage _Message;
#region Fields
private readonly HttpResponseMessage _Message;
private readonly IpEndPointInfo _ReceivedFrom;
#endregion

9
RSSDP/SsdpCommunicationsServer.cs
View File

@ -454,7 +454,7 @@ namespace Rssdp.Infrastructure
}
if (responseMessage != null)
OnResponseReceived(responseMessage, endPoint);
OnResponseReceived(responseMessage, endPoint, receivedOnLocalIpAddress);
}
else
{
@ -490,11 +490,14 @@ namespace Rssdp.Infrastructure
handlers(this, new RequestReceivedEventArgs(data, remoteEndPoint, receivedOnLocalIpAddress));
}
private void OnResponseReceived(HttpResponseMessage data, IpEndPointInfo endPoint)
private void OnResponseReceived(HttpResponseMessage data, IpEndPointInfo endPoint, IpAddressInfo localIpAddress)
{
var handlers = this.ResponseReceived;
if (handlers != null)
handlers(this, new ResponseReceivedEventArgs(data, endPoint));
handlers(this, new ResponseReceivedEventArgs(data, endPoint)
{
LocalIpAddress = localIpAddress
});
}
#endregion

36
RSSDP/SsdpDeviceLocatorBase.cs
View File

@ -7,6 +7,7 @@ using System.Net.Http;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using MediaBrowser.Model.Net;
using MediaBrowser.Model.Threading;
using RSSDP;
@ -163,7 +164,7 @@ namespace Rssdp.Infrastructure
{
foreach (var device in GetUnexpiredDevices().Where(NotificationTypeMatchesFilter))
{
DeviceFound(device, false);
DeviceFound(device, false, null);
}
}
@ -237,16 +238,17 @@ namespace Rssdp.Infrastructure
/// <summary>
/// Raises the <see cref="DeviceAvailable"/> event.
/// </summary>
/// <param name="device">A <see cref="DiscoveredSsdpDevice"/> representing the device that is now available.</param>
/// <param name="isNewDevice">True if the device was not currently in the cahce before this event was raised.</param>
/// <seealso cref="DeviceAvailable"/>
protected virtual void OnDeviceAvailable(DiscoveredSsdpDevice device, bool isNewDevice)
protected virtual void OnDeviceAvailable(DiscoveredSsdpDevice device, bool isNewDevice, IpAddressInfo localIpAddress)
{
if (this.IsDisposed) return;
var handlers = this.DeviceAvailable;
if (handlers != null)
handlers(this, new DeviceAvailableEventArgs(device, isNewDevice));
handlers(this, new DeviceAvailableEventArgs(device, isNewDevice)
{
LocalIpAddress = localIpAddress
});
}
/// <summary>
@ -335,7 +337,7 @@ namespace Rssdp.Infrastructure
#region Discovery/Device Add
private void AddOrUpdateDiscoveredDevice(DiscoveredSsdpDevice device)
private void AddOrUpdateDiscoveredDevice(DiscoveredSsdpDevice device, IpAddressInfo localIpAddress)
{
bool isNewDevice = false;
lock (_Devices)
@ -353,10 +355,10 @@ namespace Rssdp.Infrastructure
}
}
DeviceFound(device, isNewDevice);
DeviceFound(device, isNewDevice, localIpAddress);
}
private void DeviceFound(DiscoveredSsdpDevice device, bool isNewDevice)
private void DeviceFound(DiscoveredSsdpDevice device, bool isNewDevice, IpAddressInfo localIpAddress)
{
// Don't raise the event if we've already done it for a cached
// version of this device, and the cached version isn't
@ -391,7 +393,7 @@ namespace Rssdp.Infrastructure
}
if (raiseEvent)
OnDeviceAvailable(device, isNewDevice);
OnDeviceAvailable(device, isNewDevice, localIpAddress);
}
private bool NotificationTypeMatchesFilter(DiscoveredSsdpDevice device)
@ -428,7 +430,7 @@ namespace Rssdp.Infrastructure
return _CommunicationsServer.SendMulticastMessage(message);
}
private void ProcessSearchResponseMessage(HttpResponseMessage message)
private void ProcessSearchResponseMessage(HttpResponseMessage message, IpAddressInfo localIpAddress)
{
if (!message.IsSuccessStatusCode) return;
@ -445,22 +447,22 @@ namespace Rssdp.Infrastructure
ResponseHeaders = message.Headers
};
AddOrUpdateDiscoveredDevice(device);
AddOrUpdateDiscoveredDevice(device, localIpAddress);
}
}
private void ProcessNotificationMessage(HttpRequestMessage message)
private void ProcessNotificationMessage(HttpRequestMessage message, IpAddressInfo localIpAddress)
{
if (String.Compare(message.Method.Method, "Notify", StringComparison.OrdinalIgnoreCase) != 0) return;
var notificationType = GetFirstHeaderStringValue("NTS", message);
if (String.Compare(notificationType, SsdpConstants.SsdpKeepAliveNotification, StringComparison.OrdinalIgnoreCase) == 0)
ProcessAliveNotification(message);
ProcessAliveNotification(message, localIpAddress);
else if (String.Compare(notificationType, SsdpConstants.SsdpByeByeNotification, StringComparison.OrdinalIgnoreCase) == 0)
ProcessByeByeNotification(message);
}
private void ProcessAliveNotification(HttpRequestMessage message)
private void ProcessAliveNotification(HttpRequestMessage message, IpAddressInfo localIpAddress)
{
var location = GetFirstHeaderUriValue("Location", message);
if (location != null)
@ -475,7 +477,7 @@ namespace Rssdp.Infrastructure
ResponseHeaders = message.Headers
};
AddOrUpdateDiscoveredDevice(device);
AddOrUpdateDiscoveredDevice(device, localIpAddress);
ResetExpireCachedDevicesTimer();
}
@ -702,12 +704,12 @@ namespace Rssdp.Infrastructure
private void CommsServer_ResponseReceived(object sender, ResponseReceivedEventArgs e)
{
ProcessSearchResponseMessage(e.Message);
ProcessSearchResponseMessage(e.Message, e.LocalIpAddress);
}
private void CommsServer_RequestReceived(object sender, RequestReceivedEventArgs e)
{
ProcessNotificationMessage(e.Message);
ProcessNotificationMessage(e.Message, e.LocalIpAddress);
}
#endregion

2
src/Emby.Server/Program.cs
View File

@ -193,7 +193,7 @@ namespace Emby.Server
/// <param name="options">The options.</param>
private static void RunApplication(ServerApplicationPaths appPaths, ILogManager logManager, StartupOptions options, EnvironmentInfo environmentInfo)
{
var fileSystem = new ManagedFileSystem(logManager.GetLogger("FileSystem"), true, true, true);
var fileSystem = new ManagedFileSystem(logManager.GetLogger("FileSystem"), true, true, true, appPaths.TempDirectory);
fileSystem.AddShortcutHandler(new MbLinkShortcutHandler(fileSystem));

2
src/Emby.Server/project.json
View File

@ -1,5 +1,5 @@
{
"version": "3.1.0-*",
"version": "3.1.0.1",
"buildOptions": {
"emitEntryPoint": true
},