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

Merge pull request #1548 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2016-03-14 01:10:49 -04:00
commit cdf869e934
19 changed files with 100 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MediaBrowser.Api/StartupWizardService.cs
View File

@ -68,6 +68,7 @@ namespace MediaBrowser.Api
_config.Configuration.EnableLocalizedGuids = true;
_config.Configuration.EnableCustomPathSubFolders = true;
_config.Configuration.EnableDateLastRefresh = true;
_config.Configuration.EnableStandaloneMusicKeys = true;
_config.SaveConfiguration();
}

25
MediaBrowser.Controller/Entities/Audio/Audio.cs
View File

@ -153,6 +153,31 @@ namespace MediaBrowser.Controller.Entities.Audio
/// <returns>System.String.</returns>
protected override string CreateUserDataKey()
{
if (ConfigurationManager.Configuration.EnableStandaloneMusicKeys)
{
var songKey = IndexNumber.HasValue ? IndexNumber.Value.ToString("0000") : string.Empty;
if (ParentIndexNumber.HasValue)
{
songKey = ParentIndexNumber.Value.ToString("0000") + "-" + songKey;
}
songKey+= Name;
if (!string.IsNullOrWhiteSpace(Album))
{
songKey = Album + "-" + songKey;
}
var albumArtist = AlbumArtists.FirstOrDefault();
if (!string.IsNullOrWhiteSpace(albumArtist))
{
songKey = albumArtist + "-" + songKey;
}
return songKey;
}
var parent = AlbumEntity;
if (parent != null)

23
MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
View File

@ -34,7 +34,17 @@ namespace MediaBrowser.Controller.Entities.Audio
{
get
{
return GetParents().OfType<MusicArtist>().FirstOrDefault();
var artist = GetParents().OfType<MusicArtist>().FirstOrDefault();
if (artist == null)
{
var name = AlbumArtist;
if (!string.IsNullOrWhiteSpace(name))
{
artist = LibraryManager.GetArtist(name);
}
}
return artist;
}
}
@ -106,6 +116,15 @@ namespace MediaBrowser.Controller.Entities.Audio
return "MusicAlbum-Musicbrainz-" + id;
}
if (ConfigurationManager.Configuration.EnableStandaloneMusicKeys)
{
var albumArtist = AlbumArtist;
if (!string.IsNullOrWhiteSpace(albumArtist))
{
return albumArtist + "-" + Name;
}
}
return base.CreateUserDataKey();
}
@ -125,7 +144,7 @@ namespace MediaBrowser.Controller.Entities.Audio
id.AlbumArtists = AlbumArtists;
var artist = GetParents().OfType<MusicArtist>().FirstOrDefault();
var artist = MusicArtist;
if (artist != null)
{

8
MediaBrowser.Controller/Entities/Movies/Movie.cs
View File

@ -6,6 +6,7 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Runtime.Serialization;
using System.Threading;
using System.Threading.Tasks;
using CommonIO;
@ -85,6 +86,13 @@ namespace MediaBrowser.Controller.Entities.Movies
/// <value>The name of the TMDB collection.</value>
public string TmdbCollectionName { get; set; }
[IgnoreDataMember]
public string CollectionName
{
get { return TmdbCollectionName; }
set { TmdbCollectionName = value; }
}
/// <summary>
/// Gets the trailer ids.
/// </summary>

2
MediaBrowser.LocalMetadata/Parsers/MovieXmlParser.cs
View File

@ -35,7 +35,7 @@ namespace MediaBrowser.LocalMetadata.Parsers
if (!string.IsNullOrWhiteSpace(val) && movie != null)
{
movie.TmdbCollectionName = val;
movie.CollectionName = val;
}
break;

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

@ -207,6 +207,7 @@ namespace MediaBrowser.Model.Configuration
public bool DownloadImagesInAdvance { get; set; }
public bool EnableAnonymousUsageReporting { get; set; }
public bool EnableStandaloneMusicKeys { get; set; }
/// <summary>
/// Initializes a new instance of the <see cref="ServerConfiguration" /> class.

6
MediaBrowser.Model/Dto/BaseItemDto.cs
View File

@ -206,12 +206,6 @@ namespace MediaBrowser.Model.Dto
/// <value>The short overview.</value>
public string ShortOverview { get; set; }
/// <summary>
/// Gets or sets the name of the TMDB collection.
/// </summary>
/// <value>The name of the TMDB collection.</value>
public string TmdbCollectionName { get; set; }
/// <summary>
/// Gets or sets the taglines.
/// </summary>

1
MediaBrowser.Model/LiveTv/LiveTvOptions.cs
View File

@ -35,6 +35,7 @@ namespace MediaBrowser.Model.LiveTv
public string M3UUrl { get; set; }
public string FriendlyName { get; set; }
public int Tuners { get; set; }
public string DiseqC { get; set; }
public int DataVersion { get; set; }

5
MediaBrowser.Model/Querying/ItemFields.cs
View File

@ -235,11 +235,6 @@
/// </summary>
VoteCount,
/// <summary>
/// The TMDB collection name
/// </summary>
TmdbCollectionName,
/// <summary>
/// The trailer url of the item
/// </summary>

4
MediaBrowser.Providers/Manager/ProviderManager.cs
View File

@ -1022,8 +1022,8 @@ namespace MediaBrowser.Providers.Manager
.ToList();
var musicArtists = albums
.Select(i => i.GetParent())
.OfType<MusicArtist>()
.Select(i => i.MusicArtist)
.Where(i => i != null)
.ToList();
var musicArtistRefreshTasks = musicArtists.Select(i => i.ValidateChildren(new Progress<double>(), cancellationToken, options, true));

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

@ -107,11 +107,21 @@ namespace MediaBrowser.Providers.MediaInfo
private string GetAudioImagePath(Audio item)
{
var album = item.AlbumEntity;
var filename = item.Album ?? string.Empty;
filename += string.Join(",", item.Artists.ToArray());
filename += album == null ? item.Id.ToString("N") + "_primary" + item.DateModified.Ticks : album.Id.ToString("N") + album.DateModified.Ticks + "_primary";
if (!string.IsNullOrWhiteSpace(item.Album))
{
filename += "_" + item.Album;
}
else if (!string.IsNullOrWhiteSpace(item.Name))
{
filename += "_" + item.Name;
}
else
{
filename += "_" + item.Id.ToString("N");
}
filename = filename.GetMD5() + ".jpg";

2
MediaBrowser.Providers/Movies/GenericMovieDbInfo.cs
View File

@ -179,7 +179,7 @@ namespace MediaBrowser.Providers.Movies
if (movieItem != null)
{
movieItem.TmdbCollectionName = movieData.belongs_to_collection.name;
movieItem.CollectionName = movieData.belongs_to_collection.name;
}
}

4
MediaBrowser.Providers/Movies/MovieMetadataService.cs
View File

@ -37,9 +37,9 @@ namespace MediaBrowser.Providers.Movies
var sourceItem = source.Item;
var targetItem = target.Item;
if (replaceData || string.IsNullOrEmpty(targetItem.TmdbCollectionName))
if (replaceData || string.IsNullOrEmpty(targetItem.CollectionName))
{
targetItem.TmdbCollectionName = sourceItem.TmdbCollectionName;
targetItem.CollectionName = sourceItem.CollectionName;
}
}
}

10
MediaBrowser.Server.Implementations/Dto/DtoService.cs
View File

@ -1378,16 +1378,6 @@ namespace MediaBrowser.Server.Implementations.Dto
}
}
// Add MovieInfo
var movie = item as Movie;
if (movie != null)
{
if (fields.Contains(ItemFields.TmdbCollectionName))
{
dto.TmdbCollectionName = movie.TmdbCollectionName;
}
}
var hasSpecialFeatures = item as IHasSpecialFeatures;
if (hasSpecialFeatures != null)
{

5
MediaBrowser.Server.Implementations/Library/LibraryManager.cs
View File

@ -1044,11 +1044,6 @@ namespace MediaBrowser.Server.Implementations.Library
return names;
}
private void SetPropertiesFromSongs(MusicArtist artist, IEnumerable<IHasMetadata> items)
{
}
/// <summary>
/// Validate and refresh the People sub-set of the IBN.
/// The items are stored in the db but not loaded into memory until actually requested by an operation.

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

@ -90,6 +90,11 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.SatIp
if (existing == null)
{
if (string.IsNullOrWhiteSpace(info.M3UUrl))
{
return;
}
await _liveTvManager.SaveTunerHost(new TunerHostInfo
{
Type = SatIpHost.DeviceType,
@ -97,7 +102,9 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.SatIp
DataVersion = 1,
DeviceId = info.DeviceId,
FriendlyName = info.FriendlyName,
Tuners = info.Tuners
Tuners = info.Tuners,
M3UUrl = info.M3UUrl,
IsEnabled = true
}).ConfigureAwait(false);
}

1
MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs
View File

@ -860,6 +860,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
break;
case "collectionnumber":
case "tmdbcolid":
var tmdbCollection = reader.ReadElementContentAsString();
if (!string.IsNullOrWhiteSpace(tmdbCollection))
{

13
MediaBrowser.XbmcMetadata/Parsers/MovieNfoParser.cs
View File

@ -11,7 +11,8 @@ namespace MediaBrowser.XbmcMetadata.Parsers
{
class MovieNfoParser : BaseNfoParser<Video>
{
public MovieNfoParser(ILogger logger, IConfigurationManager config) : base(logger, config)
public MovieNfoParser(ILogger logger, IConfigurationManager config)
: base(logger, config)
{
}
@ -44,12 +45,18 @@ namespace MediaBrowser.XbmcMetadata.Parsers
case "set":
{
var val = reader.ReadElementContentAsString();
var movie = item as Movie;
var tmdbcolid = reader.GetAttribute("tmdbcolid");
if (!string.IsNullOrWhiteSpace(tmdbcolid) && movie != null)
{
movie.SetProviderId(MetadataProviders.TmdbCollection, tmdbcolid);
}
var val = reader.ReadElementContentAsString();
if (!string.IsNullOrWhiteSpace(val) && movie != null)
{
movie.TmdbCollectionName = val;
movie.CollectionName = val;
}
break;

4
MediaBrowser.XbmcMetadata/Savers/MovieNfoSaver.cs
View File

@ -101,9 +101,9 @@ namespace MediaBrowser.XbmcMetadata.Savers
if (movie != null)
{
if (!string.IsNullOrEmpty(movie.TmdbCollectionName))
if (!string.IsNullOrEmpty(movie.CollectionName))
{
writer.WriteElementString("set", movie.TmdbCollectionName);
writer.WriteElementString("set", movie.CollectionName);
}
}
}