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

Merge pull request #2997 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2017-11-02 12:01:32 -04:00 committed by GitHub
commit de9292f117
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Emby.Server.Implementations/Networking/NetworkManager.cs
View File

@ -106,7 +106,7 @@ namespace Emby.Server.Implementations.Networking
endpoint.StartsWith("127.", StringComparison.OrdinalIgnoreCase) || endpoint.StartsWith("127.", StringComparison.OrdinalIgnoreCase) ||
endpoint.StartsWith("192.168", StringComparison.OrdinalIgnoreCase) || endpoint.StartsWith("192.168", StringComparison.OrdinalIgnoreCase) ||
endpoint.StartsWith("169.", StringComparison.OrdinalIgnoreCase) || endpoint.StartsWith("169.", StringComparison.OrdinalIgnoreCase) ||
//endpoint.StartsWith("10.", StringComparison.OrdinalIgnoreCase) || endpoint.StartsWith("10.", StringComparison.OrdinalIgnoreCase) ||
IsInPrivateAddressSpaceAndLocalSubnet(endpoint); IsInPrivateAddressSpaceAndLocalSubnet(endpoint);
} }

32
MediaBrowser.Providers/MediaInfo/AudioImageProvider.cs
View File

@ -92,24 +92,34 @@ namespace MediaBrowser.Providers.MediaInfo
private string GetAudioImagePath(Audio item) private string GetAudioImagePath(Audio item)
{ {
var filename = item.Album ?? string.Empty; string filename;
filename += string.Join(",", item.Artists);
if (!string.IsNullOrWhiteSpace(item.Album)) if (item.GetType() == typeof(Audio))
{ {
filename += "_" + item.Album; filename = item.Album ?? string.Empty;
} filename += string.Join(",", item.Artists);
else if (!string.IsNullOrWhiteSpace(item.Name))
{ if (!string.IsNullOrWhiteSpace(item.Album))
filename += "_" + item.Name; {
filename += "_" + item.Album;
}
else if (!string.IsNullOrWhiteSpace(item.Name))
{
filename += "_" + item.Name;
}
else
{
filename += "_" + item.Id.ToString("N");
}
filename = filename.GetMD5() + ".jpg";
} }
else else
{ {
filename += "_" + item.Id.ToString("N"); // If it's an audio book or audio podcast, allow unique image per item
filename = item.Id.ToString("N") + ".jpg";
} }
filename = filename.GetMD5() + ".jpg";
var prefix = filename.Substring(0, 1); var prefix = filename.Substring(0, 1);
return Path.Combine(AudioImagesPath, prefix, filename); return Path.Combine(AudioImagesPath, prefix, filename);