diff --git a/MediaBrowser.Controller/Entities/UserItemData.cs b/MediaBrowser.Controller/Entities/UserItemData.cs
index 8328e385b4..c039f40149 100644
--- a/MediaBrowser.Controller/Entities/UserItemData.cs
+++ b/MediaBrowser.Controller/Entities/UserItemData.cs
@@ -22,8 +22,7 @@ namespace MediaBrowser.Controller.Entities
/// Gets or sets the users 0-10 rating
///
/// The rating.
- /// A 0-10 rating is required for UserItemData.
- /// A 0-10 rating is required for UserItemData.
+ /// Rating;A 0 to 10 rating is required for UserItemData.
public float? Rating
{
get
@@ -36,7 +35,7 @@ namespace MediaBrowser.Controller.Entities
{
if (value.Value < 0 || value.Value > 10)
{
- throw new ArgumentOutOfRangeException("A 0-10 rating is required for UserItemData.");
+ throw new ArgumentOutOfRangeException("value", "A 0 to 10 rating is required for UserItemData.");
}
}
diff --git a/MediaBrowser.Controller/Providers/MediaInfo/FFProbeAudioInfoProvider.cs b/MediaBrowser.Controller/Providers/MediaInfo/FFProbeAudioInfoProvider.cs
index 1747f3003f..9bd1e2811a 100644
--- a/MediaBrowser.Controller/Providers/MediaInfo/FFProbeAudioInfoProvider.cs
+++ b/MediaBrowser.Controller/Providers/MediaInfo/FFProbeAudioInfoProvider.cs
@@ -148,7 +148,7 @@ namespace MediaBrowser.Controller.Providers.MediaInfo
///
/// The val.
/// System.String[][].
- private string[] Split(string val)
+ private IEnumerable Split(string val)
{
// Only use the comma as a delimeter if there are no slashes or pipes.
// We want to be careful not to split names that have commas in them
diff --git a/MediaBrowser.Controller/Providers/Movies/TmdbPersonProvider.cs b/MediaBrowser.Controller/Providers/Movies/TmdbPersonProvider.cs
index 03c5b1fa80..2993d39da1 100644
--- a/MediaBrowser.Controller/Providers/Movies/TmdbPersonProvider.cs
+++ b/MediaBrowser.Controller/Providers/Movies/TmdbPersonProvider.cs
@@ -24,7 +24,7 @@ namespace MediaBrowser.Controller.Providers.Movies
///
/// The meta file name
///
- protected const string MetaFileName = "mbperson.json";
+ protected const string MetaFileName = "tmdb3.json";
protected readonly IProviderManager ProviderManager;
@@ -66,6 +66,22 @@ namespace MediaBrowser.Controller.Providers.Movies
return item is Person;
}
+ protected override bool RefreshOnVersionChange
+ {
+ get
+ {
+ return true;
+ }
+ }
+
+ protected override string ProviderVersion
+ {
+ get
+ {
+ return "2";
+ }
+ }
+
///
/// Needses the refresh internal.
///
@@ -74,6 +90,11 @@ namespace MediaBrowser.Controller.Providers.Movies
/// true if XXXX, false otherwise
protected override bool NeedsRefreshInternal(BaseItem item, BaseProviderInfo providerInfo)
{
+ if (RefreshOnVersionChange && !String.Equals(ProviderVersion, providerInfo.ProviderVersion))
+ {
+ return true;
+ }
+
//we fetch if either info or image needed and haven't already tried recently
return (string.IsNullOrEmpty(item.PrimaryImagePath) || !item.ResolveArgs.ContainsMetaFileByName(MetaFileName))
&& DateTime.Today.Subtract(providerInfo.LastRefreshed).TotalDays > ConfigurationManager.Configuration.MetadataRefreshDays;
@@ -91,7 +112,6 @@ namespace MediaBrowser.Controller.Providers.Movies
cancellationToken.ThrowIfCancellationRequested();
var person = (Person)item;
- var tasks = new List();
var id = person.GetProviderId(MetadataProviders.Tmdb);
@@ -105,20 +125,7 @@ namespace MediaBrowser.Controller.Providers.Movies
if (!string.IsNullOrEmpty(id))
{
- //get info only if not already saved
- if (!item.ResolveArgs.ContainsMetaFileByName(MetaFileName))
- {
- tasks.Add(FetchInfo(person, id, cancellationToken));
- }
-
- //get image only if not already there
- if (string.IsNullOrEmpty(item.PrimaryImagePath))
- {
- tasks.Add(FetchImages(person, id, cancellationToken));
- }
-
- //and wait for them to complete
- await Task.WhenAll(tasks).ConfigureAwait(false);
+ await FetchInfo(person, id, cancellationToken).ConfigureAwait(false);
}
else
{
@@ -150,6 +157,8 @@ namespace MediaBrowser.Controller.Providers.Movies
}
}
+ protected readonly CultureInfo UsCulture = new CultureInfo("en-US");
+
///
/// Gets the TMDB id.
///
@@ -180,7 +189,7 @@ namespace MediaBrowser.Controller.Providers.Movies
{
}
- return searchResult != null && searchResult.Total_Results > 0 ? searchResult.Results[0].Id.ToString() : null;
+ return searchResult != null && searchResult.Total_Results > 0 ? searchResult.Results[0].Id.ToString(UsCulture) : null;
}
///
@@ -192,12 +201,12 @@ namespace MediaBrowser.Controller.Providers.Movies
/// Task.
private async Task FetchInfo(Person person, string id, CancellationToken cancellationToken)
{
- string url = string.Format(@"http://api.themoviedb.org/3/person/{1}?api_key={0}", MovieDbProvider.ApiKey, id);
+ string url = string.Format(@"http://api.themoviedb.org/3/person/{1}?api_key={0}&append_to_response=credits,images", MovieDbProvider.ApiKey, id);
PersonResult searchResult = null;
try
{
- using (Stream json = await HttpClient.Get(new HttpRequestOptions
+ using (var json = await HttpClient.Get(new HttpRequestOptions
{
Url = url,
CancellationToken = cancellationToken,
@@ -207,10 +216,7 @@ namespace MediaBrowser.Controller.Providers.Movies
}).ConfigureAwait(false))
{
- if (json != null)
- {
- searchResult = JsonSerializer.DeserializeFromStream(json);
- }
+ searchResult = JsonSerializer.DeserializeFromStream(json);
}
}
catch (HttpException)
@@ -219,7 +225,7 @@ namespace MediaBrowser.Controller.Providers.Movies
cancellationToken.ThrowIfCancellationRequested();
- if (searchResult != null && searchResult.Biography != null)
+ if (searchResult != null)
{
ProcessInfo(person, searchResult);
@@ -231,6 +237,8 @@ namespace MediaBrowser.Controller.Providers.Movies
await ProviderManager.SaveToLibraryFilesystem(person, Path.Combine(person.MetaLocation, MetaFileName), memoryStream, cancellationToken);
Logger.Debug("TmdbPersonProvider downloaded and saved information for {0}", person.Name);
+
+ await FetchImages(person, searchResult.images, cancellationToken).ConfigureAwait(false);
}
}
@@ -241,99 +249,73 @@ namespace MediaBrowser.Controller.Providers.Movies
/// The search result.
protected void ProcessInfo(Person person, PersonResult searchResult)
{
- person.Overview = searchResult.Biography;
+ person.Overview = searchResult.biography;
DateTime date;
- if (DateTime.TryParseExact(searchResult.Birthday, "yyyy-MM-dd", new CultureInfo("en-US"), DateTimeStyles.None, out date))
+ if (DateTime.TryParseExact(searchResult.birthday, "yyyy-MM-dd", new CultureInfo("en-US"), DateTimeStyles.None, out date))
{
person.PremiereDate = date.ToUniversalTime();
}
- if (DateTime.TryParseExact(searchResult.Deathday, "yyyy-MM-dd", new CultureInfo("en-US"), DateTimeStyles.None, out date))
+ if (DateTime.TryParseExact(searchResult.deathday, "yyyy-MM-dd", new CultureInfo("en-US"), DateTimeStyles.None, out date))
{
person.EndDate = date.ToUniversalTime();
}
- if (!string.IsNullOrEmpty(searchResult.Homepage))
+ if (!string.IsNullOrEmpty(searchResult.homepage))
{
- person.HomePageUrl = searchResult.Homepage;
+ person.HomePageUrl = searchResult.homepage;
}
- if (!string.IsNullOrEmpty(searchResult.Place_Of_Birth))
+ if (!string.IsNullOrEmpty(searchResult.place_of_birth))
{
- person.AddProductionLocation(searchResult.Place_Of_Birth);
+ person.AddProductionLocation(searchResult.place_of_birth);
}
- person.SetProviderId(MetadataProviders.Tmdb, searchResult.Id.ToString());
+ person.SetProviderId(MetadataProviders.Tmdb, searchResult.id.ToString(UsCulture));
}
///
/// Fetches the images.
///
/// The person.
- /// The id.
+ /// The search result.
/// The cancellation token.
/// Task.
- private async Task FetchImages(Person person, string id, CancellationToken cancellationToken)
+ private async Task FetchImages(Person person, Images searchResult, CancellationToken cancellationToken)
{
- string url = string.Format(@"http://api.themoviedb.org/3/person/{1}/images?api_key={0}", MovieDbProvider.ApiKey, id);
-
- PersonImages searchResult = null;
-
- try
- {
- using (Stream json = await HttpClient.Get(new HttpRequestOptions
- {
- Url = url,
- CancellationToken = cancellationToken,
- ResourcePool = MovieDbProvider.Current.MovieDbResourcePool,
- AcceptHeader = MovieDbProvider.AcceptHeader,
- EnableResponseCache = true
-
- }).ConfigureAwait(false))
- {
- if (json != null)
- {
- searchResult = JsonSerializer.DeserializeFromStream(json);
- }
- }
- }
- catch (HttpException)
- {
- }
-
- if (searchResult != null && searchResult.Profiles.Count > 0)
+ if (searchResult != null && searchResult.profiles.Count > 0)
{
//get our language
var profile =
- searchResult.Profiles.FirstOrDefault(
+ searchResult.profiles.FirstOrDefault(
p =>
- !string.IsNullOrEmpty(p.Iso_639_1) &&
- p.Iso_639_1.Equals(ConfigurationManager.Configuration.PreferredMetadataLanguage,
+ !string.IsNullOrEmpty(GetIso639(p)) &&
+ GetIso639(p).Equals(ConfigurationManager.Configuration.PreferredMetadataLanguage,
StringComparison.OrdinalIgnoreCase));
if (profile == null)
{
//didn't find our language - try first null one
profile =
- searchResult.Profiles.FirstOrDefault(
+ searchResult.profiles.FirstOrDefault(
p =>
- !string.IsNullOrEmpty(p.Iso_639_1) &&
- p.Iso_639_1.Equals(ConfigurationManager.Configuration.PreferredMetadataLanguage,
+ !string.IsNullOrEmpty(GetIso639(p)) &&
+ GetIso639(p).Equals(ConfigurationManager.Configuration.PreferredMetadataLanguage,
StringComparison.OrdinalIgnoreCase));
}
if (profile == null)
{
//still nothing - just get first one
- profile = searchResult.Profiles[0];
+ profile = searchResult.profiles[0];
}
if (profile != null)
{
var tmdbSettings = await MovieDbProvider.Current.TmdbSettings.ConfigureAwait(false);
- var img = await DownloadAndSaveImage(person, tmdbSettings.images.base_url + ConfigurationManager.Configuration.TmdbFetchedProfileSize + profile.File_Path,
- "folder" + Path.GetExtension(profile.File_Path), cancellationToken).ConfigureAwait(false);
+ var img = await DownloadAndSaveImage(person, tmdbSettings.images.base_url + ConfigurationManager.Configuration.TmdbFetchedProfileSize + profile.file_path,
+ "folder" + Path.GetExtension(profile.file_path), cancellationToken).ConfigureAwait(false);
if (!string.IsNullOrEmpty(img))
{
@@ -343,6 +325,11 @@ namespace MediaBrowser.Controller.Providers.Movies
}
}
+ private string GetIso639(Profile p)
+ {
+ return p.iso_639_1 == null ? string.Empty : p.iso_639_1.ToString();
+ }
+
///
/// Downloads the and save image.
///
@@ -373,7 +360,7 @@ namespace MediaBrowser.Controller.Providers.Movies
///
/// Class PersonSearchResult
///
- public class PersonSearchResult
+ protected class PersonSearchResult
{
///
/// Gets or sets a value indicating whether this is adult.
@@ -400,7 +387,7 @@ namespace MediaBrowser.Controller.Providers.Movies
///
/// Class PersonSearchResults
///
- public class PersonSearchResults
+ protected class PersonSearchResults
{
///
/// Gets or sets the page.
@@ -424,110 +411,65 @@ namespace MediaBrowser.Controller.Providers.Movies
public int Total_Results { get; set; }
}
- ///
- /// Class PersonResult
- ///
- public class PersonResult
+ protected class Cast
{
- ///
- /// Gets or sets a value indicating whether this is adult.
- ///
- /// true if adult; otherwise, false.
- public bool Adult { get; set; }
- ///
- /// Gets or sets the also_ known_ as.
- ///
- /// The also_ known_ as.
- public List