Merge pull request #21 from lifegpc/dev

v1.2.0 dev

Author: lifegpc

JSONParser.py

@@ -17,6 +17,9 @@
 from os.path import exists
 from os import remove
 from requests import Session
+from biliBv import enbv
+import sys
+from biliTime import tostr2
 def Myparser(s) :
     "解析普通AV视频信息"
     obj=loads(s)
@@ -30,6 +33,7 @@ def Myparser(s) :
     data['desc']=obj['videoData']['desc']
     data['uid']=obj['videoData']['owner']['mid']
     data['name']=obj['videoData']['owner']['name']
+    data['pic']=obj['videoData']['pic']
     page=[]
     for i in obj['videoData']['pages'] :
     	t={}
@@ -54,6 +58,10 @@ def Myparser2(s) :
         mediaInfo['evaluate']=obj['mediaInfo']['evaluate']
         mediaInfo['type']=obj['mediaInfo']['ssTypeFormat']['name']
         mediaInfo['time']=obj['mediaInfo']['pub']['time']
+        t=obj['mediaInfo']['cover']
+        if t.startswith('//'):
+            t="https:"+t
+        mediaInfo['cover']=t
         data['mediaInfo']=mediaInfo
     if 'epList' in obj :
         epList=[]
@@ -67,6 +75,10 @@ def Myparser2(s) :
             t['longTitle']=i['longTitle']
             t['i']=i['i']
             t['loaded']=i['loaded']
+            p=i['cover']
+            if str(p).startswith('//'):
+                p="https:"+p
+            t['cover']=p
             epList.append(t)
         data['epList']=epList
     if 'sections' in obj :
@@ -88,6 +100,10 @@ def Myparser2(s) :
                     t2['i']=j['i']
                     t2['loaded']=j['loaded']
                     t2['title']=i['title']
+                    p=j['cover']
+                    if str(p).startswith('//'):
+                        p="https:"+p
+                    t2['cover']=p
                     epList.append(t2)
                 t['epList']=epList
             sections.append(t)
@@ -153,3 +169,44 @@ def getset(d:dict,key:str) :
         return d[key]
     else :
         return None
+def parseche(d:dict) :
+    "解析下载课程"
+    r={}
+    r['che']=True #标识为下载课程
+    t=d['data']
+    m={}
+    m['id']=t['season_id']
+    m['ssId']=t['season_id']
+    m['title']=t['title']
+    m['jpTitle']=''
+    m['series']=t['title']
+    m['alias']=''
+    m['evaluate']=t['subtitle']
+    m['type']=''
+    m['cover']=t['cover']
+    e=[]
+    b=sys.maxsize #最早的时间
+    for i in t['episodes'] :
+        a={}
+        a['id']=i['id']
+        a['aid']=i['aid']
+        a['bvid']=enbv(int(i['aid']))
+        a['cid']=i['cid']
+        a['titleFormat']=f"P{i['index']}"
+        a['longTitle']=i['title']
+        a['i']=i['index']-1
+        a['time']=i['release_date']
+        if a['time']<b:
+            b=a['time']
+        e.append(a)
+    m['time']=tostr2(b)
+    r['mediaInfo']=m
+    r['epList']=e
+    if 'brief' in t:
+        c=[]
+        for i in t['brief']['img'] :
+            c.append(i['url'])
+        r['brief']=c
+    if 'user_status' in t and 'progress' in t['user_status'] :
+        r['led']=t['user_status']['progress']['last_ep_id']
+    return r

JSONParser2.py

@@ -226,3 +226,33 @@ def getlr3(d:dict,r:dict):
     r['name']=t['name']
     r['sex']=t['sex']
     r['sign']=t['sign']
+def getchel(r:Session) -> list:
+    """获得已购课程列表
+    -1 获取出错"""
+    re=r.get("https://api.bilibili.com/pugv/pay/web/my/paid?ps=10&pn=1")
+    re.encoding='utf8'
+    re=re.json()
+    if re['code']!=0:
+        print(f"{re['code']} {re['message']}")
+        return -1
+    re=re['data']
+    n=re['total']
+    l:list=re['data']
+    i=2
+    while i<=n :
+        bs=True
+        while bs:
+            try :
+                re=r.get(f"https://api.bilibili.com/pugv/pay/web/my/paid?ps=10&pn={i}")
+                bs=False
+            except :
+                print(lan['OUTPUT3'].replace('<number>',str(i)))#获取第%s页失败，正在重试……
+            re.encoding='utf8'
+            re=re.json()
+            if re['code']!=0:
+                print(f"{re['code']} {re['message']}")
+                return -1
+            for j in re['data']['data'] :
+                l.append(j)
+        i=i+1
+    return l

Language/bili.command.ja.po

@@ -39,10 +39,10 @@ msgctxt "O5"
 msgid ""
 "Download method: 1.barrage 2.all barrage from historical records 3.video "
 "4.barrage and video 5.all barrage from historical records and video "
-"6.subtitles only"
+"6.subtitles only 7.cover image only"
 msgstr ""
-"ダウンロード方法。\n"
-"1.弾幕 2.過去の履歴からの全弾幕 3.ビデオ 4.弾幕とビデオ 5.ビデオと過去の履歴からの全弾幕 6.字幕のみ"
+"ダウンロード方法 1.弾幕 2.過去の履歴からの全ての弾幕 3.ビデオ 4.ビデオと弾幕 5.ビデオと過去の履歴からの全ての弾幕 6.字幕のみ "
+"7.カバー画像のみ"
 
 msgctxt "O6"
 msgid "Live record download method: 1.video 2.barrage 3.video and barrage"
@@ -335,3 +335,11 @@ msgid ""
 msgstr ""
 "追伸4。お気に入り、チャンネル、アップロードした動画のリンクを入力すると、 \"-i <input>\" と \"-p <number>\" "
 "のパラメータ以外にも、動画のダウンロード中に他のパラメータが使用されます。"
+
+msgctxt "O60"
+msgid "Keep cover images when deleting useless files after merging."
+msgstr "マージ後に無駄なファイルを削除する際にカバー画像を保持する。"
+
+msgctxt "O61"
+msgid "Do not keep cover images when deleting useless files after merging."
+msgstr "マージ後に無駄なファイルを削除する際にカバー画像を残さないようにする。"

Language/bili.command.pot

@@ -32,7 +32,7 @@ msgid "AV/SS/EP/MD/BV number or link"
 msgstr ""
 
 msgctxt "O5"
-msgid "Download method: 1.barrage 2.all barrage from historical records 3.video 4.barrage and video 5.all barrage from historical records and video 6.subtitles only"
+msgid "Download method: 1.barrage 2.all barrage from historical records 3.video 4.barrage and video 5.all barrage from historical records and video 6.subtitles only 7.cover image only"
 msgstr ""
 
 msgctxt "O6"
@@ -254,3 +254,11 @@ msgstr ""
 msgctxt "O59"
 msgid "PS4. When you input Favorites, Channels, Uploaded Video links, in addition to the \"-i <input>\" and \"-p <number>\" parameters, other parameters will be used while downloading video."
 msgstr ""
+
+msgctxt "O60"
+msgid "Keep cover images when deleting useless files after merging."
+msgstr ""
+
+msgctxt "O61"
+msgid "Do not keep cover images when deleting useless files after merging."
+msgstr ""

Language/bili.command.zh_CN.po

@@ -39,8 +39,8 @@ msgctxt "O5"
 msgid ""
 "Download method: 1.barrage 2.all barrage from historical records 3.video "
 "4.barrage and video 5.all barrage from historical records and video "
-"6.subtitles only"
-msgstr "下载方式：1.当前弹幕 2.全弹幕 3.视频 4.当前弹幕+视频 5.全弹幕+视频 6.仅字幕"
+"6.subtitles only 7.cover image only"
+msgstr "下载方式：1.当前弹幕 2.全弹幕 3.视频 4.当前弹幕+视频 5.全弹幕+视频 6.仅字幕 7.仅封面图片"
 
 msgctxt "O6"
 msgid "Live record download method: 1.video 2.barrage 3.video and barrage"
@@ -314,3 +314,11 @@ msgid ""
 "to the \"-i <input>\" and \"-p <number>\" parameters, other parameters will "
 "be used while downloading video."
 msgstr "注4：当输入收藏夹/频道/投稿链接时，除了\"-i <input>\"和\"-p <number>\"参数外，其他参数会在下载视频时使用"
+
+msgctxt "O60"
+msgid "Keep cover images when deleting useless files after merging."
+msgstr "合并完成后删除无用文件时保留封面图片"
+
+msgctxt "O61"
+msgid "Do not keep cover images when deleting useless files after merging."
+msgstr "合并完成后删除无用文件时删除封面图片"

Language/bili.setsettings.ja.po

@@ -215,3 +215,8 @@ msgid ""
 "Do you want to convert HTML to normal text while writing description of live"
 " record into file metadata?"
 msgstr "ライブレコードの説明文をファイルのメタデータに書きながら、HTMLを通常のテキストに変換したいですか？"
+
+msgctxt "INPUT30"
+msgid ""
+"Do you want to keep cover images when deleting useless files after merging?"
+msgstr "マージ後に無駄なファイルを削除するときにカバー画像を残しておきますか？"

Language/bili.setsettings.pot

@@ -166,3 +166,7 @@ msgstr ""
 msgctxt "INPUT29"
 msgid "Do you want to convert HTML to normal text while writing description of live record into file metadata?"
 msgstr ""
+
+msgctxt "INPUT30"
+msgid "Do you want to keep cover images when deleting useless files after merging?"
+msgstr ""

Language/bili.setsettings.zh_CN.po

@@ -206,3 +206,8 @@ msgid ""
 "Do you want to convert HTML to normal text while writing description of live"
 " record into file metadata?"
 msgstr "直播回放简介写入元数据时是否将HTML转换为普通文本？"
+
+msgctxt "INPUT30"
+msgid ""
+"Do you want to keep cover images when deleting useless files after merging?"
+msgstr "合并完成后删除无用文件时是否保留封面图片？"

Language/bili.start.ja.po

@@ -29,10 +29,10 @@ msgctxt "INPUT1"
 msgid ""
 "Please enter the av/ss/ep/md/bv number (bv number needs start with BV) or "
 "link (Support Favorites, Channels, Uploaded Video and Small Video page from "
-"user page. Also support live records video link.):"
+"user page. Also support live records video and purchased courses' video "
+"link.):"
 msgstr ""
-"動画番号 "
-"av/ss/ep/md/bv（bv番号はBVで始まる必要があります）またはURLリンクを入力してください（ユーザーページからお気に入り、チャンネル、アップロードされたビデオと小さなビデオページをサポートしています。また、ライブレコードの動画リンクにも対応しています。）"
+"av/ss/ep/md/bv番号（bv番号はbvで始まる必要があります）またはリンクを入力してください（ユーザーページからお気に入り、チャンネル、アップロードされたビデオと小さなビデオページをサポートしています。また、ライブ記録動画や購入したコースの動画リンクにも対応しています)"
 
 msgctxt "ERROR1"
 msgid "Please use \"-i <input>\"."
@@ -174,15 +174,17 @@ msgid ""
 "3.download video\n"
 "4.download barrage and video\n"
 "5.download all barrage from historical records and video\n"
-"6.download subtitles only"
+"6.download subtitles only\n"
+"7.download cover image only"
 msgstr ""
-"ダウンロード方法を選択するには \".\" の前に数字を入力してください:\n"
+"ダウンロード方法を選択するには、 \".\" の前に数字を入力してください。\n"
 "1.弾幕をダウンロードする\n"
 "2.過去の履歴から全ての弾幕をダウンロードする（多分、めっちゃ時間かかるで）\n"
 "3.動画をダウンロードする\n"
 "4.動画と弾幕をダウンロードする\n"
 "5.動画と過去の履歴から全ての弾幕をダウンロードする\n"
-"6.字幕のみダウンロードする"
+"6.字幕のみダウンロードする\n"
+"7.カバー画像のみををダウンロードする"
 
 msgctxt "OUTPUT9"
 msgid "Part <number> download complete."
@@ -210,14 +212,16 @@ msgid ""
 "2.download all barrage from historical records (may needs lots of time)\n"
 "3.download video\n"
 "4.download barrage and video\n"
-"5.download all barrage from historical records and video"
+"5.download all barrage from historical records and video\n"
+"7.download cover image only"
 msgstr ""
 "ダウンロード方法を選択するには \".\" の前に数字を入力してください:\n"
 "1.弾幕をダウンロードする\n"
 "2.過去の履歴から全ての弾幕をダウンロードする（多分、めっちゃ時間かかるで）\n"
 "3.動画をダウンロードする\n"
 "4.動画と弾幕をダウンロードする\n"
-"5.動画と過去の履歴から全ての弾幕をダウンロードする"
+"5.動画と過去の履歴から全ての弾幕をダウンロードする\n"
+"7.カバー画像のみダウンロードする"
 
 msgctxt "OUTPUT10"
 msgid "<title> download complete."
@@ -226,3 +230,7 @@ msgstr "<title> ダウンロードが完了しました。 "
 msgctxt "OUTPUT11"
 msgid "Please run \"start.py\"."
 msgstr "\"start.py\" を実行してください。"
+
+msgctxt "OUTPUT12"
+msgid "Try to redirect to \"<link>\"."
+msgstr "\"<link>\" にリダイレクトしてみてください。"

Language/bili.start.pot

@@ -20,7 +20,7 @@ msgid "It is recommended to setup program by runing \"settings.py\" in order to
 msgstr ""
 
 msgctxt "INPUT1"
-msgid "Please enter the av/ss/ep/md/bv number (bv number needs start with BV) or link (Support Favorites, Channels, Uploaded Video and Small Video page from user page. Also support live records video link.):"
+msgid "Please enter the av/ss/ep/md/bv number (bv number needs start with BV) or link (Support Favorites, Channels, Uploaded Video and Small Video page from user page. Also support live records video and purchased courses' video link.):"
 msgstr ""
 
 msgctxt "ERROR1"
@@ -132,7 +132,7 @@ msgid "Do you want download with maximum quality (this will not ask for specific
 msgstr ""
 
 msgctxt "INPUT9"
-msgid "Please input the number before \".\" to choose download method:\n1.download barrage\n2.download all barrage from historical records (may needs lots of time)\n3.download video\n4.download barrage and video\n5.download all barrage from historical records and video\n6.download subtitles only"
+msgid "Please input the number before \".\" to choose download method:\n1.download barrage\n2.download all barrage from historical records (may needs lots of time)\n3.download video\n4.download barrage and video\n5.download all barrage from historical records and video\n6.download subtitles only\n7.download cover image only"
 msgstr ""
 
 msgctxt "OUTPUT9"
@@ -152,7 +152,7 @@ msgid "If you want to download the last viewed \"EP<number>\", please enter \"l\
 msgstr ""
 
 msgctxt "INPUT12"
-msgid "Please input the number before \".\" to choose download method:\n1.download barrage\n2.download all barrage from historical records (may needs lots of time)\n3.download video\n4.download barrage and video\n5.download all barrage from historical records and video"
+msgid "Please input the number before \".\" to choose download method:\n1.download barrage\n2.download all barrage from historical records (may needs lots of time)\n3.download video\n4.download barrage and video\n5.download all barrage from historical records and video\n7.download cover image only"
 msgstr ""
 
 msgctxt "OUTPUT10"
@@ -162,3 +162,7 @@ msgstr ""
 msgctxt "OUTPUT11"
 msgid "Please run \"start.py\"."
 msgstr ""
+
+msgctxt "OUTPUT12"
+msgid "Try to redirect to \"<link>\"."
+msgstr ""