jellyfin/jellyfin-plugin-anidb
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-plugin-anidb.git synced 2024-11-23 13:59:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #81 from jellyfin/linq-null-ref

Browse Source 
Fix more null refs
This commit is contained in:
Joshua M. Boniface 2020-07-19 21:03:28 -04:00 committed by GitHub
commit b449d5355c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Jellyfin.Plugin.Anime/Providers/KitsuIO/ApiClient/ApiModel.cs
View File

@ -61,10 +61,11 @@ namespace Jellyfin.Plugin.Anime.Providers.KitsuIO.ApiClient
public bool Equal(string title)
{
return En.Equals(title) ||
EnUs.Equals(title) ||
EnJp.Equals(title) ||
JaJp.Equals(title);
return
(En?.Equals(title) ?? false) ||
(EnUs?.Equals(title) ?? false) ||
(EnJp?.Equals(title) ?? false) ||
(JaJp?.Equals(title) ?? false);
}
}

21
Jellyfin.Plugin.Anime/Providers/KitsuIO/ApiClient/KitsuIoApi.cs
View File

@ -32,17 +32,15 @@ namespace Jellyfin.Plugin.Anime.Providers.KitsuIO.ApiClient
{
var filterString = string.Join("&",filters.Select(x => $"filter[{x.Key}]={x.Value}"));
var pageString = "page[limit]=10";
var responseString = await _httpClient.GetStringAsync($"{_apiBaseUrl}/anime?{filterString}&{pageString}");
var response = JsonSerializer.Deserialize<ApiListResponse>(responseString, _serializerOptions);
return response;
var responseStream = await _httpClient.GetStreamAsync($"{_apiBaseUrl}/anime?{filterString}&{pageString}");
return await JsonSerializer.DeserializeAsync<ApiListResponse>(responseStream, _serializerOptions);
}
public static async Task<ApiResponse> Get_Series(string seriesId)
{
var responseString = await _httpClient.GetStringAsync($"{_apiBaseUrl}/anime/{seriesId}?include=genres");
var response = JsonSerializer.Deserialize<ApiResponse>(responseString, _serializerOptions);
return response;
var responseStream = await _httpClient.GetStreamAsync($"{_apiBaseUrl}/anime/{seriesId}?include=genres");
return await JsonSerializer.DeserializeAsync<ApiResponse>(responseStream, _serializerOptions);
}
public static async Task<ApiListResponse> Get_Episodes(string seriesId)
@ -54,8 +52,8 @@ namespace Jellyfin.Plugin.Anime.Providers.KitsuIO.ApiClient
for (long offset = 0; offset < episodeCount; offset += step)
{
var queryString = $"?filter[mediaId]={seriesId}&page[limit]={step}&page[offset]={offset}";
var responseString = await _httpClient.GetStringAsync($"{_apiBaseUrl}/episodes{queryString}");
var response = JsonSerializer.Deserialize<ApiListResponse>(responseString, _serializerOptions);
var responseStream = await _httpClient.GetStreamAsync($"{_apiBaseUrl}/episodes{queryString}");
var response = await JsonSerializer.DeserializeAsync<ApiListResponse>(responseStream, _serializerOptions);
episodeCount = response.Meta.Count.Value;
result.Data.AddRange(response.Data);
@ -67,9 +65,8 @@ namespace Jellyfin.Plugin.Anime.Providers.KitsuIO.ApiClient
public static async Task<ApiResponse> Get_Episode(string episodeId)
{
var filterString = $"/{episodeId}";
var responseString = await _httpClient.GetStringAsync($"{_apiBaseUrl}/episodes{filterString}");
var response = JsonSerializer.Deserialize<ApiResponse>(responseString, _serializerOptions);
return response;
var responseStream = await _httpClient.GetStreamAsync($"{_apiBaseUrl}/episodes{filterString}");
return await JsonSerializer.DeserializeAsync<ApiResponse>(responseStream, _serializerOptions);
}
}
}