diff --git a/src/you_get/common.py b/src/you_get/common.py index 24681b22..b2bca0a5 100755 --- a/src/you_get/common.py +++ b/src/you_get/common.py @@ -86,7 +86,6 @@ SITES = { 'naver' : 'naver', '7gogo' : 'nanagogo', 'nicovideo' : 'nicovideo', - 'panda' : 'panda', 'pinterest' : 'pinterest', 'pixnet' : 'pixnet', 'pptv' : 'pptv', diff --git a/src/you_get/extractors/__init__.py b/src/you_get/extractors/__init__.py index 0c4cccc7..2961f015 100755 --- a/src/you_get/extractors/__init__.py +++ b/src/you_get/extractors/__init__.py @@ -51,7 +51,6 @@ from .nanagogo import * from .naver import * from .netease import * from .nicovideo import * -from .panda import * from .pinterest import * from .pixnet import * from .pptv import * diff --git a/src/you_get/extractors/panda.py b/src/you_get/extractors/panda.py deleted file mode 100644 index c9af4b38..00000000 --- a/src/you_get/extractors/panda.py +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env python - -__all__ = ['panda_download'] - -from ..common import * -from ..util.log import * -import json -import time - -def panda_download(url, output_dir = '.', merge = True, info_only = False, **kwargs): - roomid = re.search('/(\d+)', url) - if roomid is None: - log.wtf('Cannot found room id for this url') - roomid = roomid.group(1) - json_request_url ="http://www.panda.tv/api_room_v2?roomid={}&__plat=pc_web&_={}".format(roomid, int(time.time())) - content = get_html(json_request_url) - api_json = json.loads(content) - - errno = api_json["errno"] - errmsg = api_json["errmsg"] - if errno: - raise ValueError("Errno : {}, Errmsg : {}".format(errno, errmsg)) - data = api_json["data"] - title = data["roominfo"]["name"] - room_key = data["videoinfo"]["room_key"] - plflag = data["videoinfo"]["plflag"].split("_") - status = data["videoinfo"]["status"] - if status != "2": - raise ValueError("The live stream is not online! (status:%s)" % status) - - data2 = json.loads(data["videoinfo"]["plflag_list"]) - rid = data2["auth"]["rid"] - sign = data2["auth"]["sign"] - ts = data2["auth"]["time"] - real_url = "http://pl{}.live.panda.tv/live_panda/{}.flv?sign={}&ts={}&rid={}".format(plflag[1], room_key, sign, ts, rid) - - print_info(site_info, title, 'flv', float('inf')) - if not info_only: - download_urls([real_url], title, 'flv', None, output_dir, merge = merge) - -site_info = "panda.tv" -download = panda_download -download_playlist = playlist_not_supported('panda')