Fix(avbase): support new prefix formatted ID (#13)

metatube-community · Oct 13, 2023 · 34b677e · 34b677e
1 parent b702d6c
commit 34b677e
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 10 deletions.
diff --git a/provider/avbase/avbase.go b/provider/avbase/avbase.go
@@ -65,7 +65,14 @@ func New() *AVBase {
  }
 }
 
-func (ab *AVBase) NormalizeID(id string) string { return strings.ToUpper(id) }
+func (ab *AVBase) NormalizeID(id string) string {
+ if !strings.Contains(id, ":") {
+ return strings.ToUpper(id)
+ }
+ ss := strings.SplitN(id, ":", 2)
+ prefix, workID := ss[0], ss[1]
+ return ab.JoinPrefixID(prefix, workID)
+}
 
 func (ab *AVBase) GetMovieInfoByID(id string) (info *model.MovieInfo, err error) {
  return ab.GetMovieInfoByURL(fmt.Sprintf(movieURL, id))
@@ -127,6 +134,10 @@ func (ab *AVBase) GetMovieInfoByURL(rawURL string) (info *model.MovieInfo, err e
  if len(workInfo.Actors) > 0 {
  info.Actors = workInfo.Actors
  }
+ // choose right ID for info.
+ if len(workInfo.ID) > len(id) && strings.Contains(workInfo.ID, ":") {
+ id = workInfo.ID
+ }
  }
  })
 
@@ -147,6 +158,7 @@ func (ab *AVBase) GetMovieInfoByURL(rawURL string) (info *model.MovieInfo, err e
 
 func (ab *AVBase) getMovieInfoFromWork(work Work) (info *model.MovieInfo, err error) {
  info = &model.MovieInfo{
+ ID: ab.JoinPrefixID(work.Prefix, work.WorkID),
  Number: work.WorkID,
  Actors: []string{},
  PreviewImages: []string{},
@@ -258,7 +270,7 @@ func (ab *AVBase) SearchMovie(keyword string) (results []*model.MovieSearchResul
  continue
  }
  result := &model.MovieSearchResult{
- ID: work.WorkID,
+ ID: ab.JoinPrefixID(work.Prefix, work.WorkID),
  Number: work.WorkID,
  Title: work.Title,
  Provider: ab.Name(),
@@ -279,6 +291,13 @@ func (ab *AVBase) SearchMovie(keyword string) (results []*model.MovieSearchResul
  return
 }
 
+func (ab *AVBase) JoinPrefixID(prefix, workID string) string {
+ if strings.TrimSpace(prefix) == "" {
+ return workID
+ }
+ return fmt.Sprintf("%s:%s", prefix, workID)
+}
+
 func (ab *AVBase) GetBuildID() (string, error) {
  v, err, _ := ab.single.Do(func() (any, error) {
  return ab.getBuildID()
@@ -315,6 +334,7 @@ func (ab *AVBase) getBuildID() (buildID string, err error) {
 
 type Work struct {
  ID int `json:"id"`
+ Prefix string `json:"prefix"`
  WorkID string `json:"work_id"`
  Title string `json:"title"`
  MinDate string `json:"min_date"`

diff --git a/provider/avbase/avbase_test.go b/provider/avbase/avbase_test.go
@@ -10,11 +10,9 @@ import (
 func TestAVBase_GetMovieInfoByID(t *testing.T) {
  provider := New()
  for _, item := range []string{
- "ABP-588",
- "PGD-919",
- "ORECO-062",
- "RECEN-012",
- "DDH-079",
+ "prestige:ABP-588",
+ "tameike:MEYD-856",
+ "SSIS-354",
  } {
  info, err := provider.GetMovieInfoByID(item)
  data, _ := json.MarshalIndent(info, "", "\t")
@@ -27,9 +25,8 @@ func TestAVBase_SearchMovie(t *testing.T) {
  provider := New()
  for _, item := range []string{
  "ABP-588",
- "ORECO-062",
- "AKDL-030",
- "SABA-099",
+ "MEYD-856",
+ "SSIS-354",
  } {
  results, err := provider.SearchMovie(provider.NormalizeKeyword(item))
  data, _ := json.MarshalIndent(results, "", "\t")