This commit is contained in:
Luke Pulverenti 2013-08-20 11:28:33 -04:00
commit 8035fe19a6
7 changed files with 54 additions and 13 deletions

View File

@ -11,6 +11,17 @@ namespace MediaBrowser.Controller.Entities
/// </summary> /// </summary>
public class AggregateFolder : Folder public class AggregateFolder : Folder
{ {
/// <summary>
/// We don't support manual shortcuts
/// </summary>
protected override bool SupportsShortcutChildren
{
get
{
return false;
}
}
/// <summary> /// <summary>
/// The _virtual children /// The _virtual children
/// </summary> /// </summary>

View File

@ -67,6 +67,38 @@ namespace MediaBrowser.Controller.Entities
return NullTaskResult; return NullTaskResult;
} }
/// <summary>
/// Our children are actually just references to the ones in the physical root...
/// </summary>
/// <value>The linked children.</value>
public override List<LinkedChild> LinkedChildren
{
get
{
ItemResolveArgs resolveArgs;
try
{
resolveArgs = ResolveArgs;
}
catch (IOException ex)
{
Logger.ErrorException("Error getting ResolveArgs for {0}", ex, Path);
return new List<LinkedChild>();
}
return LibraryManager.RootFolder.RecursiveChildren
.OfType<Folder>()
.Where(i => i.Path != null && resolveArgs.PhysicalLocations.Contains(i.Path, StringComparer.OrdinalIgnoreCase))
.SelectMany(c => c.LinkedChildren).ToList();
}
set
{
base.LinkedChildren = value;
}
}
/// <summary> /// <summary>
/// Our children are actually just references to the ones in the physical root... /// Our children are actually just references to the ones in the physical root...
/// </summary> /// </summary>

View File

@ -81,11 +81,11 @@ namespace MediaBrowser.Controller.Entities
} }
} }
public List<LinkedChild> LinkedChildren { get; set; } public virtual List<LinkedChild> LinkedChildren { get; set; }
protected virtual bool SupportsShortcutChildren protected virtual bool SupportsShortcutChildren
{ {
get { return false; } get { return true; }
} }
/// <summary> /// <summary>

View File

@ -6,12 +6,5 @@ namespace MediaBrowser.Controller.Entities.Movies
/// </summary> /// </summary>
public class BoxSet : Folder public class BoxSet : Folder
{ {
protected override bool SupportsShortcutChildren
{
get
{
return true;
}
}
} }
} }

View File

@ -571,7 +571,7 @@ namespace MediaBrowser.Controller.Providers
} }
break; break;
case "CollectionNumber": case "TMDbCollectionId":
var tmdbCollection = reader.ReadElementContentAsString(); var tmdbCollection = reader.ReadElementContentAsString();
if (!string.IsNullOrWhiteSpace(tmdbCollection)) if (!string.IsNullOrWhiteSpace(tmdbCollection))
{ {

View File

@ -653,7 +653,7 @@ namespace MediaBrowser.Providers.Movies
{ {
if (!movie.LockedFields.Contains(MetadataFields.Name)) if (!movie.LockedFields.Contains(MetadataFields.Name))
{ {
movie.Name = movieData.title ?? movieData.original_title ?? movie.Name; movie.Name = movieData.title ?? movieData.original_title ?? movieData.name ?? movie.Name;
} }
if (!movie.LockedFields.Contains(MetadataFields.Overview)) if (!movie.LockedFields.Contains(MetadataFields.Overview))
{ {
@ -676,6 +676,10 @@ namespace MediaBrowser.Providers.Movies
{ {
movie.SetProviderId(MetadataProviders.TmdbCollection, movieData.belongs_to_collection.id.ToString(CultureInfo.InvariantCulture)); movie.SetProviderId(MetadataProviders.TmdbCollection, movieData.belongs_to_collection.id.ToString(CultureInfo.InvariantCulture));
} }
else
{
movie.SetProviderId(MetadataProviders.TmdbCollection, null); // clear out any old entry
}
float rating; float rating;
string voteAvg = movieData.vote_average.ToString(CultureInfo.InvariantCulture); string voteAvg = movieData.vote_average.ToString(CultureInfo.InvariantCulture);
@ -1177,6 +1181,7 @@ namespace MediaBrowser.Providers.Movies
public string homepage { get; set; } public string homepage { get; set; }
public int id { get; set; } public int id { get; set; }
public string imdb_id { get; set; } public string imdb_id { get; set; }
public string name { get; set; }
public string original_title { get; set; } public string original_title { get; set; }
public string overview { get; set; } public string overview { get; set; }
public double popularity { get; set; } public double popularity { get; set; }

View File

@ -67,7 +67,7 @@ namespace MediaBrowser.Providers.Savers
"TVcomId", "TVcomId",
"RottenTomatoesId", "RottenTomatoesId",
"MusicbrainzId", "MusicbrainzId",
"CollectionNumber", "TMDbCollectionId",
"Genres", "Genres",
"Genre", "Genre",
"Studios", "Studios",
@ -343,7 +343,7 @@ namespace MediaBrowser.Providers.Savers
if (!string.IsNullOrEmpty(tmdbCollection)) if (!string.IsNullOrEmpty(tmdbCollection))
{ {
builder.Append("<CollectionNumber>" + SecurityElement.Escape(tmdbCollection) + "</CollectionNumber>"); builder.Append("<TMDbCollectionId>" + SecurityElement.Escape(tmdbCollection) + "</TMDbCollectionId>");
} }
if (item.Taglines.Count > 0) if (item.Taglines.Count > 0)