[extractor:nhplayer] update extraction of new player.php format

Author: gan-of-culture

extractors/nhgroup/nhgroup_test.go

@@ -163,6 +163,15 @@ func TestExtract(t *testing.T) {
 				Size:    558305856,
 			},
 		},
+		{
+			Name: "[New] Single Episode uncensoredhentai.xxx",
+			Args: test.Args{
+				URL:     "https://uncensoredhentai.xxx/watch/joshi-luck-episode-5/",
+				Title:   "Joshi Luck! Episode 5",
+				Quality: "",
+				Size:    423727631,
+			},
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.Name, func(t *testing.T) {

extractors/nhplayer/nhplayer.go

@@ -13,7 +13,7 @@ import (
 )
 
 var reNHPlayerURL = regexp.MustCompile(`https://nhplayer\.com/v/[^/"]+`)
-var rePlayerURL = regexp.MustCompile(`/player.php\?u=([^"&]+)`)
+var rePlayerURL = regexp.MustCompile(`/player.php\?[^"]+`)
 var reHTStreamingVideoURL = regexp.MustCompile(`https://htstreaming.com/video/([^"]*)`)
 
 type extractor struct{}
@@ -61,12 +61,19 @@ func extractData(URL string) (*static.Data, error) {
 		return htstreaming.ExtractData(videoURL)
 	}
 
-	playerURL := rePlayerURL.FindStringSubmatch(htmlString)
-	if len(playerURL) < 2 {
+	// non htstreaming video
+
+	matchedPlayerURL := rePlayerURL.FindString(htmlString)
+	if len(matchedPlayerURL) < 2 {
 		return nil, static.ErrDataSourceParseFailed
 	}
 
-	b64Path, err := base64.StdEncoding.DecodeString(playerURL[1])
+	playerURL, err := url.Parse(matchedPlayerURL)
+	if err != nil {
+		return nil, err
+	}
+
+	b64Path, err := base64.StdEncoding.DecodeString(playerURL.Query().Get("u"))
 	if err != nil {
 		return nil, err
 	}
@@ -82,6 +89,23 @@ func extractData(URL string) (*static.Data, error) {
 
 	size, _ := request.Size(videoURL, URL)
 
+	captions := []*static.Caption{}
+	subtitleQuery := playerURL.Query().Get("s")
+	if subtitleQuery != "" {
+		b64Path, err := base64.StdEncoding.DecodeString(subtitleQuery)
+		if err != nil {
+			return nil, err
+		}
+		subtitleURL := string(b64Path)
+		captions = append(captions, &static.Caption{
+			URL: static.URL{
+				URL: subtitleURL,
+				Ext: utils.GetFileExt(subtitleURL),
+			},
+			Language: "English",
+		})
+	}
+
 	return &static.Data{
 		Site:  baseURL.Host,
 		Title: title,
@@ -98,6 +122,7 @@ func extractData(URL string) (*static.Data, error) {
 				Size: size,
 			},
 		},
-		URL: URL,
+		Captions: captions,
+		URL:      URL,
 	}, nil
 }