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

Merge branch 'master' of https://github.com/MediaBrowser/Emby

Browse Source
This commit is contained in:
Luke Pulverenti 2016-02-16 12:15:15 -05:00
commit 78484a2813
19 changed files with 66 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
MediaBrowser.Api/PluginService.cs
View File

@ -208,7 +208,7 @@ namespace MediaBrowser.Api
foreach (var plugin in result)
{
var pkg = packages.FirstOrDefault(i => !string.IsNullOrWhiteSpace(i.guid) && new Guid(plugin.Id).Equals(new Guid(i.guid)));
var pkg = packages.FirstOrDefault(i => !string.IsNullOrWhiteSpace(i.guid) && string.Equals(i.guid.Replace("-", string.Empty), plugin.Id.Replace("-", string.Empty), StringComparison.OrdinalIgnoreCase));
if (pkg != null)
{
@ -228,8 +228,9 @@ namespace MediaBrowser.Api
.ToList();
}
}
catch
catch (Exception ex)
{
//Logger.ErrorException("Error getting plugin list", ex);
// Play it safe here
if (requireAppStoreEnabled)
{

4
MediaBrowser.Dlna/DlnaManager.cs
View File

@ -488,7 +488,9 @@ namespace MediaBrowser.Dlna
var profile = GetProfile(headers) ??
GetDefaultProfile();
return new DescriptionXmlBuilder(profile, serverUuId, serverAddress, _appHost.FriendlyName, serverUuId.GetMD5().ToString("N")).GetXml();
var serverId = _appHost.SystemId;
return new DescriptionXmlBuilder(profile, serverUuId, serverAddress, _appHost.FriendlyName, serverId).GetXml();
}
public ImageStream GetIcon(string filename)

12
MediaBrowser.Dlna/Main/DlnaEntryPoint.cs
View File

@ -157,9 +157,9 @@ namespace MediaBrowser.Dlna.Main
//}
var addressString = address.ToString();
var guid = addressString.GetMD5();
var udn = addressString.GetMD5().ToString("N");
var descriptorURI = "/dlna/" + guid.ToString("N") + "/description.xml";
var descriptorURI = "/dlna/" + udn + "/description.xml";
var uri = new Uri(_appHost.GetLocalApiUrl(addressString) + descriptorURI);
@ -170,12 +170,12 @@ namespace MediaBrowser.Dlna.Main
"urn:schemas-upnp-org:service:ContentDirectory:1",
"urn:schemas-upnp-org:service:ConnectionManager:1",
"urn:microsoft.com:service:X_MS_MediaReceiverRegistrar:1",
"uuid:" + guid.ToString("N")
"uuid:" + udn
};
_ssdpHandler.RegisterNotification(guid, uri, address, services);
_ssdpHandler.RegisterNotification(udn, uri, address, services);
_registeredServerIds.Add(guid.ToString("N"));
_registeredServerIds.Add(udn);
}
}
@ -240,7 +240,7 @@ namespace MediaBrowser.Dlna.Main
{
try
{
_ssdpHandler.UnregisterNotification(new Guid(id));
_ssdpHandler.UnregisterNotification(id);
}
catch (Exception ex)
{

2
MediaBrowser.Dlna/Server/DescriptionXmlBuilder.cs
View File

@ -122,7 +122,7 @@ namespace MediaBrowser.Dlna.Server
builder.Append("<serialNumber>" + SecurityElement.Escape(_profile.SerialNumber) + "</serialNumber>");
}
builder.Append("<UDN>uuid:" + SecurityElement.Escape(_serverId) + "</UDN>");
builder.Append("<UDN>uuid:" + SecurityElement.Escape(_serverUdn) + "</UDN>");
builder.Append("<presentationURL>" + SecurityElement.Escape(_serverAddress) + "</presentationURL>");
if (!EnableAbsoluteUrls)

6
MediaBrowser.Dlna/Server/UpnpDevice.cs
View File

@ -8,10 +8,10 @@ namespace MediaBrowser.Dlna.Server
public readonly Uri Descriptor;
public readonly string Type;
public readonly string USN;
public readonly Guid Uuid;
public readonly string Uuid;
public readonly IPAddress Address;
public UpnpDevice(Guid aUuid, string aType, Uri aDescriptor, IPAddress address)
public UpnpDevice(string aUuid, string aType, Uri aDescriptor, IPAddress address)
{
Uuid = aUuid;
Type = aType;
@ -25,7 +25,7 @@ namespace MediaBrowser.Dlna.Server
}
else
{
USN = String.Format("uuid:{0}::{1}", Uuid.ToString("N"), Type);
USN = String.Format("uuid:{0}::{1}", Uuid, Type);
}
}
}

6
MediaBrowser.Dlna/Ssdp/SsdpHandler.cs
View File

@ -36,7 +36,7 @@ namespace MediaBrowser.Dlna.Ssdp
private Timer _notificationTimer;
private bool _isDisposed;
private readonly ConcurrentDictionary<Guid, List<UpnpDevice>> _devices = new ConcurrentDictionary<Guid, List<UpnpDevice>>();
private readonly ConcurrentDictionary<string, List<UpnpDevice>> _devices = new ConcurrentDictionary<string, List<UpnpDevice>>();
private readonly IApplicationHost _appHost;
@ -451,7 +451,7 @@ namespace MediaBrowser.Dlna.Ssdp
SendDatagram(msg, _ssdpEndp, new IPEndPoint(dev.Address, 0), true);
}
public void RegisterNotification(Guid uuid, Uri descriptionUri, IPAddress address, IEnumerable<string> services)
public void RegisterNotification(string uuid, Uri descriptionUri, IPAddress address, IEnumerable<string> services)
{
var list = _devices.GetOrAdd(uuid, new List<UpnpDevice>());
@ -461,7 +461,7 @@ namespace MediaBrowser.Dlna.Ssdp
_logger.Debug("Registered mount {0} at {1}", uuid, descriptionUri);
}
public void UnregisterNotification(Guid uuid)
public void UnregisterNotification(string uuid)
{
List<UpnpDevice> dl;
if (_devices.TryRemove(uuid, out dl))

3
MediaBrowser.Model/Configuration/UserConfiguration.cs
View File

@ -42,8 +42,6 @@ namespace MediaBrowser.Model.Configuration
public bool IncludeTrailersInSuggestions { get; set; }
public bool EnableCinemaMode { get; set; }
public string[] LatestItemsExcludes { get; set; }
public string[] PlainFolderViews { get; set; }
@ -64,7 +62,6 @@ namespace MediaBrowser.Model.Configuration
PlainFolderViews = new string[] { };
IncludeTrailersInSuggestions = true;
EnableCinemaMode = true;
GroupedFolders = new string[] { };
}

2
MediaBrowser.Server.Implementations/EntryPoints/UsageReporter.cs
View File

@ -18,7 +18,7 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
private readonly IHttpClient _httpClient;
private readonly IUserManager _userManager;
private readonly ILogger _logger;
private const string MbAdminUrl = "https://www.mb3admin.com/admin/";
private const string MbAdminUrl = "http://www.mb3admin.com/admin/";
public UsageReporter(IApplicationHost applicationHost, IHttpClient httpClient, IUserManager userManager, ILogger logger)
{

1
MediaBrowser.Server.Implementations/HttpServer/ResponseFilter.cs
View File

@ -61,6 +61,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
if (!hasOptions.Options.ContainsKey("Server"))
{
hasOptions.Options["Server"] = "Mono-HTTPAPI/1.1, UPnP/1.0 DLNADOC/1.50";
//hasOptions.Options["Server"] = "Mono-HTTPAPI/1.1";
}
// Content length has to be explicitly set on on HttpListenerResponse or it won't be happy

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

@ -91,6 +91,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
// Important - don't await the log task or we won't be able to kill ffmpeg when the user stops playback
StartStreamingLog(process.StandardError.BaseStream, _logFileStream);
onStarted();
// Wait for the file to exist before proceeeding
while (!_hasExited)
{

62
MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/SatIpDiscovery.cs
View File

@ -41,29 +41,21 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.SatIp
void _deviceDiscovery_DeviceDiscovered(object sender, SsdpMessageEventArgs e)
{
//string server = null;
//if (e.Headers.TryGetValue("SERVER", out server) && server.IndexOf("HDHomeRun", StringComparison.OrdinalIgnoreCase) != -1)
//{
// string location;
// if (e.Headers.TryGetValue("Location", out location))
// {
// //_logger.Debug("HdHomerun found at {0}", location);
string st = null;
if (e.Headers.TryGetValue("ST", out st) && string.Equals(st, "urn:ses-com:device:SatIPServer:1", StringComparison.OrdinalIgnoreCase))
{
string location;
if (e.Headers.TryGetValue("Location", out location) && !string.IsNullOrWhiteSpace(location))
{
_logger.Debug("SAT IP found at {0}", location);
// // Just get the beginning of the url
// Uri uri;
// if (Uri.TryCreate(location, UriKind.Absolute, out uri))
// {
// var apiUrl = location.Replace(uri.LocalPath, String.Empty, StringComparison.OrdinalIgnoreCase)
// .TrimEnd('/');
// //_logger.Debug("HdHomerun api url: {0}", apiUrl);
// AddDevice(apiUrl);
// }
// }
//}
// Just get the beginning of the url
AddDevice(location);
}
}
}
private async void AddDevice(string url)
private async void AddDevice(string location)
{
await _semaphore.WaitAsync().ConfigureAwait(false);
@ -71,24 +63,24 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.SatIp
{
var options = GetConfiguration();
if (options.TunerHosts.Any(i =>
string.Equals(i.Type, SatIpHost.DeviceType, StringComparison.OrdinalIgnoreCase) &&
UriEquals(i.Url, url)))
{
return;
}
//if (options.TunerHosts.Any(i =>
// string.Equals(i.Type, SatIpHost.DeviceType, StringComparison.OrdinalIgnoreCase) &&
// UriEquals(i.Url, url)))
//{
// return;
//}
// Strip off the port
url = new Uri(url).GetComponents(UriComponents.AbsoluteUri & ~UriComponents.Port, UriFormat.UriEscaped).TrimEnd('/');
//// Strip off the port
//url = new Uri(url).GetComponents(UriComponents.AbsoluteUri & ~UriComponents.Port, UriFormat.UriEscaped).TrimEnd('/');
await TestUrl(url).ConfigureAwait(false);
await _liveTvManager.SaveTunerHost(new TunerHostInfo
{
Type = SatIpHost.DeviceType,
Url = url
//await TestUrl(url).ConfigureAwait(false);
}).ConfigureAwait(false);
//await _liveTvManager.SaveTunerHost(new TunerHostInfo
//{
// Type = SatIpHost.DeviceType,
// Url = url
//}).ConfigureAwait(false);
}
catch (Exception ex)
{

5
MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
View File

@ -45,8 +45,9 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\CommonIO.1.0.0.7\lib\net45\CommonIO.dll</HintPath>
</Reference>
<Reference Include="Emby.XmlTv">
<HintPath>..\packages\Emby.XmlTv.1.0.0.46\lib\net45\Emby.XmlTv.dll</HintPath>
<Reference Include="Emby.XmlTv, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Emby.XmlTv.1.0.0.48\lib\net45\Emby.XmlTv.dll</HintPath>
</Reference>
<Reference Include="Interfaces.IO">
<HintPath>..\packages\Interfaces.IO.1.0.0.5\lib\portable-net45+sl4+wp71+win8+wpa81\Interfaces.IO.dll</HintPath>

2
MediaBrowser.Server.Implementations/packages.config
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="CommonIO" version="1.0.0.7" targetFramework="net45" />
<package id="Emby.XmlTv" version="1.0.0.46" targetFramework="net45" />
<package id="Emby.XmlTv" version="1.0.0.48" targetFramework="net45" />
<package id="Interfaces.IO" version="1.0.0.5" targetFramework="net45" />
<package id="MediaBrowser.Naming" version="1.0.0.47" targetFramework="net45" />
<package id="Mono.Nat" version="1.2.24.0" targetFramework="net45" />

6
MediaBrowser.Server.Startup.Common/FFMpeg/FFMpegDownloadInfo.cs
View File

@ -33,7 +33,7 @@ namespace MediaBrowser.Server.Startup.Common.FFMpeg
case OperatingSystem.Linux:
info.ArchiveType = "7z";
info.Version = "20150917";
info.Version = "20160215";
break;
case OperatingSystem.Osx:
@ -119,12 +119,12 @@ namespace MediaBrowser.Server.Startup.Common.FFMpeg
case Architecture.X86_X64:
return new[]
{
"https://github.com/MediaBrowser/Emby.Resources/raw/master/ffmpeg/linux/ffmpeg-2.8.0-64bit-static.7z"
"https://github.com/MediaBrowser/Emby.Resources/raw/master/ffmpeg/linux/ffmpeg-git-20160215-64bit-static.7z"
};
case Architecture.X86:
return new[]
{
"https://github.com/MediaBrowser/Emby.Resources/raw/master/ffmpeg/linux/ffmpeg-2.8.0-32bit-static.7z"
"https://github.com/MediaBrowser/Emby.Resources/raw/master/ffmpeg/linux/ffmpeg-git-20160215-32bit-static.7z"
};
case Architecture.Arm:
return new[]

6
MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
View File

@ -113,6 +113,9 @@
<Content Include="dashboard-ui\components\filterdialog\filterdialog.template.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\components\filterdialog\style.css">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\components\guestinviter\guestinviter.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
@ -511,9 +514,6 @@
<Content Include="dashboard-ui\scripts\photos.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\scripts\queryfilters.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\scripts\registrationservices.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>

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

@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>MediaBrowser.Common.Internal</id>
<version>3.0.641</version>
<version>3.0.642</version>
<title>MediaBrowser.Common.Internal</title>
<authors>Luke</authors>
<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>
<copyright>Copyright © Emby 2013</copyright>
<dependencies>
<dependency id="MediaBrowser.Common" version="3.0.641" />
<dependency id="MediaBrowser.Common" version="3.0.642" />
<dependency id="NLog" version="4.2.3" />
<dependency id="SimpleInjector" version="3.1.2" />
</dependencies>

2
Nuget/MediaBrowser.Common.nuspec
View File

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

2
Nuget/MediaBrowser.Model.Signed.nuspec
View File

@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>MediaBrowser.Model.Signed</id>
<version>3.0.641</version>
<version>3.0.642</version>
<title>MediaBrowser.Model - Signed Edition</title>
<authors>Emby Team</authors>
<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">
<metadata>
<id>MediaBrowser.Server.Core</id>
<version>3.0.641</version>
<version>3.0.642</version>
<title>Media Browser.Server.Core</title>
<authors>Emby Team</authors>
<owners>ebr,Luke,scottisafool</owners>
@ -12,7 +12,7 @@
<description>Contains core components required to build plugins for Emby Server.</description>
<copyright>Copyright © Emby 2013</copyright>
<dependencies>
<dependency id="MediaBrowser.Common" version="3.0.641" />
<dependency id="MediaBrowser.Common" version="3.0.642" />
<dependency id="Interfaces.IO" version="1.0.0.5" />
</dependencies>
</metadata>