支持youtube

4 files changed, 39 insertions, 63 deletions

diff --git a/bin/conf/sifter/iqiyi_data.sft b/bin/conf/sifter/iqiyi_data.sft
deleted file mode 100644
index fff3ec4..0000000
--- a/bin/conf/sifter/iqiyi_data.sft
+++ /dev/null
@@ -1,12 +0,0 @@
-[INFOR]
-sft_id = 3122
-
-[EXTRACT]
-#[expect_type][expect_name] = extract_location$extract_method$start$mid$end$
-#expect_type and expect_name must be one
-#sifter_method = Tag | RawText | Boundary | Reposition
-#special character : \r\n = 0x0d0x0a, \x30 = no end , \x0 = null
-#expect_name = {1}{MEDIA_ID}, {2}{FRAG_UNIT_ID}, {3}{FRAG_UNIT_ABOFFSET}, {4}{FRAG_UNIT_REOFFSET}, {5}{MEDIA_SIZE}, {6}{MEDIA_NAME}, {7}{MEDIA_CONTENT}
-#extract_location = {61}{C2S_URL}, {0xD1}{S2C_CONTENT-DISPOSITION},{0xE1}{C2S_CONTENT},{0xF1}{S2C_CONTENT}
-{1}{MEDIA_ID}={61}{C2S_URL}$End$\x0$\x0$f4v$
-{4}{FRAG_UNIT_ABOFFSET}={61}{C2S_URL}$Tag$range=$\x0$-$
diff --git a/bin/conf/sifter/sifter.json b/bin/conf/sifter/sifter.json
index c78b10b..07ef58f 100644
--- a/bin/conf/sifter/sifter.json
+++ b/bin/conf/sifter/sifter.json
@@ -5,12 +5,12 @@
     [
 {
            "compile_id": 1,
-           "service": 2221,
-           "action": 2,
+           "service": 5222,
+           "action": 1,
            "do_blacklist": 1,
-           "do_log": 1,
+           "do_log": 0,
            "effective_rage": 0,
-           "user_region": "FRAG_UNIT_ID",
+           "user_region": "MEDIA_ID",
            "is_valid": "yes",
            "groups": [
                 {
@@ -20,7 +20,7 @@
                             "table_name": "SIFTER_START",
                             "table_type": "string",
                             "table_content": {
-                                "keywords": "http://",
+                                "keywords": "/vmind",
                                 "expr_type": "none",
                                 "match_method": "sub",
                                 "format": "uncase plain"
@@ -32,12 +32,12 @@
         },
 {
            "compile_id": 2,
-           "service": 2221,
-           "action": 4,
+           "service": 5222,
+           "action": 2,
            "do_blacklist": 1,
-           "do_log": 2,
+           "do_log": 1,
            "effective_rage": 0,
-           "user_region": "FRAG_UNIT_REOFFSET",
+           "user_region": "FRAG_UNIT_ID",
            "is_valid": "yes",
            "groups": [
                 {
@@ -47,7 +47,7 @@
                             "table_name": "SIFTER_START",
                             "table_type": "string",
                             "table_content": {
-                                "keywords": "&ts_seg_no=",
+                                "keywords": "/vmind",
                                 "expr_type": "none",
                                 "match_method": "sub",
                                 "format": "uncase plain"
@@ -113,12 +113,12 @@
         },
 {
            "compile_id": 5,
-           "service": 3122,
-           "action": 4,
+           "service": 2121,
+           "action": 2,
            "do_blacklist": 4,
            "do_log": 1,
            "effective_rage": 0,
-           "user_region": "FRAG_UNIT_ABOFFSET",
+           "user_region": "FRAG_UNIT_ID",
            "is_valid": "yes",
            "groups": [
                 {
@@ -128,7 +128,7 @@
                             "table_name": "SIFTER_START",
                             "table_type": "string",
                             "table_content": {
-                                "keywords": "range=",
+                                "keywords": "#EXTINF:",
                                 "expr_type": "none",
                                 "match_method": "sub",
                                 "format": "uncase plain"
@@ -140,10 +140,10 @@
         },
 {
            "compile_id": 6,
-           "service": 1122,
+           "service": 2121,
            "action": 4,
-           "do_blacklist": 5,
-           "do_log": 1,
+           "do_blacklist": 4,
+           "do_log": 2,
            "effective_rage": 0,
            "user_region": "FRAG_UNIT_REOFFSET",
            "is_valid": "yes",
@@ -155,7 +155,7 @@
                             "table_name": "SIFTER_START",
                             "table_type": "string",
                             "table_content": {
-                                "keywords": "Frag",
+                                "keywords": "#EXT-X-MEDIA-SEQUENCE:",
                                 "expr_type": "none",
                                 "match_method": "sub",
                                 "format": "uncase plain"
@@ -167,12 +167,12 @@
         },
 {
            "compile_id": 7,
-           "service": 2121,
-           "action": 2,
-           "do_blacklist": 7,
+           "service": 1122,
+           "action": 4,
+           "do_blacklist": 5,
            "do_log": 1,
            "effective_rage": 0,
-           "user_region": "FRAG_UNIT_ID",
+           "user_region": "FRAG_UNIT_REOFFSET",
            "is_valid": "yes",
            "groups": [
                 {
@@ -182,7 +182,7 @@
                             "table_name": "SIFTER_START",
                             "table_type": "string",
                             "table_content": {
-                                "keywords": "#EXTINF:",
+                                "keywords": "Frag",
                                 "expr_type": "none",
                                 "match_method": "sub",
                                 "format": "uncase plain"
@@ -194,12 +194,12 @@
         },
 {
            "compile_id": 8,
-           "service": 2121,
-           "action": 4,
+           "service": 2221,
+           "action": 2,
            "do_blacklist": 7,
-           "do_log": 2,
+           "do_log": 1,
            "effective_rage": 0,
-           "user_region": "FRAG_UNIT_REOFFSET",
+           "user_region": "FRAG_UNIT_ID",
            "is_valid": "yes",
            "groups": [
                 {
@@ -209,7 +209,7 @@
                             "table_name": "SIFTER_START",
                             "table_type": "string",
                             "table_content": {
-                                "keywords": "#EXT-X-MEDIA-SEQUENCE:",
+                                "keywords": "http://",
                                 "expr_type": "none",
                                 "match_method": "sub",
                                 "format": "uncase plain"
@@ -221,12 +221,12 @@
         },
 {
            "compile_id": 9,
-           "service": 5222,
-           "action": 1,
-           "do_blacklist": 8,
-           "do_log": 0,
+           "service": 2221,
+           "action": 4,
+           "do_blacklist": 7,
+           "do_log": 2,
            "effective_rage": 0,
-           "user_region": "MEDIA_ID",
+           "user_region": "FRAG_UNIT_REOFFSET",
            "is_valid": "yes",
            "groups": [
                 {
@@ -236,7 +236,7 @@
                             "table_name": "SIFTER_START",
                             "table_type": "string",
                             "table_content": {
-                                "keywords": "/vmind",
+                                "keywords": "&ts_seg_no=",
                                 "expr_type": "none",
                                 "match_method": "sub",
                                 "format": "uncase plain"
@@ -248,12 +248,12 @@
         },
 {
            "compile_id": 10,
-           "service": 5222,
-           "action": 2,
+           "service": 4122,
+           "action": 3,
            "do_blacklist": 8,
            "do_log": 1,
            "effective_rage": 0,
-           "user_region": "FRAG_UNIT_ID",
+           "user_region": "FRAG_UNIT_ABOFFSET",
            "is_valid": "yes",
            "groups": [
                 {
@@ -263,7 +263,7 @@
                             "table_name": "SIFTER_START",
                             "table_type": "string",
                             "table_content": {
-                                "keywords": "/vmind",
+                                "keywords": "range=",
                                 "expr_type": "none",
                                 "match_method": "sub",
                                 "format": "uncase plain"
diff --git a/bin/conf/sifter/urloffset_data.sft b/bin/conf/sifter/urloffset_data.sft
deleted file mode 100644
index f18b19b..0000000
--- a/bin/conf/sifter/urloffset_data.sft
+++ /dev/null
@@ -1,12 +0,0 @@
-[INFOR]
-sft_id = 3122
-
-[EXTRACT]
-#[expect_type][expect_name] = extract_location$extract_method$start$mid$end$
-#expect_type and expect_name must be one
-#sifter_method = Tag | RawText | Boundary | Reposition
-#special character : \r\n = 0x0d0x0a, \x30 = no end , \x0 = null
-#expect_name = {1}{MEDIA_ID}, {2}{FRAG_UNIT_ID}, {3}{FRAG_UNIT_ABOFFSET}, {4}{FRAG_UNIT_REOFFSET}, {5}{MEDIA_SIZE}, {6}{MEDIA_NAME}, {7}{MEDIA_CONTENT}
-#extract_location = {61}{C2S_URL}, {0xD1}{S2C_CONTENT-DISPOSITION},{0xE1}{C2S_CONTENT},{0xF1}{S2C_CONTENT}
-{1}{MEDIA_ID}={61}{C2S_URL}$End$\x0$\x0$f4v$
-{4}{FRAG_UNIT_REOFFSET}={61}{C2S_URL}$Tag$range=$\x0$-$
diff --git a/bin/conf/sifter/youtube_data.sft b/bin/conf/sifter/youtube_data.sft
index 518173b..ce54327 100644
--- a/bin/conf/sifter/youtube_data.sft
+++ b/bin/conf/sifter/youtube_data.sft
@@ -9,4 +9,4 @@ sft_id = 4122
 #expect_name = {1}{MEDIA_ID}, {2}{FRAG_UNIT_ID}, {3}{FRAG_UNIT_ABOFFSET}, {4}{FRAG_UNIT_REOFFSET}, {5}{MEDIA_SIZE}, {6}{MEDIA_NAME}, {7}{MEDIA_CONTENT}
 #extract_location = {61}{C2S_URL}, {0xD1}{S2C_CONTENT-DISPOSITION},{0xE1}{C2S_CONTENT},{0xF1}{S2C_CONTENT}
 {1}{MEDIA_ID}={61}{C2S_URL}$End$\x0$\x0$range=$
-{4}{FRAG_UNIT_REOFFSET}={61}{C2S_URL}$Tag$range=$\x0$-$
+{3}{FRAG_UNIT_ABOFFSET}={61}{C2S_URL}$Tag$range=$\x0$-$