Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow AniDB as an agent for movies #53

Merged
merged 5 commits into from
Mar 9, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Jellyfin.Plugin.Anime/Providers/AniDB/AniDbExternalId.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Entities.Movies;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;

Expand All @@ -7,7 +8,7 @@ namespace Jellyfin.Plugin.Anime.Providers.AniDB
public class AniDbExternalId : IExternalId
{
public bool Supports(IHasProviderIds item)
=> item is Series;
=> item is Series || item is Movie;

public string Name
=> "AniDB";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,20 @@
using MediaBrowser.Common.Net;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Entities.Movies;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Providers;

namespace Jellyfin.Plugin.Anime.Providers.AniDB.Metadata
{
public class AniDbSeriesImagesProvider : IRemoteImageProvider
public class AniDbImageProvider : IRemoteImageProvider
{
public string Name => "AniDB";
private readonly IHttpClient _httpClient;
private readonly IApplicationPaths _appPaths;

public AniDbSeriesImagesProvider(IHttpClient httpClient, IApplicationPaths appPaths)
public AniDbImageProvider(IHttpClient httpClient, IApplicationPaths appPaths)
{
_httpClient = httpClient;
_appPaths = appPaths;
Expand All @@ -38,8 +40,7 @@ public async Task<HttpResponseInfo> GetImageResponse(string url, CancellationTok

public Task<IEnumerable<RemoteImageInfo>> GetImages(BaseItem item, CancellationToken cancellationToken)
{
var series = (Series)item;
var seriesId = series.GetProviderId(ProviderNames.AniDb);
var seriesId = item.GetProviderId(ProviderNames.AniDb);
return GetImages(seriesId, cancellationToken);
}

Expand Down Expand Up @@ -70,11 +71,9 @@ public IEnumerable<ImageType> GetSupportedImages(BaseItem item)
return new[] { ImageType.Primary };
}

public string Name => "AniDB";

public bool Supports(BaseItem item)
{
return item is Series;
return item is Series || item is Season || item is Movie;
}

private async Task<string> FindImageUrl(string seriesDataPath)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
using MediaBrowser.Common.Configuration;
using MediaBrowser.Common.Net;
using MediaBrowser.Controller.Entities.Movies;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Providers;
using Microsoft.Extensions.Logging;

namespace Jellyfin.Plugin.Anime.Providers.AniDB.Metadata
{
public class AniDbMovieProvider : IRemoteMetadataProvider<Movie, MovieInfo>
{
private readonly AniDbSeriesProvider _seriesProvider;
private readonly ILogger _log;

public string Name => "AniDB";

public AniDbMovieProvider(IApplicationPaths appPaths, IHttpClient httpClient, ILoggerFactory loggerFactory)
{
_seriesProvider = new AniDbSeriesProvider(appPaths, httpClient);
_log = loggerFactory.CreateLogger("AniDB");
}

public async Task<MetadataResult<Movie>> GetMetadata(MovieInfo info, CancellationToken cancellationToken)
{
// Empty result
var result = new MetadataResult<Movie>
{
HasMetadata = false,
Item = new Movie
{
Name = info.Name
}
};

var seriesId = info.ProviderIds.GetOrDefault(ProviderNames.AniDb);
if (seriesId == null)
{
return result;
}

var seriesInfo = new SeriesInfo();
seriesInfo.ProviderIds.Add(ProviderNames.AniDb, seriesId);

var seriesResult = await _seriesProvider.GetMetadata(seriesInfo, cancellationToken);
if (seriesResult.HasMetadata)
{
result = new MetadataResult<Movie>
{
HasMetadata = true,
Item = new Movie
{
Name = seriesResult.Item.Name,
Overview = seriesResult.Item.Overview,
PremiereDate = seriesResult.Item.PremiereDate,
ProductionYear = seriesResult.Item.ProductionYear,
EndDate = seriesResult.Item.EndDate,
CommunityRating = seriesResult.Item.CommunityRating,
Studios = seriesResult.Item.Studios,
Genres = seriesResult.Item.Genres,
ProviderIds = seriesResult.Item.ProviderIds,
},
People = seriesResult.People,
Images = seriesResult.Images
};
}

return result;
}

public async Task<IEnumerable<RemoteSearchResult>> GetSearchResults(MovieInfo searchInfo, CancellationToken cancellationToken)
{
var seriesInfo = new SeriesInfo();
var seriesId = searchInfo.ProviderIds.GetOrDefault(ProviderNames.AniDb);
if (seriesId != null)
{
seriesInfo.ProviderIds.Add(ProviderNames.AniDb, seriesId);
}
seriesInfo.Name = searchInfo.Name;

return await _seriesProvider.GetSearchResults(seriesInfo, cancellationToken);
}

public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
{
return _seriesProvider.GetImageResponse(url, cancellationToken);
}
}
}

This file was deleted.