未验证 提交 1f271aee 编写于 作者: M Mort Yao

[extractor] flush output after printing each video info

上级 192d54ad
......@@ -5,6 +5,7 @@ from .common import print_more_compatible as print
from .util import log
from . import json_output
import os
import sys
class Extractor():
def __init__(self, *args):
......@@ -130,6 +131,8 @@ class VideoExtractor():
print(" url: %s" % self.url)
print()
sys.stdout.flush()
def p(self, stream_id=None):
maybe_print("site: %s" % self.__class__.name)
maybe_print("title: %s" % self.title)
......@@ -165,6 +168,8 @@ class VideoExtractor():
print(" - lang: {}".format(i['lang']))
print(" download-url: {}\n".format(i['url']))
sys.stdout.flush()
def p_playlist(self, stream_id=None):
maybe_print("site: %s" % self.__class__.name)
print("playlist: %s" % self.title)
......
......@@ -473,7 +473,6 @@ class Bilibili(VideoExtractor):
ep_id = ep['id']
epurl = 'https://www.bilibili.com/bangumi/play/ep%s/' % ep_id
self.__class__().download_by_url(epurl, **kwargs)
sys.stdout.flush()
elif sort == 'bangumi_md':
initial_state_text = match1(html_content, r'__INITIAL_STATE__=(.*?);\(function\(\)') # FIXME
......@@ -484,7 +483,6 @@ class Bilibili(VideoExtractor):
ep_id = ep['ep_id']
epurl = 'https://www.bilibili.com/bangumi/play/ep%s/' % ep_id
self.__class__().download_by_url(epurl, **kwargs)
sys.stdout.flush()
elif sort == 'space_channel':
m = re.match(r'https?://space\.?bilibili\.com/(\d+)/channel/detail\?.*cid=(\d+)', self.url)
......@@ -497,7 +495,6 @@ class Bilibili(VideoExtractor):
i += 1; log.w('Extracting %s of %s videos ...' % (i, epn))
url = 'https://www.bilibili.com/video/av%s' % video['aid']
self.__class__().download_playlist_by_url(url, **kwargs)
sys.stdout.flush()
elif sort == 'space_favlist':
m = re.match(r'https?://space\.?bilibili\.com/(\d+)/favlist\?.*fid=(\d+)', self.url)
......@@ -510,7 +507,6 @@ class Bilibili(VideoExtractor):
i += 1; log.w('Extracting %s of %s videos ...' % (i, epn))
url = 'https://www.bilibili.com/video/av%s' % video['aid']
self.__class__().download_playlist_by_url(url, **kwargs)
sys.stdout.flush()
elif sort == 'space_video':
m = re.match(r'https?://space\.?bilibili\.com/(\d+)/video', self.url)
......@@ -523,7 +519,6 @@ class Bilibili(VideoExtractor):
i += 1; log.w('Extracting %s of %s videos ...' % (i, epn))
url = 'https://www.bilibili.com/video/av%s' % video['aid']
self.__class__().download_playlist_by_url(url, **kwargs)
sys.stdout.flush()
elif sort == 'audio_menu':
m = re.match(r'https?://(?:www\.)?bilibili\.com/audio/am(\d+)', self.url)
......@@ -539,7 +534,6 @@ class Bilibili(VideoExtractor):
i += 1; log.w('Extracting %s of %s songs ...' % (i, epn))
url = 'https://www.bilibili.com/audio/au%s' % song['id']
self.__class__().download_by_url(url, **kwargs)
sys.stdout.flush()
site = Bilibili()
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册