lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix some easy warnings for tmdb

Browse Source
This commit is contained in:
dkanada 2020-05-31 15:28:01 +09:00
parent 685f8ad1f0
commit 855a2b2892
9 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
MediaBrowser.Providers/Plugins/Tmdb/BoxSets/TmdbBoxSetImageProvider.cs
View File

@ -105,6 +105,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.BoxSets
{ {
return 3; return 3;
} }
if (!isLanguageEn) if (!isLanguageEn)
{ {
if (string.Equals("en", i.Language, StringComparison.OrdinalIgnoreCase)) if (string.Equals("en", i.Language, StringComparison.OrdinalIgnoreCase))
@ -112,10 +113,12 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.BoxSets
return 2; return 2;
} }
} }
if (string.IsNullOrEmpty(i.Language)) if (string.IsNullOrEmpty(i.Language))
{ {
return isLanguageEn ? 3 : 2; return isLanguageEn ? 3 : 2;
} }
return 0; return 0;
}) })
.ThenByDescending(i => i.CommunityRating ?? 0) .ThenByDescending(i => i.CommunityRating ?? 0)

5
MediaBrowser.Providers/Plugins/Tmdb/BoxSets/TmdbBoxSetProvider.cs
View File

@ -78,9 +78,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.BoxSets
var result = new RemoteSearchResult var result = new RemoteSearchResult
{ {
Name = info.Name, Name = info.Name,
SearchProviderName = Name, SearchProviderName = Name,
ImageUrl = images.Count == 0 ? null : (tmdbImageUrl + images[0].File_Path) ImageUrl = images.Count == 0 ? null : (tmdbImageUrl + images[0].File_Path)
}; };
@ -191,7 +189,6 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.BoxSets
Url = url, Url = url,
CancellationToken = cancellationToken, CancellationToken = cancellationToken,
AcceptHeader = TmdbUtils.AcceptHeader AcceptHeader = TmdbUtils.AcceptHeader
}).ConfigureAwait(false)) }).ConfigureAwait(false))
{ {
using (var json = response.Content) using (var json = response.Content)
@ -219,7 +216,6 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.BoxSets
Url = url, Url = url,
CancellationToken = cancellationToken, CancellationToken = cancellationToken,
AcceptHeader = TmdbUtils.AcceptHeader AcceptHeader = TmdbUtils.AcceptHeader
}).ConfigureAwait(false)) }).ConfigureAwait(false))
{ {
using (var json = response.Content) using (var json = response.Content)
@ -229,6 +225,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.BoxSets
} }
} }
} }
return mainResult; return mainResult;
} }

6
MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbEpisodeImageProvider.cs
View File

@ -80,7 +80,6 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
RatingType = RatingType.Score RatingType = RatingType.Score
})); }));
var isLanguageEn = string.Equals(language, "en", StringComparison.OrdinalIgnoreCase); var isLanguageEn = string.Equals(language, "en", StringComparison.OrdinalIgnoreCase);
return list.OrderByDescending(i => return list.OrderByDescending(i =>
@ -89,6 +88,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
{ {
return 3; return 3;
} }
if (!isLanguageEn) if (!isLanguageEn)
{ {
if (string.Equals("en", i.Language, StringComparison.OrdinalIgnoreCase)) if (string.Equals("en", i.Language, StringComparison.OrdinalIgnoreCase))
@ -96,15 +96,16 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
return 2; return 2;
} }
} }
if (string.IsNullOrEmpty(i.Language)) if (string.IsNullOrEmpty(i.Language))
{ {
return isLanguageEn ? 3 : 2; return isLanguageEn ? 3 : 2;
} }
return 0; return 0;
}) })
.ThenByDescending(i => i.CommunityRating ?? 0) .ThenByDescending(i => i.CommunityRating ?? 0)
.ThenByDescending(i => i.VoteCount ?? 0); .ThenByDescending(i => i.VoteCount ?? 0);
} }
private IEnumerable<Still> GetPosters(StillImages images) private IEnumerable<Still> GetPosters(StillImages images)
@ -112,7 +113,6 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
return images.Stills ?? new List<Still>(); return images.Stills ?? new List<Still>();
} }
public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken) public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
{ {
return GetResponse(url, cancellationToken); return GetResponse(url, cancellationToken);

1
MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbEpisodeProvider.cs
View File

@ -203,6 +203,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
{ {
return GetResponse(url, cancellationToken); return GetResponse(url, cancellationToken);
} }
// After TheTvDb // After TheTvDb
public int Order => 1; public int Order => 1;

2
MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbEpisodeProviderBase.cs
View File

@ -53,6 +53,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
{ {
throw new ArgumentNullException(nameof(tmdbId)); throw new ArgumentNullException(nameof(tmdbId));
} }
if (string.IsNullOrEmpty(language)) if (string.IsNullOrEmpty(language))
{ {
throw new ArgumentNullException(nameof(language)); throw new ArgumentNullException(nameof(language));
@ -80,6 +81,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
{ {
throw new ArgumentNullException(nameof(tmdbId)); throw new ArgumentNullException(nameof(tmdbId));
} }
if (string.IsNullOrEmpty(preferredLanguage)) if (string.IsNullOrEmpty(preferredLanguage))
{ {
throw new ArgumentNullException(nameof(preferredLanguage)); throw new ArgumentNullException(nameof(preferredLanguage));

3
MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeasonProvider.cs
View File

@ -145,6 +145,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
{ {
throw new ArgumentNullException(nameof(tmdbId)); throw new ArgumentNullException(nameof(tmdbId));
} }
if (string.IsNullOrEmpty(language)) if (string.IsNullOrEmpty(language))
{ {
throw new ArgumentNullException(nameof(language)); throw new ArgumentNullException(nameof(language));
@ -172,6 +173,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
{ {
throw new ArgumentNullException(nameof(tmdbId)); throw new ArgumentNullException(nameof(tmdbId));
} }
if (string.IsNullOrEmpty(preferredLanguage)) if (string.IsNullOrEmpty(preferredLanguage))
{ {
throw new ArgumentNullException(nameof(preferredLanguage)); throw new ArgumentNullException(nameof(preferredLanguage));
@ -216,7 +218,6 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
Url = url, Url = url,
CancellationToken = cancellationToken, CancellationToken = cancellationToken,
AcceptHeader = TmdbUtils.AcceptHeader AcceptHeader = TmdbUtils.AcceptHeader
}).ConfigureAwait(false)) }).ConfigureAwait(false))
{ {
using (var json = response.Content) using (var json = response.Content)

4
MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeriesImageProvider.cs
View File

@ -99,6 +99,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
{ {
return 3; return 3;
} }
if (!isLanguageEn) if (!isLanguageEn)
{ {
if (string.Equals("en", i.Language, StringComparison.OrdinalIgnoreCase)) if (string.Equals("en", i.Language, StringComparison.OrdinalIgnoreCase))
@ -106,10 +107,12 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
return 2; return 2;
} }
} }
if (string.IsNullOrEmpty(i.Language)) if (string.IsNullOrEmpty(i.Language))
{ {
return isLanguageEn ? 3 : 2; return isLanguageEn ? 3 : 2;
} }
return 0; return 0;
}) })
.ThenByDescending(i => i.CommunityRating ?? 0) .ThenByDescending(i => i.CommunityRating ?? 0)
@ -171,6 +174,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
return null; return null;
} }
// After tvdb and fanart // After tvdb and fanart
public int Order => 2; public int Order => 2;

5
MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeriesProvider.cs
View File

@ -263,10 +263,12 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
{ {
series.SetProviderId(MetadataProviders.Imdb, ids.Imdb_Id); series.SetProviderId(MetadataProviders.Imdb, ids.Imdb_Id);
} }
if (ids.Tvrage_Id > 0) if (ids.Tvrage_Id > 0)
{ {
series.SetProviderId(MetadataProviders.TvRage, ids.Tvrage_Id.ToString(_usCulture)); series.SetProviderId(MetadataProviders.TvRage, ids.Tvrage_Id.ToString(_usCulture));
} }
if (ids.Tvdb_Id > 0) if (ids.Tvdb_Id > 0)
{ {
series.SetProviderId(MetadataProviders.Tvdb, ids.Tvdb_Id.ToString(_usCulture)); series.SetProviderId(MetadataProviders.Tvdb, ids.Tvdb_Id.ToString(_usCulture));
@ -416,7 +418,6 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
Url = url, Url = url,
CancellationToken = cancellationToken, CancellationToken = cancellationToken,
AcceptHeader = TmdbUtils.AcceptHeader AcceptHeader = TmdbUtils.AcceptHeader
}).ConfigureAwait(false)) }).ConfigureAwait(false))
{ {
using (var json = response.Content) using (var json = response.Content)
@ -453,7 +454,6 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
Url = url, Url = url,
CancellationToken = cancellationToken, CancellationToken = cancellationToken,
AcceptHeader = TmdbUtils.AcceptHeader AcceptHeader = TmdbUtils.AcceptHeader
}).ConfigureAwait(false)) }).ConfigureAwait(false))
{ {
using (var json = response.Content) using (var json = response.Content)
@ -518,7 +518,6 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
Url = url, Url = url,
CancellationToken = cancellationToken, CancellationToken = cancellationToken,
AcceptHeader = TmdbUtils.AcceptHeader AcceptHeader = TmdbUtils.AcceptHeader
}).ConfigureAwait(false)) }).ConfigureAwait(false))
{ {
using (var json = response.Content) using (var json = response.Content)

2
MediaBrowser.Providers/Plugins/Tmdb/TmdbUtils.cs
View File

@ -5,7 +5,7 @@ using MediaBrowser.Providers.Plugins.Tmdb.Models.General;
namespace MediaBrowser.Providers.Plugins.Tmdb namespace MediaBrowser.Providers.Plugins.Tmdb
{ {
/// <summary> /// <summary>
/// Utilities for the TMDb provider /// Utilities for the TMDb provider.
/// </summary> /// </summary>
public static class TmdbUtils public static class TmdbUtils
{ {