From a58d43fe0d2eb8563ad859fed2d63e406b2c8003 Mon Sep 17 00:00:00 2001
From: gan-of-culture <project.ganoc@gmail.com>
Date: Sat, 2 Dec 2023 19:34:41 +0100
Subject: [PATCH] [extractor:kvsplayer] added support for version 15

---
 extractors/kvsplayer/kvsplayer.go      | 13 ++++++++++---
 extractors/universal/universal_test.go |  9 ---------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/extractors/kvsplayer/kvsplayer.go b/extractors/kvsplayer/kvsplayer.go
index c08336d..a24583e 100644
--- a/extractors/kvsplayer/kvsplayer.go
+++ b/extractors/kvsplayer/kvsplayer.go
@@ -1,10 +1,12 @@
 package kvsplayer
 
 import (
+	"cmp"
 	"errors"
 	"fmt"
 	"math"
 	"regexp"
+	"slices"
 	"strconv"
 	"strings"
 
@@ -19,7 +21,7 @@ import (
 */
 
 var reHasKVSPlayer = regexp.MustCompile(`<script [^>]*?src="https://.+?/kt_player\.js\?v=(?P<ver>(?P<maj_ver>\d+)(\.\d+)+)".*?>`)
-var reFlashVars = regexp.MustCompile(`var\s+flashvars\s*=\s*\{[^}]*?\}`)
+var reFlashVars = regexp.MustCompile(`var\s+(?:flashvars|[\w]{11})\s*=[\s\S]*?};`)
 var reFlashVarsValues = regexp.MustCompile(`(\w+): ['"](.*?)['"],`)
 var reTitle = regexp.MustCompile(`<link href="https?://[^"]+/(.+?)/?" rel="canonical"\s*/?>`)
 
@@ -56,7 +58,7 @@ func ExtractFromHTML(htmlString *string) ([]*static.Data, error) {
 	}
 
 	switch matchedKVSPlayer[0][2] {
-	case "4", "5", "9", "11":
+	case "4", "5", "9", "11", "15":
 		break
 	default:
 		fmt.Printf("Untested major version (%s) in player engine--Download may fail.", matchedKVSPlayer[0][2])
@@ -202,7 +204,12 @@ func getLicenseToken(license string) string {
 }
 
 func parseFlashVars(htmlString *string) (map[string]string, error) {
-	htmlFlashvars := reFlashVars.FindString(*htmlString)
+	matchedHtmlFlashvars := reFlashVars.FindAllString(*htmlString, -1)
+	slices.SortFunc(matchedHtmlFlashvars, func(a, b string) int {
+		return cmp.Compare(len(a), len(b))
+	})
+	slices.Reverse(matchedHtmlFlashvars)
+	htmlFlashvars := matchedHtmlFlashvars[0]
 	if htmlFlashvars == "" {
 		return nil, static.ErrDataSourceParseFailed
 	}
diff --git a/extractors/universal/universal_test.go b/extractors/universal/universal_test.go
index d5e1d31..9d0cd1c 100755
--- a/extractors/universal/universal_test.go
+++ b/extractors/universal/universal_test.go
@@ -20,15 +20,6 @@ func TestExtract(t *testing.T) {
 				Size:    384586,
 			},
 		},
-		{
-			Name: "awwni",
-			Args: test.Args{
-				URL:     "http://cdn.awwni.me/16c8v.jpg",
-				Title:   "16c8v",
-				Quality: "",
-				Size:    102169,
-			},
-		},
 		{
 			Name: "with bloat after ext",
 			Args: test.Args{