Fix(fanza/dvd): no preview images

metatube-community · Dec 17, 2023 · 347d0d8 · 347d0d8
1 parent f7b9ae0
commit 347d0d8
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 3 deletions.
diff --git a/provider/fanza/fanza.go b/provider/fanza/fanza.go
@@ -15,6 +15,7 @@ import (
 
 	"github.com/antchfx/htmlquery"
 	"github.com/gocolly/colly/v2"
+	"github.com/iancoleman/orderedmap"
 	"golang.org/x/net/html"
 
 	"github.com/metatube-community/metatube-sdk-go/common/comparer"
@@ -319,10 +320,25 @@ func (fz *FANZA) GetMovieInfoByURL(rawURL string) (info *model.MovieInfo, err er
 			FindString(e.Attr("onclick"))))
 	})
 
-	// Preview Images
+	// In case of any duplication
+	previewImageSet := orderedmap.New()
+
+	// Preview Images Digital/DVD
+	c.OnXML(`//*[@id="sample-image-block"]//a[@name="sample-image"]`, func(e *colly.XMLElement) {
+		previewImageSet.Set(e.Request.AbsoluteURL(PreviewSrc(e.ChildAttr(`.//img`, "src"))), nil)
+	})
+
+	// Preview Images Digital (Fallback)
 	c.OnXML(`//*[@id="sample-image-block"]/a`, func(e *colly.XMLElement) {
-		info.PreviewImages = append(info.PreviewImages,
-			e.Request.AbsoluteURL(PreviewSrc(e.ChildAttr(`.//img`, "src"))))
+		if len(previewImageSet.Keys()) == 0 {
+			return
+		}
+		previewImageSet.Set(e.Request.AbsoluteURL(PreviewSrc(e.ChildAttr(`.//img`, "src"))), nil)
+	})
+
+	// Final Preview Images
+	c.OnScraped(func(_ *colly.Response) {
+		info.PreviewImages = append(info.PreviewImages, previewImageSet.Keys()...)
 	})
 
 	// Final (images)

diff --git a/provider/fanza/fanza_test.go b/provider/fanza/fanza_test.go
@@ -32,6 +32,22 @@ func TestFANZA_GetMovieInfoByID(t *testing.T) {
 	}
 }
 
+func TestFANZA_GetMovieInfoByURL(t *testing.T) {
+	provider := New()
+	for _, item := range []string{
+		"https://www.dmm.co.jp/mono/dvd/-/detail/=/cid=41hodv21810/",
+		"https://www.dmm.co.jp/mono/dvd/-/detail/=/cid=h_346rebd655/",
+		"https://www.dmm.co.jp/digital/videoa/-/detail/=/cid=ipvr00231/",
+		"https://www.dmm.co.jp/mono/anime/-/detail/=/cid=196glod0323t/",
+		"https://www.dmm.co.jp/digital/videoc/-/detail/=/cid=fuyu079/",
+	} {
+		info, err := provider.GetMovieInfoByURL(item)
+		data, _ := json.MarshalIndent(info, "", "\t")
+		assert.True(t, assert.NoError(t, err) && assert.True(t, info.Valid()))
+		t.Logf("%s", data)
+	}
+}
+
 func TestFANZA_SearchMovie(t *testing.T) {
 	provider := New()
 	for _, item := range []string{