From db75b2da9d1aeb786a3696e6a6682cf2dfe4464e Mon Sep 17 00:00:00 2001 From: xjasonlyu Date: Tue, 24 May 2022 21:21:51 +0800 Subject: [PATCH] rename to metadata --- Jellyfin.Plugin.JavTube/ApiClient.cs | 30 ++++++++++++------------- Jellyfin.Plugin.JavTube/Models/Actor.cs | 2 +- Jellyfin.Plugin.JavTube/Models/Movie.cs | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Jellyfin.Plugin.JavTube/ApiClient.cs b/Jellyfin.Plugin.JavTube/ApiClient.cs index 7f35c4b..5cab6f5 100644 --- a/Jellyfin.Plugin.JavTube/ApiClient.cs +++ b/Jellyfin.Plugin.JavTube/ApiClient.cs @@ -9,8 +9,8 @@ namespace Jellyfin.Plugin.JavTube; public class ApiClient { - private const string ActorInfoApi = "/api/actor"; - private const string MovieInfoApi = "/api/movie"; + private const string ActorMetadataApi = "/api/actor"; + private const string MovieMetadataApi = "/api/movie"; private const string ActorSearchApi = "/api/search/actor"; private const string MovieSearchApi = "/api/search/movie"; private const string PrimaryImageApi = "/image/primary"; @@ -33,7 +33,7 @@ public class ApiClient return uriBuilder.ToString(); } - private static string ComposeInfoApiUrl(string path, string id, string provider, string language, bool lazy) + private static string ComposeMetadataApiUrl(string path, string id, string provider, string language, bool lazy) { return ComposeUrl(path, new NameValueCollection { @@ -100,35 +100,35 @@ public class ApiClient return ComposeImageApiUrl(BackdropImageApi, id, provider, url, position, auto); } - public static async Task GetActorInfo(string id, string provider, + public static async Task GetActorMetadata(string id, string provider, CancellationToken cancellationToken) { - return await GetActorInfo(id, provider, true, cancellationToken); + return await GetActorMetadata(id, provider, true, cancellationToken); } - public static async Task GetActorInfo(string id, string provider, bool lazy, + public static async Task GetActorMetadata(string id, string provider, bool lazy, CancellationToken cancellationToken) { - var url = ComposeInfoApiUrl(ActorInfoApi, id, provider, string.Empty, lazy); - return await GetDataFromApi(url, cancellationToken); + var url = ComposeMetadataApiUrl(ActorMetadataApi, id, provider, string.Empty, lazy); + return await GetDataFromApi(url, cancellationToken); } - public static async Task GetMovieInfo(string id, string provider, CancellationToken cancellationToken) + public static async Task GetMovieMetadata(string id, string provider, CancellationToken cancellationToken) { - return await GetMovieInfo(id, provider, true, string.Empty, cancellationToken); + return await GetMovieMetadata(id, provider, true, string.Empty, cancellationToken); } - public static async Task GetMovieInfo(string id, string provider, string language, + public static async Task GetMovieMetadata(string id, string provider, string language, CancellationToken cancellationToken) { - return await GetMovieInfo(id, provider, true, language, cancellationToken); + return await GetMovieMetadata(id, provider, true, language, cancellationToken); } - public static async Task GetMovieInfo(string id, string provider, bool lazy, string language, + public static async Task GetMovieMetadata(string id, string provider, bool lazy, string language, CancellationToken cancellationToken) { - var url = ComposeInfoApiUrl(MovieInfoApi, id, provider, language, lazy); - return await GetDataFromApi(url, cancellationToken); + var url = ComposeMetadataApiUrl(MovieMetadataApi, id, provider, language, lazy); + return await GetDataFromApi(url, cancellationToken); } public static async Task> SearchActor(string keyword, string provider, diff --git a/Jellyfin.Plugin.JavTube/Models/Actor.cs b/Jellyfin.Plugin.JavTube/Models/Actor.cs index abb3228..c893374 100644 --- a/Jellyfin.Plugin.JavTube/Models/Actor.cs +++ b/Jellyfin.Plugin.JavTube/Models/Actor.cs @@ -15,7 +15,7 @@ public class ActorSearchResult [JsonPropertyName("provider")] public string Provider; } -public class ActorInfo : ActorSearchResult +public class ActorMetadata : ActorSearchResult { [JsonPropertyName("aliases")] public string[] Aliases; diff --git a/Jellyfin.Plugin.JavTube/Models/Movie.cs b/Jellyfin.Plugin.JavTube/Models/Movie.cs index 234c9c6..e1dc5f2 100644 --- a/Jellyfin.Plugin.JavTube/Models/Movie.cs +++ b/Jellyfin.Plugin.JavTube/Models/Movie.cs @@ -23,7 +23,7 @@ public class MovieSearchResult [JsonPropertyName("title")] public string Title; } -public class MovieInfo : MovieSearchResult +public class MovieMetadata : MovieSearchResult { [JsonPropertyName("actors")] public string[] Actors;