uohlhv/danmaku2ass
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #32 from Goshin/master

Browse Source 
Fix potential type error when processing Tudou danmaku.
This commit is contained in:
Star Brilliant 2016-05-09 09:40:27 -05:00
commit 08458c5edf
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
danmaku2ass.py
View File

@ -213,10 +213,10 @@ def ReadCommentsTudou2(f, fontsize):
try: try:
c = str(comment['content']) c = str(comment['content'])
prop = json.loads(str(comment['propertis']) or '{}') prop = json.loads(str(comment['propertis']) or '{}')
size = prop.get('size', 1) size = int(prop.get('size', 1))
assert size in (0, 1, 2) assert size in (0, 1, 2)
size = {0: 0.64, 1: 1, 2: 1.44}[size] * fontsize size = {0: 0.64, 1: 1, 2: 1.44}[size] * fontsize
pos = prop.get('pos', 3) pos = int(prop.get('pos', 3))
assert pos in (0, 3, 4, 6) assert pos in (0, 3, 4, 6)
yield ( yield (
int(comment['playat'] * 0.001), int(comment['createtime'] * 0.001), i, c, int(comment['playat'] * 0.001), int(comment['createtime'] * 0.001), i, c,