提交 61f26724 编写于 作者: H hjdhnx

修复自定义配置drivers错误

上级 50c2412b
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
{ {
"spider": "{{host}}/files/custom_spider.jar", "spider": "{{host}}/files/custom_spider.jar",
"drives": [{"name":"阿里","password":"43886374072944a2bcc55a0ed129ab48","type":"alidrive"}],
# "lives":[{"group":"redirect","channels":[{"name":"我的直播","urls":["proxy://do=live&type=txt&ext={{host}}/txt/直播.txt"]}]}], # "lives":[{"group":"redirect","channels":[{"name":"我的直播","urls":["proxy://do=live&type=txt&ext={{host}}/txt/直播.txt"]}]}],
"sites":[ "sites":[
{ {
......
...@@ -87,7 +87,9 @@ def custom_merge(original:dict,custom:dict): ...@@ -87,7 +87,9 @@ def custom_merge(original:dict,custom:dict):
original.update(updateObj) original.update(updateObj)
for key in extend_obj.keys(): for key in extend_obj.keys():
if original.get('key') and isinstance(original[key],list): # original[key].extend(extend_obj[key])
# print(key,original.get(key))
if original.get(key) and isinstance(original[key],list):
original[key].extend(extend_obj[key]) original[key].extend(extend_obj[key])
else: else:
original[key] = extend_obj[key] original[key] = extend_obj[key]
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册