aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2014-02-22 16:05:00 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2014-02-22 16:05:00 -0500
commit55b770ac2f2bc9156243d06ffc22816efa295349 (patch)
tree693dbfcb38164d7aee5db7b7e08b5497683b7034
parentb52d99568b8917e5743dd67e531604753a16bb4e (diff)
make sure omdb provider returns a name
-rw-r--r--MediaBrowser.Providers/Manager/MetadataService.cs2
-rw-r--r--MediaBrowser.Providers/Movies/MovieDbProvider.cs2
-rw-r--r--MediaBrowser.Providers/Omdb/OmdbItemProvider.cs14
3 files changed, 12 insertions, 6 deletions
diff --git a/MediaBrowser.Providers/Manager/MetadataService.cs b/MediaBrowser.Providers/Manager/MetadataService.cs
index 524df4fe2..eb2d7d747 100644
--- a/MediaBrowser.Providers/Manager/MetadataService.cs
+++ b/MediaBrowser.Providers/Manager/MetadataService.cs
@@ -295,7 +295,7 @@ namespace MediaBrowser.Providers.Manager
{
if (imageService.MergeImages(item, localItem.Images))
{
- refreshResult.UpdateType = refreshResult.UpdateType | ItemUpdateType.MetadataImport;
+ refreshResult.UpdateType = refreshResult.UpdateType | ItemUpdateType.ImageUpdate;
}
if (!string.IsNullOrEmpty(localItem.Item.Name))
diff --git a/MediaBrowser.Providers/Movies/MovieDbProvider.cs b/MediaBrowser.Providers/Movies/MovieDbProvider.cs
index 2f1c5cf18..32a77a8a6 100644
--- a/MediaBrowser.Providers/Movies/MovieDbProvider.cs
+++ b/MediaBrowser.Providers/Movies/MovieDbProvider.cs
@@ -149,7 +149,7 @@ namespace MediaBrowser.Providers.Movies
internal static string GetMoviesDataPath(IApplicationPaths appPaths)
{
- var dataPath = Path.Combine(appPaths.DataPath, "tmdb-movies");
+ var dataPath = Path.Combine(appPaths.CachePath, "tmdb-movies");
return dataPath;
}
diff --git a/MediaBrowser.Providers/Omdb/OmdbItemProvider.cs b/MediaBrowser.Providers/Omdb/OmdbItemProvider.cs
index b19194d46..c9d73fe0c 100644
--- a/MediaBrowser.Providers/Omdb/OmdbItemProvider.cs
+++ b/MediaBrowser.Providers/Omdb/OmdbItemProvider.cs
@@ -69,6 +69,8 @@ namespace MediaBrowser.Providers.Omdb
{
result.Item.SetProviderId(MetadataProviders.Tvdb, searchResult.Item2);
}
+
+ result.Item.Name = searchResult.Item3;
}
if (!string.IsNullOrEmpty(imdbId))
@@ -120,6 +122,8 @@ namespace MediaBrowser.Providers.Omdb
{
result.Item.SetProviderId(MetadataProviders.Tmdb, searchResult.Item2);
}
+
+ result.Item.Name = searchResult.Item3;
}
if (!string.IsNullOrEmpty(imdbId))
@@ -134,26 +138,28 @@ namespace MediaBrowser.Providers.Omdb
return result;
}
- private async Task<Tuple<string, string>> GetMovieImdbId(ItemLookupInfo info, CancellationToken cancellationToken)
+ private async Task<Tuple<string, string, string>> GetMovieImdbId(ItemLookupInfo info, CancellationToken cancellationToken)
{
var result = await new GenericMovieDbInfo<Movie>(_logger, _jsonSerializer).GetMetadata(info, cancellationToken)
.ConfigureAwait(false);
var imdb = result.HasMetadata ? result.Item.GetProviderId(MetadataProviders.Imdb) : null;
var tmdb = result.HasMetadata ? result.Item.GetProviderId(MetadataProviders.Tmdb) : null;
+ var name = result.HasMetadata ? result.Item.Name : null;
- return new Tuple<string, string>(imdb, tmdb);
+ return new Tuple<string, string, string>(imdb, tmdb, name);
}
- private async Task<Tuple<string,string>> GetSeriesImdbId(SeriesInfo info, CancellationToken cancellationToken)
+ private async Task<Tuple<string, string, string>> GetSeriesImdbId(SeriesInfo info, CancellationToken cancellationToken)
{
var result = await TvdbSeriesProvider.Current.GetMetadata(info, cancellationToken)
.ConfigureAwait(false);
var imdb = result.HasMetadata ? result.Item.GetProviderId(MetadataProviders.Imdb) : null;
var tvdb = result.HasMetadata ? result.Item.GetProviderId(MetadataProviders.Tvdb) : null;
+ var name = result.HasMetadata ? result.Item.Name : null;
- return new Tuple<string, string>(imdb, tvdb);
+ return new Tuple<string, string, string>(imdb, tvdb, name);
}
public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)