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

update nuget

Browse Source
This commit is contained in:
Luke Pulverenti 2016-06-07 12:21:46 -04:00
parent 7be8a519a3
commit 0ad0150435
5 changed files with 37 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
MediaBrowser.Model/Configuration/ServerConfiguration.cs
View File

@ -67,7 +67,7 @@ namespace MediaBrowser.Model.Configuration
/// </summary>
/// <value><c>true</c> if [enable case sensitive item ids]; otherwise, <c>false</c>.</value>
public bool EnableCaseSensitiveItemIds { get; set; }
/// <summary>
/// Gets or sets the metadata path.
/// </summary>
@ -155,7 +155,7 @@ namespace MediaBrowser.Model.Configuration
/// </summary>
/// <value>The dashboard source path.</value>
public string DashboardSourcePath { get; set; }
/// <summary>
/// Gets or sets the image saving convention.
/// </summary>
@ -201,12 +201,14 @@ namespace MediaBrowser.Model.Configuration
public bool EnableFolderView { get; set; }
public bool EnableGroupingIntoCollections { get; set; }
public bool DisplaySpecialsWithinSeasons { get; set; }
public string[] LocalNetworkAddresses { get; set; }
/// <summary>
/// Initializes a new instance of the <see cref="ServerConfiguration" /> class.
/// </summary>
public ServerConfiguration()
{
LocalNetworkAddresses = new string[] { };
Migrations = new string[] { };
EnableCustomPathSubFolders = true;

2
MediaBrowser.Providers/Music/MusicBrainzAlbumProvider.cs
View File

@ -25,7 +25,7 @@ namespace MediaBrowser.Providers.Music
private readonly IApplicationHost _appHost;
private readonly ILogger _logger;
public static string MusicBrainzBaseUrl = "https://www.musicbrainz.org";
public static string MusicBrainzBaseUrl = "http://musicbrainz.fercasas.com:5000";
public MusicBrainzAlbumProvider(IHttpClient httpClient, IApplicationHost appHost, ILogger logger)
{

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

@ -46,7 +46,7 @@
<HintPath>..\packages\CommonIO.1.0.0.9\lib\net45\CommonIO.dll</HintPath>
</Reference>
<Reference Include="Emby.XmlTv, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Emby.XmlTv.1.0.0.50\lib\net45\Emby.XmlTv.dll</HintPath>
<HintPath>..\packages\Emby.XmlTv.1.0.0.51\lib\net45\Emby.XmlTv.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="INIFileParser, Version=2.3.0.0, Culture=neutral, PublicKeyToken=79af7b307b65cf3c, processorArchitecture=MSIL">

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.9" targetFramework="net45" />
<package id="Emby.XmlTv" version="1.0.0.50" targetFramework="net45" />
<package id="Emby.XmlTv" version="1.0.0.51" targetFramework="net45" />
<package id="ini-parser" version="2.3.0" targetFramework="net45" />
<package id="Interfaces.IO" version="1.0.0.5" targetFramework="net45" />
<package id="MediaBrowser.Naming" version="1.0.0.51" targetFramework="net45" />

37
MediaBrowser.Server.Startup.Common/ApplicationHost.cs
View File

@ -833,17 +833,40 @@ namespace MediaBrowser.Server.Startup.Common
private IEnumerable<string> GetUrlPrefixes()
{
var prefixes = new List<string>
{
"http://+:" + ServerConfigurationManager.Configuration.HttpServerPortNumber + "/"
};
var hosts = ServerConfigurationManager.Configuration.LocalNetworkAddresses.ToList();
if (!string.IsNullOrWhiteSpace(CertificatePath))
if (hosts.Count == 0)
{
prefixes.Add("https://+:" + ServerConfigurationManager.Configuration.HttpsPortNumber + "/");
hosts.Add("+");
}
return prefixes;
if (!hosts.Contains("+", StringComparer.OrdinalIgnoreCase))
{
if (!hosts.Contains("localhost", StringComparer.OrdinalIgnoreCase))
{
hosts.Add("localhost");
}
if (!hosts.Contains("127.0.0.1", StringComparer.OrdinalIgnoreCase))
{
hosts.Add("127.0.0.1");
}
}
return hosts.SelectMany(i =>
{
var prefixes = new List<string>
{
"http://"+i+":" + ServerConfigurationManager.Configuration.HttpServerPortNumber + "/"
};
if (!string.IsNullOrWhiteSpace(CertificatePath))
{
prefixes.Add("https://" + i + ":" + ServerConfigurationManager.Configuration.HttpsPortNumber + "/");
}
return prefixes;
});
}
/// <summary>