iqiyi bug fix

GetDanMu.py

@@ -3,7 +3,7 @@
 '''
 # 作者: weimo
 # 创建日期: 2020-01-04 19:14:39
-# 上次编辑时间       : 2020-01-16 20:15:52
+# 上次编辑时间       : 2020-02-07 19:10:02
 # 一个人的命运啊,当然要靠自我奋斗,但是...
 '''
 
@@ -15,8 +15,11 @@ from sites.qq import main as qq
 from sites.iqiyi import main as iqiyi
 from sites.youku import main as youku
 from sites.sohu import main as sohu
+from sites.mgtv import main as mgtv
 from pfunc.cfunc import check_url_site
 
+from basic.vars import ALLOW_SITES
+
 # -------------------------------------------
 # 基本流程
 # 1. 根据传入参数确定网站，否则请求输入有关参数或链接。并初始化字幕的基本信息。
@@ -31,8 +34,9 @@ def main():
     parser = ArgumentParser(description="视频网站弹幕转换/下载工具，项目地址https://github.com/xhlove/GetDanMu，任何问题请联系vvtoolbox.dev@gmail.com")
     parser.add_argument("-f", "--font", default="微软雅黑", help="指定输出字幕字体")
     parser.add_argument("-fs", "--font-size", default=28, help="指定输出字幕字体大小")
-    parser.add_argument("-s", "--site", default="", help="指定网站")
-    parser.add_argument("-cid", "--cid", default="", help="下载cid对应视频的弹幕（腾讯视频合集）")
+    parser.add_argument("-s", "--site", default="", help=f"使用非url方式下载需指定网站 支持的网站 -> {' '.join(ALLOW_SITES)}")
+    parser.add_argument("-r", "--range", default="0,720", help="指定弹幕的纵向范围 默认0到720 请用逗号隔开")
+    parser.add_argument("-cid", "--cid", default="", help="下载cid对应视频的弹幕（腾讯 芒果视频合集）")
     parser.add_argument("-vid", "--vid", default="", help="下载vid对应视频的弹幕，支持同时多个vid，需要用逗号隔开")
     parser.add_argument("-aid", "--aid", default="", help="下载aid对应视频的弹幕（爱奇艺合集）")
     parser.add_argument("-tvid", "--tvid", default="", help="下载tvid对应视频的弹幕，支持同时多个tvid，需要用逗号隔开")
@@ -68,6 +72,8 @@ def main():
         subtitles = youku(args)
     if args.site == "sohu":
         subtitles = sohu(args)
+    if args.site == "mgtv":
+        subtitles = mgtv(args)
 
 if __name__ == "__main__":
     # 打包 --> pyinstaller GetDanMu.spec

README.md

@@ -5,12 +5,56 @@
 项目主页：https://github.com/xhlove/GetDanMu
 
 ## 网站支持
-| Site | URL | 单集? | 合集? | 综艺合集? |
-| :--: | :-- | :-----: | :-----: | :-----: |
+| Site | URL | 单集? | 合集? | 综艺合集? | 支持series? |
+| :--: | :-- | :-----: | :-----: | :-----: | :-----: |
 | **腾讯视频** | <https://v.qq.com/>    |✓|✓| |
-| **爱奇艺** | <https://www.iqiyi.com/>    |✓|✓|✓|
-| **优酷** | <https://v.youku.com/>    |✓|✓|✓|
-| **搜狐视频** | <https://tv.sohu.com/>    |✓|✓||
+| **爱奇艺** | <https://www.iqiyi.com/>    |✓|✓|✓|✓|
+| **优酷** | <https://v.youku.com/>    |✓|✓|✓|✓|
+| **搜狐视频** | <https://tv.sohu.com/>    |✓|✓|||
+| **芒果TV** | <https://www.mgtv.com/>    |✓|✓|✓|✓|
+
+# 使用示例
+- 命令（建议）
+
+> GetDanMu.exe -s mgtv -r 20,960 -series -u https://www.mgtv.com/b/334727/7452407.html
+
+- 双击运行
+> 提示逻辑有待完善
+
+- 选项说明
+>     -f或--font 指定输出字幕字体，默认微软雅黑
+>     -fs或--font-size 指定输出字幕字体大小，默认28
+>     -s或--site 使用非url方式下载需指定网站 支持的网站 -> qq iqiyi youku sohu mgtv
+>     -r或--range 指定弹幕的纵向范围 默认0到720，请用逗号隔开
+>     -cid或--cid 下载cid对应视频的弹幕（腾讯 芒果视频合集）
+>     -vid或--vid 下载vid对应视频的弹幕，支持同时多个vid，需要用逗号隔开
+>     -aid或--aid 下载aid对应视频的弹幕（爱奇艺合集）
+>     -tvid或--tvid 下载tvid对应视频的弹幕，支持同时多个tvid，需要用逗号隔开
+>     -series或--series 尝试通过单集得到合集的全部弹幕 默认不使用
+>     -u或--url 下载视频链接所指向视频的弹幕
+>     -y或--y 覆盖原有弹幕而不提示 默认不使用
+
+
+- 字体配置文件（可选）
+新建名为`config.json`的文件，内容形式如下：
+```json
+{
+    "fonts_base_folder": "C:/Windows/Fonts",
+    "fonts": {
+        "微软雅黑":"msyh.ttc",
+        "微软雅黑粗体":"msyhbd.ttc",
+        "微软雅黑细体":"msyhl.ttc"
+    }
+}
+```
+
+# 效果示意（字幕与视频不相关）
+![potplayer截屏](http://puui.qpic.cn/vshpic/0/5TLOX3WbgjudEj61IxYZ4tAuf2lFwl-ynf4S5T4sXkdjS9cd_0/0)
+[查看使用演示视频点我][2]
+
+注意有背景音乐
+
+演示是直接使用的python命令，使用exe的话把python GetDanMu.py换成GetDanMu.exe即可
 
 ## 可能存在的问题
 - 下载进度接近100%时暂时没有反应
@@ -22,6 +66,20 @@
 
 # 更新日志
 
+## 2020/2/8
+- 爱奇艺bug修复
+
+## 2020/2/7
+- 完善说明
+- 爱奇艺支持series选项，并完善地区判断
+- 增加字体配置文件，建立字体名称与实际字体文件的映射关系，用于预先设定，方便更准确计算弹幕的分布
+- 增加自定义弹幕区间选项，即-r或--range命令
+- README完善
+
+## 2020/1/28
+- 增加芒果TV的支持（支持综艺合集、支持series命令）
+- 爱奇艺bug修复
+
 ## 2020/1/16
 - 增加搜狐视频的支持（剧集）
 - 改进输入提示（双击运行时）
@@ -38,4 +96,8 @@
 - 增加了通过链接下载爱奇艺视频弹幕的方法，支持综艺合集。
 - 增加通过链接判断网站
 
-  [1]: https://blog.weimo.info/archives/431/
+[赞助点此][3]
+
+  [1]: https://blog.weimo.info/archives/431/
+  [2]: https://alime-customer-upload-cn-hangzhou.oss-cn-hangzhou.aliyuncs.com/customer-upload/1581073011183_8t14dpgg2bdc.mp4
+  [3]: https://afdian.net/@vvtoolbox_dev

basic/ass.py

@@ -3,15 +3,14 @@
 '''
 # 作者: weimo
 # 创建日期: 2020-01-04 19:14:46
-# 上次编辑时间       : 2020-01-11 17:20:21
+# 上次编辑时间       : 2020-02-07 19:21:19
 # 一个人的命运啊,当然要靠自我奋斗,但是...
 '''
 
 import os
-
+import json
 from basic.vars import fonts
 
-
 ass_script = """[Script Info]
 ; Script generated by N
 ScriptType: v4.00+
@@ -30,15 +29,30 @@ ass_events_head = """[Events]\nFormat: Layer, Start, End, Style, Name, MarginL,
 # 基于当前时间范围，在0~1000ms之间停留在(676.571,506.629)处，在1000~3000ms内从位置1300,600移动到360,600（原点在左上）
 # ass_baseline = """Dialogue: 0,0:20:08.00,0:20:28.00,Default,,0,0,0,,{\t(1000,3000,\move(1300,600,360,600))\pos(676.571,506.629)}这是字幕内容示意"""
 
+def get_fonts_info():
+    global fonts
+    fonts_path = r"C:\Windows\Fonts"
+    if os.path.exists("config.json"):
+        with open("config.json", "r", encoding="utf-8") as f:
+            fr = f.read()
+        try:
+            config = json.loads(fr)
+        except Exception as e:
+            print("get_fonts_info error info ->", e)
+        else:
+            fonts_path = config["fonts_base_folder"]
+            fonts = config["fonts"]
+    return fonts_path, fonts
+
 def get_ass_head(font_style_name, font_size):
     ass_head = ass_script + "\n\n" + ass_style_head + "\n" + ass_style_base.format(font=font_style_name, font_size=font_size) + "\n\n" + ass_events_head
     return ass_head
 
 def check_font(font):
-    win_font_path = r"C:\Windows\Fonts"
-    maybe_font_path = os.path.join(win_font_path, font)
+    fonts_path, fonts = get_fonts_info()
+    maybe_font_path = os.path.join(fonts_path, font)
     font_style_name = "微软雅黑"
-    font_path = os.path.join(win_font_path, fonts[font_style_name]) # 默认
+    font_path = os.path.join(fonts_path, fonts[font_style_name]) # 默认
     if os.path.exists(font):
         # 字体就在当前文件夹 或 完整路径
         if os.path.isfile(font):
@@ -58,7 +72,7 @@ def check_font(font):
             pass
     elif fonts.get(font):
         # 别名映射
-        font_path = os.path.join(win_font_path, fonts.get(font))
+        font_path = os.path.join(fonts_path, fonts.get(font))
         font_style_name = font
     else:
         pass

basic/vars.py

@@ -3,11 +3,11 @@
 '''
 # 作者: weimo
 # 创建日期: 2020-01-04 19:14:35
-# 上次编辑时间       : 2020-01-16 19:10:06
+# 上次编辑时间       : 2020-02-07 17:57:05
 # 一个人的命运啊,当然要靠自我奋斗,但是...
 '''
 
-ALLOW_SITES = ["qq", "iqiyi", "youku", "sohu"]
+ALLOW_SITES = ["qq", "iqiyi", "youku", "sohu", "mgtv"]
 
 qqlive = {
     "User-Agent":"qqlive"

config.json

@@ -0,0 +1,8 @@
+{
+    "fonts_base_folder": "C:/Windows/Fonts",
+    "fonts": {
+        "微软雅黑":"msyh.ttc",
+        "微软雅黑粗体":"msyhbd.ttc",
+        "微软雅黑细体":"msyhl.ttc"
+    }
+}

methods/sameheight.py

@@ -3,7 +3,7 @@
 '''
 # 作者: weimo
 # 创建日期: 2020-01-04 19:14:47
-# 上次编辑时间: 2020-01-05 14:46:51
+# 上次编辑时间       : 2020-02-07 18:40:42
 # 一个人的命运啊,当然要靠自我奋斗,但是...
 '''
 
@@ -14,10 +14,10 @@ class SameHeight(object):
     '''
     # 等高弹幕 --> 矩形分割问题？
     '''
-    def __init__(self, text, font_path="msyh.ttc", font_size=14):
+    def __init__(self, text, ass_range: str, font_path="msyh.ttc", font_size=14):
         self.font = truetype(font=font_path, size=font_size)
         self.width, self.height = self.get_danmu_size(text)
-        self.height_range = [0, 720]
+        self.height_range = [int(n.strip()) for n in ass_range.split(",")]
         self.width_range = [0, 1920]
         self.lines_start_y = list(range(*(self.height_range + [self.height])))
         self.lines_width_used = [[y, 0] for y in self.lines_start_y]
@@ -49,7 +49,7 @@ class SameHeight(object):
 def main():
     text = "测试"
     show_time = 13
-    sh = SameHeight(text)
+    sh = SameHeight(text, "0,720")
     sh.get_xy(text, show_time)
     
 

pfunc/dump_to_ass.py

@@ -3,7 +3,7 @@
 '''
 # 作者: weimo
 # 创建日期: 2020-01-04 19:17:44
-# 上次编辑时间       : 2020-01-16 20:06:23
+# 上次编辑时间       : 2020-02-07 18:17:48
 # 一个人的命运啊,当然要靠自我奋斗,但是...
 '''
 import os
@@ -17,7 +17,7 @@ def write_one_video_subtitles(file_path, comments, args):
     # 对于合集则每次都都得检查一次 也可以放在上一级 放在这里 考虑后面可能特殊指定字体的情况
     font_path, font_style_name = check_font(args.font)
     ass_head = get_ass_head(font_style_name, args.font_size)
-    get_xy_obj = SameHeight("那就写这一句作为初始化测试吧！", font_path=font_path, font_size=int(args.font_size))
+    get_xy_obj = SameHeight("那就写这一句作为初始化测试吧！", args.range, font_path=font_path, font_size=int(args.font_size))
     subtitle = ASS(file_path, get_xy_obj, font=font_style_name)
     comments = remove_same_danmu(comments)
     for comment in comments:

pfunc/request_info.py

@@ -3,7 +3,7 @@
 '''
 # 作者: weimo
 # 创建日期: 2020-01-04 19:14:43
-# 上次编辑时间       : 2020-01-16 19:44:55
+# 上次编辑时间       : 2020-02-08 21:37:26
 # 一个人的命运啊,当然要靠自我奋斗,但是...
 '''
 import re
@@ -101,7 +101,7 @@ def get_vinfos(aid, locale="zh_cn"):
     except Exception as e:
         print("get_vinfos load vlist error info -->", e)
         return None
-    vinfos = [[v["shortTitle"] + "_" + str(v["timeLength"]), v["timeLength"], ["id"]] for v in vlist]
+    vinfos = [[v["shortTitle"] + "_" + str(v["timeLength"]), v["timeLength"], v["id"]] for v in vlist]
     return vinfos
 
 def matchit(patterns, text):
@@ -113,7 +113,7 @@ def matchit(patterns, text):
             break
     return ret
 
-def duration_to_sec(duration):
+def duration_to_sec(duration: str):
     return sum(x * int(t) for x, t in zip([3600, 60, 1][2 - duration.count(":"):], duration.split(":")))
 
 def get_year_range(aid, locale="zh_cn"):
@@ -134,7 +134,7 @@ def get_year_range(aid, locale="zh_cn"):
         year_end = int(data["latestVideo"]["period"][:4])
     return list(range(year_start, year_end + 1))
 
-def get_vinfo_by_tvid(tvid, locale="zh_cn"):
+def get_vinfo_by_tvid(tvid, locale="zh_cn", isall=False):
     api_url = "https://pcw-api.iqiyi.com/video/video/baseinfo/{}".format(tvid)
     if locale != "zh_cn":
         api_url += "?locale=" + locale
@@ -146,9 +146,32 @@ def get_vinfo_by_tvid(tvid, locale="zh_cn"):
     data = json.loads(r)["data"]
     if data.__class__ != dict:
         return None
+    if isall:
+        aid = data.get("albumId")
+        if aid is None:
+            print("通过单集tvid获取合集aid失败，将只下载单集的弹幕")
+        locale = check_video_area_by_tvid(tvid)
+        if locale is None:
+            locale = "zh_cn"
+        return get_vinfos(aid, locale=locale)
     name = data["name"]
     duration = data["durationSec"]
-    return [name + "_" + str(duration), duration, tvid]
+    return [[name + "_" + str(duration), duration, tvid]]
+
+def check_video_area_by_tvid(tvid):
+    api_url = "https://pcw-api.iqiyi.com/video/video/playervideoinfo?tvid={}".format(tvid)
+    try:
+        r = requests.get(api_url, headers=chrome, timeout=5).content.decode("utf-8")
+    except Exception as e:
+        print("check_video_area_by_tvid error info -->", e)
+        return None
+    data = json.loads(r)["data"]
+    intl_flag = data["operation_base"]["is_international"]
+    langs = [item["language"].lower() for item in data["operation_language_base"]]
+    locale = "zh_cn"
+    if intl_flag is False and "zh_tw" in langs:
+        locale = "zh_tw"
+    return locale
 
 def get_vinfos_by_year(aid, years: list, cid=6, locale="zh_cn"):
     api_url = "https://pcw-api.iqiyi.com/album/source/svlistinfo?cid={}&sourceid={}&timelist={}".format(cid, aid, ",".join([str(_) for _ in years.copy()]))
@@ -171,7 +194,7 @@ def get_vinfos_by_year(aid, years: list, cid=6, locale="zh_cn"):
             vinfos.append([ep["shortTitle"] + "_" + str(sec), sec, ep["tvId"]])
     return vinfos
 
-def get_vinfos_by_url(url):
+def get_vinfos_by_url(url, isall=False):
     locale = check_url_locale(url)
     patterns = [".+?/w_(\w+?).html", ".+?/v_(\w+?).html", ".+?/a_(\w+?).html", ".+?/lib/m_(\w+?).html"]
     isw, isep, isas, isms = [re.match(pattern, url) for pattern in patterns]
@@ -204,7 +227,7 @@ def get_vinfos_by_url(url):
     if isep or isw:
         if tvid is None:
             return
-        return get_vinfo_by_tvid(tvid, locale=locale)
+        return get_vinfo_by_tvid(tvid, locale=locale, isall=isall)
 
     if isas or isms:
         if aid is None:

sites/iqiyi.py

@@ -3,7 +3,7 @@
 '''
 # 作者: weimo
 # 创建日期: 2020-01-04 19:14:41
-# 上次编辑时间       : 2020-01-16 19:58:51
+# 上次编辑时间       : 2020-02-08 21:37:36
 # 一个人的命运啊,当然要靠自我奋斗,但是...
 '''
 
@@ -66,8 +66,11 @@ def get_danmu_by_tvid(name, duration, tvid):
 
 def main(args):
     vinfos = []
+    isall = False
+    if args.series:
+        isall = True
     if args.tvid:
-        vi = get_vinfo_by_tvid(args.tvid)
+        vi = get_vinfo_by_tvid(args.tvid, isall=isall)
         if vi:
             vinfos.append(vi)
     if args.aid:
@@ -77,7 +80,7 @@ def main(args):
     if args.tvid == "" and args.aid == "" and args.url == "":
         args.url = input("请输入iqiyi链接：\n")
     if args.url:
-        vi = get_vinfos_by_url(args.url)
+        vi = get_vinfos_by_url(args.url, isall=isall)
         if vi:
             vinfos += vi
     subtitles = {}

sites/mgtv.py

@@ -0,0 +1,206 @@
+#!/usr/bin/env python3.7
+# coding=utf-8
+'''
+# 作者: weimo
+# 创建日期: 2020-01-28 15:55:22
+# 上次编辑时间       : 2020-02-07 18:32:05
+# 一个人的命运啊,当然要靠自我奋斗,但是...
+'''
+import re
+import json
+import time
+import base64
+import requests
+from uuid import uuid4
+from collections import OrderedDict
+
+from basic.vars import chrome
+from pfunc.request_info import duration_to_sec
+from pfunc.dump_to_ass import check_file, write_one_video_subtitles
+
+pno_params = {
+    "pad":"1121",
+    "ipad":"1030"
+}
+type_params = {
+    "h5flash":"h5flash",
+    "padh5":"padh5",
+    "pch5":"pch5"
+}
+
+def get_danmu_by_vid(vid: str, cid: str, duration: int):
+    api_url = "https://galaxy.bz.mgtv.com/rdbarrage"
+    params = OrderedDict({
+        "version": "2.0.0",
+        "vid": vid,
+        "abroad": "0",
+        "pid": "",
+        "os": "",
+        "uuid": "",
+        "deviceid": "",
+        "cid": cid,
+        "ticket": "",
+        "time": "0",
+        "mac": "",
+        "platform": "0",
+        "callback": ""
+    })
+    comments = []
+    index = 0
+    max_index = duration // 60 + 1
+    while index < max_index:
+        params["time"] = str(index * 60 * 1000)
+        try:
+            r = requests.get(api_url, params=params, headers=chrome, timeout=3).content.decode("utf-8")
+        except Exception as e:
+            continue
+        items = json.loads(r)["data"]["items"]
+        index += 1
+        if items is None:
+            continue
+        for item in items:
+            comments.append([item["content"], ["ffffff"], int(item["time"] / 1000)])
+        print("已下载{:.2f}%".format(index / max_index * 100))
+    return comments
+
+def get_tk2(did):
+    pno = pno_params["ipad"]
+    ts = str(int(time.time()))
+    text = f"did={did}|pno={pno}|ver=0.3.0301|clit={ts}"
+    tk2 = base64.b64encode(text.encode("utf-8")).decode("utf-8").replace("+", "_").replace("/", "~").replace("=", "-")
+    return tk2[::-1]
+
+def get_vinfos_by_cid_or_vid(xid: str, flag="vid"):
+    api_url = "https://pcweb.api.mgtv.com/episode/list"
+    params = {
+        "video_id": xid,
+        "page": "0",
+        "size": "25",
+        "cxid": "",
+        "version": "5.5.35",
+        "callback": "",
+        "_support": "10000000",
+        "_": str(int(time.time() * 1000))
+    }
+    if flag == "cid":
+        _ = params.pop("video_id")
+        params["collection_id"] = xid
+    page = 1
+    vinfos = []
+    while True:
+        params["page"] = page
+        try:
+            r = requests.get(api_url, params=params, headers=chrome, timeout=3).content.decode("utf-8")
+        except Exception as e:
+            continue
+        data = json.loads(r)["data"]
+        for ep in data["list"]:
+            if re.match("\d\d\d\d-\d\d-\d\d", ep["t4"]):
+                # 综艺的加上日期
+                name = "{t4}_{t3}_{t2}".format(**ep).replace(" ", "")
+            else:
+                name = "{t3}_{t2}".format(**ep).replace(" ", "")
+            duration = duration_to_sec(ep["time"])
+            vinfos.append([name, duration, ep["video_id"], ep["clip_id"]])
+        if page < data["count"] // 25 + 1:
+            page += 1
+        else:
+            break
+    return vinfos
+
+def get_vinfo_by_vid(vid: str):
+    api_url = "https://pcweb.api.mgtv.com/player/video"
+    type_ = type_params["pch5"]
+    did = uuid4().__str__()
+    suuid = uuid4().__str__()
+    params = OrderedDict({
+        "did": did,
+        "suuid": suuid,
+        "cxid": "",
+        "tk2": get_tk2(did),
+        "video_id": vid,
+        "type": type_,
+        "_support": "10000000",
+        "auth_mode": "1",
+        "callback": ""
+    })
+    try:
+        r = requests.get(api_url, params=params, headers=chrome, timeout=3).content.decode("utf-8")
+    except Exception as e:
+        return
+    info = json.loads(r)["data"]["info"]
+    name = "{title}_{series}_{desc}".format(**info).replace(" ", "")
+    duration = int(info["duration"])
+    cid = info["collection_id"]
+    return [name, duration, vid, cid]
+
+def get_vinfos_by_url(url: str, isall: bool):
+    vinfos = []
+    # url = https://www.mgtv.com/b/323323/4458375.html
+    ids = re.match("[\s\S]+?mgtv.com/b/(\d+)/(\d+)\.html", url)
+    # url = "https://www.mgtv.com/h/333999.html?fpa=se"
+    cid_v1 = re.match("[\s\S]+?mgtv.com/h/(\d+)\.html", url)
+    # url = "https://m.mgtv.com/h/333999/0.html"
+    cid_v2 = re.match("[\s\S]+?mgtv.com/h/(\d+)/\d\.html", url)
+    if ids is None and cid_v1 is None and cid_v2 is None:
+        return
+    if ids and ids.groups().__len__() == 2:
+        cid, vid = ids.groups()
+        if isall:
+            vi = get_vinfos_by_cid_or_vid(vid)
+            if vi:
+                vinfos += vi
+        else:
+            vinfo = get_vinfo_by_vid(vid)
+            if vinfo is None:
+                return
+            vinfos.append(vinfo)
+    if cid_v1 or cid_v2:
+        if cid_v2 is None:
+            cid = cid_v1.group(1)
+        else:
+            cid = cid_v2.group(1)
+        vi = get_vinfos_by_cid_or_vid(cid, flag="cid")
+        if vi:
+            vinfos += vi
+    return vinfos
+
+def main(args):
+    vinfos = []
+    isall = False
+    if args.series:
+        isall = True
+    if args.url:
+        vi = get_vinfos_by_url(args.url, isall)
+        if vi:
+            vinfos += vi
+    if args.vid:
+        if isall:
+            vi = get_vinfos_by_cid_or_vid(args.vid)
+            if vi:
+                vinfos += vi
+        else:
+            vi = get_vinfo_by_vid(args.vid)
+            if vi:
+                vinfos.append(vi)
+    if args.cid:
+        vi = get_vinfos_by_cid_or_vid(args.cid)
+        if vi:
+            vinfos += vi
+    subtitles = {}
+    for name, duration, vid, cid in vinfos:
+        print(name, "开始下载...")
+        flag, file_path = check_file(name, args)
+        if flag is False:
+            print("跳过{}".format(name))
+            continue
+        comments = get_danmu_by_vid(vid, cid, duration)
+        write_one_video_subtitles(file_path, comments, args)
+        subtitles.update({file_path:comments})
+        print(name, "下载完成！")
+    return subtitles
+
+if __name__ == "__main__":
+    args = object()
+    args.url = "https://www.mgtv.com/h/333999.html?fpa=se"
+    main(args)

sites/sohu.py

@@ -3,7 +3,7 @@
 '''
 # 作者: weimo
 # 创建日期: 2020-01-16 17:45:35
-# 上次编辑时间       : 2020-01-16 20:09:22
+# 上次编辑时间       : 2020-02-07 18:43:55
 # 一个人的命运啊,当然要靠自我奋斗,但是...
 '''
 import json
@@ -99,7 +99,7 @@ def get_vinfos(aid: str):
     try:
         r = requests.get(api_url, params=params, headers=chrome, timeout=3).content.decode("gbk")
     except Exception as e:
-        print("get sohu (vid -> {}) videolist failed.".format(vid))
+        print("get sohu (aid -> {}) videolist failed.".format(aid))
         return None
     data = json.loads(r)
     if data.get("videos"):