lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2233 from MediaBrowser/dev

Browse Source 
update recording dialogs
This commit is contained in:
Luke 2016-10-14 12:25:21 -04:00 committed by GitHub
commit 68d52b85d1
4 changed files with 35 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
MediaBrowser.Server.Implementations/EntryPoints/ExternalPortForwarding.cs
View File

@ -122,43 +122,55 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
var identifier = string.IsNullOrWhiteSpace(usn) ? nt : usn; var identifier = string.IsNullOrWhiteSpace(usn) ? nt : usn;
if (info.Location != null && !_usnsHandled.Contains(identifier)) if (info.Location == null)
{ {
_usnsHandled.Add(identifier); return;
}
_logger.Debug("Calling Nat.Handle on " + identifier); lock (_usnsHandled)
{
IPAddress address; if (_usnsHandled.Contains(identifier))
if (IPAddress.TryParse(info.Location.Host, out address))
{ {
// The Handle method doesn't need the port return;
var endpoint = new IPEndPoint(address, info.Location.Port); }
_usnsHandled.Add(identifier);
}
IPAddress localAddress = null; _logger.Debug("Calling Nat.Handle on " + identifier);
try IPAddress address;
{ if (IPAddress.TryParse(info.Location.Host, out address))
var localAddressString = await _appHost.GetLocalApiUrl().ConfigureAwait(false); {
// The Handle method doesn't need the port
var endpoint = new IPEndPoint(address, info.Location.Port);
if (!IPAddress.TryParse(localAddressString, out localAddress)) IPAddress localAddress = null;
{
return; try
} {
} var localAddressString = await _appHost.GetLocalApiUrl().ConfigureAwait(false);
catch
if (!IPAddress.TryParse(localAddressString, out localAddress))
{ {
return; return;
} }
NatUtility.Handle(localAddress, info, endpoint, NatProtocol.Upnp);
} }
catch
{
return;
}
NatUtility.Handle(localAddress, info, endpoint, NatProtocol.Upnp);
} }
} }
private void ClearCreatedRules(object state) private void ClearCreatedRules(object state)
{ {
_createdRules = new List<string>(); _createdRules = new List<string>();
_usnsHandled = new List<string>(); lock (_usnsHandled)
{
_usnsHandled.Clear();
}
} }
void NatUtility_UnhandledException(object sender, UnhandledExceptionEventArgs e) void NatUtility_UnhandledException(object sender, UnhandledExceptionEventArgs e)

2
MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
View File

@ -741,7 +741,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
{ {
PostPaddingSeconds = Math.Max(config.PostPaddingSeconds, 0), PostPaddingSeconds = Math.Max(config.PostPaddingSeconds, 0),
PrePaddingSeconds = Math.Max(config.PrePaddingSeconds, 0), PrePaddingSeconds = Math.Max(config.PrePaddingSeconds, 0),
RecordAnyChannel = true, RecordAnyChannel = false,
RecordAnyTime = true, RecordAnyTime = true,
RecordNewOnly = true, RecordNewOnly = true,

2
MediaBrowser.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs
View File

@ -114,8 +114,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts
channel.ImageUrl = FindProperty("tvg-logo", extInf, null); channel.ImageUrl = FindProperty("tvg-logo", extInf, null);
channel.Number = FindProperty("channel-id", extInf, channel.Number); channel.Number = FindProperty("channel-id", extInf, channel.Number);
channel.Number = FindProperty("tvg-id", extInf, channel.Number); channel.Number = FindProperty("tvg-id", extInf, channel.Number);
channel.Name = FindProperty("tvg-name", extInf, channel.Name);
channel.Name = FindProperty("tvg-id", extInf, channel.Name); channel.Name = FindProperty("tvg-id", extInf, channel.Name);
channel.Name = FindProperty("tvg-name", extInf, channel.Name);
return channel; return channel;
} }

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

@ -515,9 +515,6 @@
<Content Include="dashboard-ui\scripts\photos.js"> <Content Include="dashboard-ui\scripts\photos.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="dashboard-ui\scripts\registrationservices.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\scripts\reports.js"> <Content Include="dashboard-ui\scripts\reports.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>