Skip to content

Commit caf95da

Browse files
committed
change code style
1 parent ba010aa commit caf95da

10 files changed

+717
-280
lines changed

115.py

Lines changed: 53 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,13 @@
3232
############################################################
3333

3434
# file extensions
35-
mediatype = {".wma", ".wav", ".mp3", ".aac", ".ra", ".ram", ".mp2", ".ogg", ".aif", ".mpega", ".amr", ".mid", ".midi", ".m4a", ".m4v", ".wmv", ".rmvb", ".mpeg4", ".mpeg2", ".flv", ".avi", ".3gp", ".mpga", ".qt", ".rm", ".wmz", ".wmd", ".wvx", ".wmx", ".wm", ".swf", ".mpg", ".mp4", ".mkv", ".mpeg", ".mov", ".mdf", ".iso", ".asf"}
35+
mediatype = {
36+
".wma", ".wav", ".mp3", ".aac", ".ra", ".ram", ".mp2", ".ogg", ".aif",
37+
".mpega", ".amr", ".mid", ".midi", ".m4a", ".m4v", ".wmv", ".rmvb",
38+
".mpeg4", ".mpeg2", ".flv", ".avi", ".3gp", ".mpga", ".qt", ".rm",
39+
".wmz", ".wmd", ".wvx", ".wmx", ".wm", ".swf", ".mpg", ".mp4", ".mkv",
40+
".mpeg", ".mov", ".mdf", ".iso", ".asf"
41+
}
3642

3743
s = '\x1b[%d;%dm%s\x1b[0m' # terminual color template
3844

@@ -121,8 +127,9 @@ def get_ssopw(ssoext):
121127
"goto=http://m.115.com/?ac=home"
122128

123129
theaders = headers
124-
theaders["Referer"] = "http://passport.115.com/static/reg_login_130418/bridge.html?ajax_cb_key=bridge_%s" \
125-
% int(time.time()*1000)
130+
theaders["Referer"] = "http://passport.115.com\
131+
/static/reg_login_130418/bridge.html?ajax_cb_key=bridge_%s" \
132+
% int(time.time()*1000)
126133

127134
# Post!
128135
# XXX : do not handle errors
@@ -190,8 +197,11 @@ def get_infos(self, cid):
190197
j = ss.get(url, params=params).json()
191198
if j['errNo'] == 0 and j['data']:
192199
if args.type_:
193-
j['data'] = [x for x in j['data'] if x.get('ns') \
194-
or x['ico'].lower() == unicode(args.type_.lower())]
200+
j['data'] = [
201+
x for x in j['data'] \
202+
if x.get('ns') \
203+
or x['ico'].lower() == unicode(args.type_.lower())
204+
]
195205

196206
for i in j['data']:
197207
if i.get('ns'):
@@ -202,12 +212,17 @@ def get_infos(self, cid):
202212
dir_loop2.append(item)
203213

204214
if args.play:
205-
j['data'] = [i for i in j['data'] \
206-
if i.get('sha') and os.path.splitext(i['n'])[-1].lower() in mediatype]
215+
j['data'] = [
216+
i for i in j['data'] \
217+
if i.get('sha') \
218+
and os.path.splitext(i['n'])[-1].lower() \
219+
in mediatype
220+
]
207221

208222
total_file = len([i for i in j['data'] if not i.get('ns')])
209223
if args.from_ - 1:
210-
j['data'] = j['data'][args.from_-1:] if args.from_ else j['data']
224+
j['data'] = j['data'][args.from_-1:] if args.from_ \
225+
else j['data']
211226
nn = args.from_
212227
for i in j['data']:
213228
if not i.get('ns'):
@@ -219,8 +234,12 @@ def get_infos(self, cid):
219234
'dir_': os.path.split(t)[0],
220235
'dlink': self.get_dlink(i['pc']),
221236
'name': i['n'].encode('utf8'),
222-
#'purl': self._get_play_purl(i['pc'].encode('utf8')) if args.play and self.is_vip else None,
223-
'purl': self._get_play_purl(i['pc'].encode('utf8')) if args.play else None,
237+
#'purl': self._get_play_purl(
238+
# i['pc'].encode('utf8')) \
239+
# if args.play and self.is_vip else None,
240+
'purl': self._get_play_purl(
241+
i['pc'].encode('utf8')) \
242+
if args.play else None,
224243
'nn': nn,
225244
'total_file': total_file
226245
}
@@ -245,12 +264,17 @@ def download(infos):
245264
num = random.randint(0, 7) % 7
246265
col = s % (2, num + 90, infos['file'])
247266
infos['nn'] = infos['nn'] if infos.get('nn') else 1
248-
infos['total_file'] = infos['total_file'] if infos.get('total_file') else 1
249-
print '\n ++ 正在下载: #', s % (1, 97, infos['nn']), '/', s % (1, 97, infos['total_file']), '#', col
267+
infos['total_file'] = infos['total_file'] \
268+
if infos.get('total_file') else 1
269+
print '\n ++ 正在下载: #', \
270+
s % (1, 97, infos['nn']), \
271+
'/', s % (1, 97, infos['total_file']), \
272+
'#', col
250273

251274
if args.aria2c:
252275
# 115 普通用户只能有4下载通道。
253-
tlimit = ' --max-download-limit %s' % args.limit if args.limit else ''
276+
tlimit = ' --max-download-limit %s' \
277+
% args.limit if args.limit else ''
254278
cmd = 'aria2c -c -s4 -x4%s ' \
255279
'-o "%s.tmp" -d "%s" ' \
256280
'--user-agent "%s" ' \
@@ -262,7 +286,8 @@ def download(infos):
262286
cmd = 'wget -c%s ' \
263287
'-O "%s.tmp" --user-agent "%s" ' \
264288
'--header "Referer:http://m.115.com/" "%s"' \
265-
% (tlimit, infos['file'], headers['User-Agent'], infos['dlink'])
289+
% (tlimit, infos['file'], headers['User-Agent'],
290+
infos['dlink'])
266291

267292
status = os.system(cmd)
268293
if status != 0: # other http-errors, such as 302.
@@ -280,8 +305,12 @@ def play(infos):
280305
num = random.randint(0, 7) % 7
281306
col = s % (2, num + 90, infos['name'])
282307
infos['nn'] = infos['nn'] if infos.get('nn') else 1
283-
infos['total_file'] = infos['total_file'] if infos.get('total_file') else 1
284-
print '\n ++ play: #', s % (1, 97, infos['nn']), '/', s % (1, 97, infos['total_file']), '#', col
308+
infos['total_file'] = infos['total_file'] \
309+
if infos.get('total_file') else 1
310+
print '\n ++ play: #', \
311+
s % (1, 97, infos['nn']), '/', \
312+
s % (1, 97, infos['total_file']), \
313+
'#', col
285314

286315
if not infos['purl']:
287316
print s % (1, 91, ' |-- m3u8 is not ready, using dlink')
@@ -300,9 +329,11 @@ def play(infos):
300329
else:
301330
pass
302331

332+
# TODO
303333
def exists(self, filepath):
304334
pass
305335

336+
# TODO
306337
def upload(self, path, dir_):
307338
pass
308339

@@ -363,7 +394,8 @@ def do(self, pc):
363394
'file': t,
364395
'dir_': os.path.split(t)[0],
365396
'dlink': dlink,
366-
#'purl': self._get_play_purl(pc) if args.play and self.is_vip else None,
397+
#'purl': self._get_play_purl(pc) \
398+
# if args.play and self.is_vip else None,
367399
'purl': self._get_play_purl(pc) if args.play else None,
368400
'name': name,
369401
'nn': 1,
@@ -377,7 +409,8 @@ def main(argv):
377409

378410
######################################################
379411
# for argparse
380-
p = argparse.ArgumentParser(description='download from 115.com reversely')
412+
p = argparse.ArgumentParser(
413+
description='download from 115.com reversely')
381414
p.add_argument('xxx', type=str, nargs='*', \
382415
help='命令对象.')
383416
p.add_argument('-a', '--aria2c', action='store_true', \
@@ -409,7 +442,8 @@ def main(argv):
409442
account = xxx[0]
410443
password = xxx[1]
411444
else:
412-
print s % (1, 91, ' login\n login account\n login account password')
445+
print s % (1, 91, ' login\n login account\n \
446+
login account password')
413447

414448
x = pan115()
415449
x.login(account, password)

91porn.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,10 @@ def get_infos(self):
6767

6868
r = ss.get(apiurl, params=params)
6969
if r.ok:
70-
dlink = re.search(r'file=(http.+?\.mp4)', r.content).group(1)
71-
name = re.search(r'viewkey=([\d\w]+)', self.url).group(1)
70+
dlink = re.search(
71+
r'file=(http.+?\.mp4)', r.content).group(1)
72+
name = re.search(
73+
r'viewkey=([\d\w]+)', self.url).group(1)
7274
infos = {
7375
'name': '%s.mp4' % name,
7476
'file': os.path.join(os.getcwd(), '%s.mp4' % name),
@@ -86,7 +88,8 @@ def download(self, infos):
8688
col = s % (2, num + 90, infos['file'])
8789
print '\n ++ 正在下载: %s' % col
8890

89-
cookies = '; '.join(['%s=%s' % (i, ii) for i, ii in ss.cookies.items()])
91+
cookies = '; '.join(
92+
['%s=%s' % (i, ii) for i, ii in ss.cookies.items()])
9093
if args.aria2c:
9194
cmd = 'aria2c -c -x10 -s10 ' \
9295
'-o "%s.tmp" -d "%s" --header "User-Agent: %s" ' \
@@ -118,7 +121,7 @@ def play(self, infos):
118121
'--http-header-fields "user-agent:%s" "%s"' \
119122
% (headers['User-Agent'], infos['dlink'])
120123

121-
status = os.system(cmd)
124+
os.system(cmd)
122125
timeout = 1
123126
ii, _, _ = select.select([sys.stdin], [], [], timeout)
124127
if ii:
@@ -134,7 +137,8 @@ def main(url):
134137
x.do()
135138

136139
if __name__ == '__main__':
137-
p = argparse.ArgumentParser(description='download from 91porn.com')
140+
p = argparse.ArgumentParser(
141+
description='download from 91porn.com')
138142
p.add_argument('url', help='url of 91porn.com')
139143
p.add_argument('-a', '--aria2c', action='store_true', \
140144
help='download with aria2c')

README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,7 @@
343343
-f number, --from_ number 从第几个开始(用于download, play),eg: p /video -f 42
344344
-t ext, --type_ ext 类型参数, 用 “,” 分隔
345345
eg:
346+
p -t m3 # 播放流媒体(m3u8)
346347
s -t c # 连续转存 (如果转存出错,再次运行命令
347348
# 可以从出错的地方开始,用于转存大量文件时)
348349
l -t f # 文件
@@ -427,6 +428,11 @@
427428
bp p http://pan.baidu.com/s/xxxxxxxxx -s [secret]
428429
bp p /movie -R # 递归播放 /movie 中所有媒体文件
429430

431+
# 播放流媒体(m3u8)
432+
上面的命令后加 -t m3
433+
清晰度与在浏览器上播放的一样.
434+
如果源文件是高清的(720P,1280P),那么流媒体会自动转为480P.
435+
430436
离线下载:
431437

432438
bp a http://mirrors.kernel.org/archlinux/iso/latest/archlinux-2014.06.01-dual.iso /path/to/save

bt.py

Lines changed: 40 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import sys
77
import re
88
from hashlib import sha1
9-
import binascii
109
import base64
1110
import requests
1211
import urlparse
@@ -15,18 +14,22 @@
1514
############################################################
1615
headers = {
1716
"Connection": "keep-alive",
18-
"Accept":"text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8",
17+
"Accept":"text/html,application/xhtml+xml,\
18+
application/xml;q=0.9,image/webp,*/*;q=0.8",
1919
"Accept-Encoding":"gzip,deflate,sdch",
20-
"Accept-Language":"en-US,en;q=0.8,zh-CN;q=0.6,zh;q=0.4,zh-TW;q=0.2",
21-
"User-Agent":"Mozilla/5.0 (X11; Linux i686) AppleWebKit/537.36 "\
22-
"(KHTML, like Gecko) Chrome/32.0.1700.77 Safari/537.36"
20+
"Accept-Language":"en-US,en;q=0.8,zh-CN;\
21+
q=0.6,zh;q=0.4,zh-TW;q=0.2",
22+
"User-Agent":"Mozilla/5.0 (X11; Linux x86_64) \
23+
AppleWebKit/537.36 (KHTML, like Gecko) \
24+
Chrome/40.0.2214.91 Safari/537.36"
2325
}
2426

2527
ss = requests.session()
2628
ss.headers.update(headers)
2729

2830
s = u'\x1b[%d;%dm%s\x1b[0m' # terminual color template
29-
letters = [i for i in '.abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ' + '0123456789']
31+
letters = [i for i in '.abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ' \
32+
+ '0123456789']
3033

3134
class bt(object):
3235
def transfer(self, string, tpath, foo=None, bar=None):
@@ -42,16 +45,18 @@ def transfer(self, string, tpath, foo=None, bar=None):
4245
for fl in dstring['info']['files']:
4346
filename = fl['path'][-1]
4447
if args.type_ == 'n':
45-
newfilename = re.sub(foo, bar, filename, re.I) if foo and bar else filename
48+
newfilename = re.sub(foo, bar, filename, re.I) \
49+
if foo and bar else filename
4650
if filename != newfilename:
4751
print filename, s % (1, 92, '==>'), newfilename
48-
path = [self._get_sub_dir_index(i) for i in fl['path'][:-1]] \
49-
+ [newfilename]
52+
path = [self._get_sub_dir_index(i) \
53+
for i in fl['path'][:-1]] + [newfilename]
5054
else:
5155
ext = os.path.splitext(filename)[-1]
5256
ext = self._check_ext(ext)
53-
path = [self._get_sub_dir_index(i) for i in fl['path'][:-1]] \
54-
+ ['%s%s' % (file_index, ext)]
57+
path = [self._get_sub_dir_index(i) \
58+
for i in fl['path'][:-1]] \
59+
+ ['%s%s' % (file_index, ext)]
5560
file_index += 1
5661
fl['path'] = path
5762

@@ -125,7 +130,8 @@ def do(url, proxies=None, data=None, timeout=None):
125130

126131
## with xunlei
127132
print s % (1, 94, ' >> try:'), 'bt.box.n0808.com'
128-
url = 'http://bt.box.n0808.com/%s/%s/%s.torrent' % (hh[:2], hh[-2:], hh)
133+
url = 'http://bt.box.n0808.com/%s/%s/%s.torrent' \
134+
% (hh[:2], hh[-2:], hh)
129135
ss.headers['Referer'] = 'http://bt.box.n0808.com'
130136
result = do(url)
131137
if result: return result
@@ -207,7 +213,8 @@ def magnet2torrent(self, urls, dir_):
207213
string = self.get_torrent(hh)
208214
if string:
209215
tpath = os.path.join(dir_, hh + '.torrent')
210-
print s % (1, 97, ' ++ magnet to torrent:'), 'magnet:?xt=urn:btih:%s' % hh
216+
print s % (1, 97, ' ++ magnet to torrent:'), \
217+
'magnet:?xt=urn:btih:%s' % hh
211218
with open(tpath, 'w') as g:
212219
g.write(string)
213220
else:
@@ -237,7 +244,8 @@ def trans(tpath):
237244
tpath = path
238245
trans(tpath)
239246
else:
240-
print s % (1, 91, ' !! file doesn\'t existed'), s % (1, 93, '--'), path
247+
print s % (1, 91, ' !! file doesn\'t existed'), \
248+
s % (1, 93, '--'), path
241249

242250
def change(self, ups, dir_, foo=None, bar=None):
243251
for up in ups:
@@ -251,7 +259,8 @@ def change(self, ups, dir_, foo=None, bar=None):
251259
string = self.get_torrent(hh)
252260
if string:
253261
tpath = os.path.join(dir_, hh + '.torrent')
254-
print s % (1, 97, ' ++ transfer:'), 'magnet:?xt=urn:btih:%s' % hh
262+
print s % (1, 97, ' ++ transfer:'), \
263+
'magnet:?xt=urn:btih:%s' % hh
255264
self.transfer(string, tpath, foo=foo, bar=bar)
256265
else:
257266
print s % (1, 91, ' !! Can\'t get torrent from web.'), path
@@ -266,7 +275,8 @@ def do():
266275
print s % (1, 97, ' ++ transfer:'), ipath
267276
string = open(ipath).read()
268277
tpath = os.path.join(dir_, 'change_' + i)
269-
self.transfer(string, tpath, foo=foo, bar=bar)
278+
self.transfer(string, tpath, foo=foo,
279+
bar=bar)
270280
paths.update(ipath)
271281
if os.getcwd() == os.path.abspath(dir_):
272282
do()
@@ -277,10 +287,12 @@ def do():
277287
if path.lower().endswith('torrent'):
278288
print s % (1, 97, ' ++ transfer:'), path
279289
string = open(path).read()
280-
tpath = os.path.join(dir_, 'change_' + os.path.basename(path))
290+
tpath = os.path.join(dir_,
291+
'change_' + os.path.basename(path))
281292
self.transfer(string, tpath, foo=foo, bar=bar)
282293
else:
283-
print s % (1, 91, ' !! file doesn\'t existed'), s % (1, 93, '--'), path
294+
print s % (1, 91, ' !! file doesn\'t existed'), \
295+
s % (1, 93, '--'), path
284296

285297
def import_magnet(froms):
286298
ml = []
@@ -317,7 +329,8 @@ def get_magnet(cm):
317329
def main(argv):
318330
######################################################
319331
# for argparse
320-
p = argparse.ArgumentParser(description='magnet torrent 互转,数字命名bt内容文件名' \
332+
p = argparse.ArgumentParser(
333+
description='magnet torrent 互转,数字命名bt内容文件名' \
321334
' 用法见 https://github.com/PeterDing/iScript')
322335
p.add_argument('xxx', type=str, nargs='*', \
323336
help='命令对象.')
@@ -337,11 +350,13 @@ def main(argv):
337350
comd = argv[1]
338351
xxx = args.xxx
339352

340-
dir_ = os.getcwd() if not args.directory else args.directory
353+
dir_ = os.getcwd() if not args.directory \
354+
else args.directory
341355
if not os.path.exists(dir_):
342356
os.mkdir(dir_)
343357
if comd == 'm' or comd == 'mt': # magnet to torrent
344-
urls = xxx if not args.import_from else import_magnet(args.import_from)
358+
urls = xxx if not args.import_from \
359+
else import_magnet(args.import_from)
345360
x = bt()
346361
x.magnet2torrent(urls, dir_)
347362

@@ -351,14 +366,16 @@ def main(argv):
351366
x.torrent2magnet(paths)
352367

353368
elif comd == 'c' or comd == 'ct': # change
354-
ups = xxx if not args.import_from else import_magnet(args.import_from)
369+
ups = xxx if not args.import_from \
370+
else import_magnet(args.import_from)
355371
x = bt()
356372
x.change(ups, dir_, foo=None, bar=None)
357373

358374
elif comd == 'cr' or comd == 'ctre': # change
359375
foo = xxx[0]
360376
bar = xxx[1]
361-
ups = xxx[2:] if not args.import_from else import_magnet(args.import_from)
377+
ups = xxx[2:] if not args.import_from \
378+
else import_magnet(args.import_from)
362379
x = bt()
363380
x.change(ups, dir_, foo=foo, bar=bar)
364381

0 commit comments

Comments
 (0)