Skip to content

Commit

Permalink
Merge pull request #62 from lifegpc/dev
Browse files Browse the repository at this point in the history
v1.3.9 dev
  • Loading branch information
lifegpc authored Feb 20, 2021
2 parents c4ea9a6 + 786be39 commit 6d3107c
Show file tree
Hide file tree
Showing 43 changed files with 1,346 additions and 91 deletions.
28 changes: 28 additions & 0 deletions JSONParser.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,30 @@ def Myparser(s) :
if 'ssList' in obj:
return -1
data={}
if 'activityKey' in obj and obj['activityKey'] == '2021bnj':
vinfo = obj['videoInfo']
data['aid'] = vinfo['aid']
data['bvid'] = vinfo['bvid']
data['videos'] = len(vinfo['pages'])
data['title'] = vinfo['title']
data['pubdate'] = vinfo['pubdate']
data['ctime'] = data['pubdate']
data['desc'] = vinfo['desc']
data['uid'] = vinfo['upMid']
data['name'] = vinfo['upName']
data['videoStaffs'] = obj["videoStaffs"]
page = []
for i in vinfo['pages']:
for i in vinfo['pages'] :
t = {}
t['cid'] = i['cid']
t['page'] = i['page']
t['part'] = i['part']
t['duration'] = i['duration']
page.append(t)
data['page'] = page
data['tags'] = []
return data
data['aid']=obj['aid']
data['bvid']=obj['videoData']['bvid']
data['videos']=obj['videoData']['videos']
Expand All @@ -40,6 +64,9 @@ def Myparser(s) :
data['uid']=obj['videoData']['owner']['mid']
data['name']=obj['videoData']['owner']['name']
data['pic']=obj['videoData']['pic']
if 'upData' in obj:
if 'face' in obj['upData']:
data['upFace'] = obj['upData']['face']
page=[]
for i in obj['videoData']['pages'] :
t={}
Expand Down Expand Up @@ -181,6 +208,7 @@ def getDefalutSettings():
t['ma'] = True
t['auf'] = True
t['ol'] = True
t['cc'] = True
return t


Expand Down
14 changes: 14 additions & 0 deletions Language/.tx/config
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,13 @@ source_file = bili.biliLogin.pot
source_lang = en
type = PO

[bili.bilibilischemepot]
file_filter = bili.bilischeme.<lang>.po
minimum_perc = 0
source_file = bili.bilischeme.pot
source_lang = en
type = PO

[bili.bilibilisubpot]
file_filter = bili.biliSub.<lang>.po
minimum_perc = 0
Expand Down Expand Up @@ -57,6 +64,13 @@ source_file = bili.filter.pot
source_lang = en
type = PO

[bili.biliinnosetuppot]
file_filter = bili.innosetup.<lang>.po
minimum_perc = 0
source_file = bili.innosetup.pot
source_lang = en
type = PO

[bili.bilijsonparser2pot]
file_filter = bili.JSONParser2.<lang>.po
minimum_perc = 0
Expand Down
6 changes: 3 additions & 3 deletions Language/bili.PrintInfo.ja.po
Original file line number Diff line number Diff line change
Expand Up @@ -262,12 +262,12 @@ msgstr "アルバムお気に入り数: "

msgctxt "O61"
msgid "AM number: "
msgstr ""
msgstr "AM 番号: "

msgctxt "O62"
msgid "Collection ID: "
msgstr ""
msgstr "コレクション ID: "

msgctxt "O63"
msgid "Song list: "
msgstr ""
msgstr "楽曲リスト: "
8 changes: 6 additions & 2 deletions Language/bili.biliLogin.ja.po
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Translators:
# Kum4423, 2020
# Kum4423, 2021
#
msgid ""
msgstr ""
"Project-Id-Version: bili\n"
"POT-Creation-Date: 2020-07-11 06:34:00+0000\n"
"PO-Revision-Date: 2020-07-11 06:57+0000\n"
"Last-Translator: Kum4423, 2020\n"
"Last-Translator: Kum4423, 2021\n"
"Language-Team: Japanese (https://www.transifex.com/lifegpc/teams/111556/ja/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -62,3 +62,7 @@ msgstr "ログイン認証コード認識サービスは一時的にご利用い
msgctxt "ERROR6"
msgid "Service is busy, try to log in using V3 interface."
msgstr "現在、サービスが混雑しています。V3インターフェースを使ってログインしてみてください。"

msgctxt "ERROR7"
msgid "Please press Enter to retry."
msgstr "Enterキーを押してもう一度試してみてください。"
4 changes: 4 additions & 0 deletions Language/bili.biliLogin.pot
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,7 @@ msgstr ""
msgctxt "ERROR6"
msgid "Service is busy, try to log in using V3 interface."
msgstr ""

msgctxt "ERROR7"
msgid "Please press Enter to retry."
msgstr ""
8 changes: 6 additions & 2 deletions Language/bili.biliLogin.zh_CN.po
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Translators:
# 1 q <g1710431395@gmail.com>, 2020
# 1 q <g1710431395@gmail.com>, 2021
#
msgid ""
msgstr ""
"Project-Id-Version: bili\n"
"POT-Creation-Date: 2020-07-11 06:34:00+0000\n"
"PO-Revision-Date: 2020-07-11 06:57+0000\n"
"Last-Translator: 1 q <g1710431395@gmail.com>, 2020\n"
"Last-Translator: 1 q <g1710431395@gmail.com>, 2021\n"
"Language-Team: Chinese (China) (https://www.transifex.com/lifegpc/teams/111556/zh_CN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -62,3 +62,7 @@ msgstr "登录验证码识别服务暂时不可用,请稍后再试。"
msgctxt "ERROR6"
msgid "Service is busy, try to log in using V3 interface."
msgstr "服务繁忙,尝试使用V3接口登录。"

msgctxt "ERROR7"
msgid "Please press Enter to retry."
msgstr "请按回车键重试。"
36 changes: 36 additions & 0 deletions Language/bili.bilischeme.ja.po
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# bili - bilischeme.py Strings
# (C) 2019-2020 lifegpc
# This file is distributed under the same license as the bili package.
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Translators:
# Kum4423, 2020
#
msgid ""
msgstr ""
"Project-Id-Version: bili\n"
"POT-Creation-Date: 2020-07-11 06:34:00+0000\n"
"PO-Revision-Date: 2020-12-19 11:21+0000\n"
"Last-Translator: Kum4423, 2020\n"
"Language-Team: Japanese (https://www.transifex.com/lifegpc/teams/111556/ja/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: ja\n"
"Plural-Forms: nplurals=1; plural=0;\n"

msgctxt "UNSPT"
msgid "This program does not support URI scheme on <platform>."
msgstr "このプログラムは <platform> の URI スキームをサポートしていません。"

msgctxt "REGERR"
msgid "Unable to access HKEY_CLASSES_ROOT."
msgstr "HKEY_CLASSES_ROOTにアクセスできません。"

msgctxt "CNOTDEL"
msgid "Unable to delete the old registry."
msgstr "古いレジストリを削除できません。"

msgctxt "CNOTCRE"
msgid "Unable to create key \"<key>\"."
msgstr "キー \"<key>\" を作成できません。 "
32 changes: 32 additions & 0 deletions Language/bili.bilischeme.pot
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# bili - bilischeme.py Strings
# (C) 2019-2020 lifegpc
# This file is distributed under the same license as the bili package.
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
msgid ""
msgstr ""
"Project-Id-Version: bili\n"
"POT-Creation-Date: 2020-07-11 06:34:00+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: \n"

msgctxt "UNSPT"
msgid "This program does not support URI scheme on <platform>."
msgstr ""

msgctxt "REGERR"
msgid "Unable to access HKEY_CLASSES_ROOT."
msgstr ""

msgctxt "CNOTDEL"
msgid "Unable to delete the old registry."
msgstr ""

msgctxt "CNOTCRE"
msgid "Unable to create key \"<key>\"."
msgstr ""
36 changes: 36 additions & 0 deletions Language/bili.bilischeme.zh_CN.po
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# bili - bilischeme.py Strings
# (C) 2019-2020 lifegpc
# This file is distributed under the same license as the bili package.
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Translators:
# 1 q <g1710431395@gmail.com>, 2020
#
msgid ""
msgstr ""
"Project-Id-Version: bili\n"
"POT-Creation-Date: 2020-07-11 06:34:00+0000\n"
"PO-Revision-Date: 2020-12-19 11:21+0000\n"
"Last-Translator: 1 q <g1710431395@gmail.com>, 2020\n"
"Language-Team: Chinese (China) (https://www.transifex.com/lifegpc/teams/111556/zh_CN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: zh_CN\n"
"Plural-Forms: nplurals=1; plural=0;\n"

msgctxt "UNSPT"
msgid "This program does not support URI scheme on <platform>."
msgstr "此程序不支持在<platform>上的URI scheme。"

msgctxt "REGERR"
msgid "Unable to access HKEY_CLASSES_ROOT."
msgstr "无法访问HKEY_CLASSES_ROOT。"

msgctxt "CNOTDEL"
msgid "Unable to delete the old registry."
msgstr "无法删除旧注册表。"

msgctxt "CNOTCRE"
msgid "Unable to create key \"<key>\"."
msgstr "无法新建项\"<key>\"。"
59 changes: 57 additions & 2 deletions Language/bili.command.ja.po
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Translators:
# Kum4423, 2020
# Kum4423, 2021
#
msgid ""
msgstr ""
"Project-Id-Version: bili\n"
"POT-Creation-Date: 2020-07-12 10:37:00+0000\n"
"PO-Revision-Date: 2020-07-12 11:00+0000\n"
"Last-Translator: Kum4423, 2020\n"
"Last-Translator: Kum4423, 2021\n"
"Language-Team: Japanese (https://www.transifex.com/lifegpc/teams/111556/ja/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -477,3 +477,58 @@ msgstr "最後にダウンロードしたファイルの場所をwindows explore
msgctxt "O89"
msgid "List all available type id(tid) for Favorites or Uploader's videos."
msgstr "お気に入りやアップローダーの動画で利用可能なタイプID(tid)を一覧表示します"

msgctxt "O90"
msgid "Change working directory to script directory."
msgstr "作業ディレクトリをスクリプトディレクトリに変更する。"

msgctxt "O91"
msgid "Get input from bili scheme URI."
msgstr "biliスキームのURIから入力を取得します。"

msgctxt "O92"
msgid ""
"Do not check certificate for HTTPS connection when downloading with aria2c."
msgstr "aria2cでダウンロードする際には、HTTPS接続の証明書をチェックしないようにしてください。"

msgctxt "O93"
msgid "Check certificate for HTTPS connection when downloading with aria2c."
msgstr "aria2cでダウンロードする際には、HTTPS接続の証明書を確認してください。"

msgctxt "O94"
msgid ""
"Generate NFO file. (NFO file store video information that can be used in "
"Plex.)"
msgstr ""

msgctxt "O95"
msgid "Don't generate NFO file."
msgstr ""

msgctxt "O96"
msgid "Choose video quality by format id."
msgstr ""

msgctxt "O97"
msgid ""
"Available format id:\n"
"125: HDR\n"
"120: UHD 4K\n"
"116: HD 1080P60\n"
"112: HD 1080P+\n"
"80: HD 1080P\n"
"74: HD 720P60\n"
"64: HD 720P/HD 720P60\n"
"32: SD 480P\n"
"16: SD 360P"
msgstr ""

msgctxt "O98"
msgid "Available coding format: <codecs>"
msgstr ""

msgctxt "O99"
msgid ""
"If coding format is not specified or cannot be found, the program will use "
"the first one which has same format id."
msgstr ""
40 changes: 40 additions & 0 deletions Language/bili.command.pot
Original file line number Diff line number Diff line change
Expand Up @@ -374,3 +374,43 @@ msgstr ""
msgctxt "O89"
msgid "List all available type id(tid) for Favorites or Uploader's videos."
msgstr ""

msgctxt "O90"
msgid "Change working directory to script directory."
msgstr ""

msgctxt "O91"
msgid "Get input from bili scheme URI."
msgstr ""

msgctxt "O92"
msgid "Do not check certificate for HTTPS connection when downloading with aria2c."
msgstr ""

msgctxt "O93"
msgid "Check certificate for HTTPS connection when downloading with aria2c."
msgstr ""

msgctxt "O94"
msgid "Generate NFO file. (NFO file store video information that can be used in Plex.)"
msgstr ""

msgctxt "O95"
msgid "Don't generate NFO file."
msgstr ""

msgctxt "O96"
msgid "Choose video quality by format id."
msgstr ""

msgctxt "O97"
msgid "Available format id:\n125: HDR\n120: UHD 4K\n116: HD 1080P60\n112: HD 1080P+\n80: HD 1080P\n74: HD 720P60\n64: HD 720P/HD 720P60\n32: SD 480P\n16: SD 360P"
msgstr ""

msgctxt "O98"
msgid "Available coding format: <codecs>"
msgstr ""

msgctxt "O99"
msgid "If coding format is not specified or cannot be found, the program will use the first one which has same format id."
msgstr ""
Loading

0 comments on commit 6d3107c

Please sign in to comment.