fix: licensor in anime genre,producer,season

rl404 · Sep 16, 2021 · 3ad2439 · 3ad2439
1 parent 5acd4bb
commit 3ad2439
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 7 deletions.
diff --git a/api_producer_magazine_test.go b/api_producer_magazine_test.go
@@ -35,7 +35,7 @@ func TestGetProducer(t *testing.T) {
 	require.NoError(t, err)
 
 	assert.NotZero(t, len(d))
-	emptyY, emptyM, emptyD, emptyLic, emptyEp := true, true, true, true, true
+	emptyY, emptyM, emptyD, emptyLic, emptyEp, emptyGen := true, true, true, true, true,true
 	for _, p := range d {
 		assert.NotZero(t, p.ID)
 		assert.NotEmpty(t, p.Image)
@@ -54,7 +54,9 @@ func TestGetProducer(t *testing.T) {
 		}
 		assert.NotZero(t, p.Member)
 		assert.NotZero(t, p.Score)
-		assert.NotZero(t, len(p.Genres))
+		if len(p.Genres) > 0 {
+			emptyGen = false
+		}
 		for _, g := range p.Genres {
 			assert.NotZero(t, g.ID)
 			assert.NotEmpty(t, g.Name)
@@ -77,6 +79,7 @@ func TestGetProducer(t *testing.T) {
 	assert.False(t, emptyD)
 	assert.False(t, emptyEp)
 	assert.False(t, emptyLic)
+	assert.False(t, emptyGen)
 	time.Sleep(sleepDur)
 }
 

diff --git a/internal/parser/genre.go b/internal/parser/genre.go
@@ -19,7 +19,7 @@ func (p *Parser) GetGenres(t string) ([]model.ItemCount, int, error) {
 // GetAnimeWithGenre to get anime list with specific genre.
 func (p *Parser) GetAnimeWithGenre(id int, page int) ([]model.AnimeItem, int, error) {
 	q := map[string]interface{}{"page": page}
-	doc, code, err := p.getDoc(utils.BuildURLWithQuery(q, malURL, "anime", "genre", id, "a"), "#contentWrapper")
+	doc, code, err := p.getDoc(utils.BuildURLWithQuery(q, malURL, "anime", "genre", id, "a"), "#content")
 	if err != nil {
 		return nil, code, err
 	}
@@ -29,7 +29,7 @@ func (p *Parser) GetAnimeWithGenre(id int, page int) ([]model.AnimeItem, int, er
 // GetMangaWithGenre to get manga list with specific genre.
 func (p *Parser) GetMangaWithGenre(id int, page int) ([]model.MangaItem, int, error) {
 	q := map[string]interface{}{"page": page}
-	doc, code, err := p.getDoc(utils.BuildURLWithQuery(q, malURL, "manga", "genre", id, "a"), "#contentWrapper")
+	doc, code, err := p.getDoc(utils.BuildURLWithQuery(q, malURL, "manga", "genre", id, "a"), "#content")
 	if err != nil {
 		return nil, code, err
 	}

diff --git a/internal/parser/producer_magazine/producer.go b/internal/parser/producer_magazine/producer.go
@@ -78,7 +78,7 @@ func (p *producer) getGenres(eachArea *goquery.Selection) []model.Item {
 }
 
 func (p *producer) getSynopsis(eachArea *goquery.Selection) string {
-	synopsis := strings.TrimSpace(eachArea.Find("div[class=\"synopsis js-synopsis\"]").Text())
+	synopsis := strings.TrimSpace(eachArea.Find("div[class=\"synopsis js-synopsis\"]").Find(".preline").Text())
 	if regexp.MustCompile(`No synopsis`).FindString(synopsis) != "" {
 		return ""
 	}
@@ -115,8 +115,18 @@ func (p *producer) getProgress(area *goquery.Selection) int {
 }
 
 func (p *producer) getLicensors(eachArea *goquery.Selection) []string {
-	licensor, _ := eachArea.Find("div[class=\"synopsis js-synopsis\"] .licensors").Attr("data-licensors")
-	return utils.ArrayFilter(strings.Split(licensor, ","))
+	licensors := []string{}
+	area := eachArea.Find("div[class=\"synopsis js-synopsis\"]")
+	area.Find("p").EachWithBreak(func(i int, a *goquery.Selection) bool {
+		if a.Find("span").Text() == "Licensor:" {
+			a.Find("a").Each(func(i int, s *goquery.Selection) {
+				licensors = append(licensors, s.Text())
+			})
+			return false
+		}
+		return true
+	})
+	return licensors
 }
 
 func (p *producer) getType(area *goquery.Selection) string {