修复直播源无法覆盖的问题

e714163e · hjdhnx · 8c890cd6 · e714163e · e714163e · e714163e
隐藏空白更改
内联并排

Showing with 5 addition and 4 deletion

base/custom.conf base/custom.conf +2 -1

js/version.txt js/version.txt +1 -1

utils/files.py utils/files.py +2 -2

未找到文件。
--- a/base/custom.conf
+++ b/base/custom.conf
@@ -14,5 +14,6 @@
            "quickSearch":1,
            "filterable":0
        }
-    ]
+    ],
+    "lives":[{"group":"redirect","channels":[{"name":"我的直播","urls":["proxy://do=live&type=txt&ext=aHR0cHM6Ly9naXRjb2RlLm5ldC9xcV8yNjg5ODIzMS9UVkJveC8tL3Jhdy9tYWluL2xpdmUvemIudHh0"]}]}],
 }
\ No newline at end of file
--- a/js/version.txt
+++ b/js/version.txt
-3.3.0
\ No newline at end of file
+3.3.1
\ No newline at end of file
--- a/utils/files.py
+++ b/utils/files.py
@@ -65,11 +65,11 @@ def custom_merge(original:dict,custom:dict):
    new_keys = custom.keys()
    updateObj = {}
    extend_obj = {}
-    for key in ['wallpaper','spider','homepage']:
+    for key in ['wallpaper','spider','homepage','lives']:
        if key in new_keys:
            updateObj[key] = custom[key]

-    for key in ['drives','sites','flags','lives','ads']:
+    for key in ['drives','sites','flags','ads']:
        if key in new_keys:
            extend_obj[key] = custom[key]