From 4578503e5c92b7279fb305346400ba02f226ee62 Mon Sep 17 00:00:00 2001
From: Valdemar Erk <valdemarerk@gmail.com>
Date: Thu, 12 Jan 2017 17:37:46 +0100
Subject: [PATCH] Updated the panda.tv plugin to use api v2

---
 src/you_get/extractors/panda.py | 47 +++++++++++----------------------
 1 file changed, 16 insertions(+), 31 deletions(-)

diff --git a/src/you_get/extractors/panda.py b/src/you_get/extractors/panda.py
index 999cb7c6..45249bd2 100644
--- a/src/you_get/extractors/panda.py
+++ b/src/you_get/extractors/panda.py
@@ -5,46 +5,31 @@ __all__ = ['panda_download']
 from ..common import *
 import json
 import time
-import urllib.request
-import urllib.error
-
 
 def panda_download(url, output_dir = '.', merge = True, info_only = False, **kwargs):
     roomid = url[url.rfind('/')+1:]
-    json_request_url = 'http://www.panda.tv/api_room?roomid={}&pub_key=&_={}'.format(roomid, int(time.time()))
+    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)
-    errno = json.loads(content)['errno']
-    errmsg = json.loads(content)['errmsg']
+    api_json = json.loads(content)
+    
+    errno = api_json["errno"]
+    errmsg = api_json["errmsg"]
     if errno:
         raise ValueError("Errno : {}, Errmsg : {}".format(errno, errmsg))
-
-    data = json.loads(content)['data']
-    title = data.get('roominfo')['name']
-    room_key = data.get('videoinfo')['room_key']
-    plflag = data.get('videoinfo')['plflag'].split('_')
-    status = data.get('videoinfo')['status']
+    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 is not "2":
         raise ValueError("The live stream is not online! (status:%s)" % status)
-    real_url = 'http://pl{}.live.panda.tv/live_panda/{}.flv'.format(plflag[1],room_key)
-    counter = 0
-    data2 = json.loads(data['videoinfo']['plflag_list'])
-    pl_code_error = False
-    try:
-        urllib.request.urlopen(real_url)
-    except urllib.error.HTTPError as e:
-        pl_code_error = True
 
-    while (pl_code_error and counter < len(data2["backup"])):
-        plflag = data2["backup"][counter].split('_')
-        counter = counter + 1
-        real_url = 'http://pl{}.live.panda.tv/live_panda/{}.flv'.format(plflag[1],room_key)
-        try:
-            urllib.request.urlopen(real_url)
-        except urllib.error.HTTPError as e:
-            pl_code_error = True
-        else:
-            pl_code_error = False
-        
+    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)