From 7d72596f06b46299c60ff0c1761cb9167060606a Mon Sep 17 00:00:00 2001 From: Justsoos Date: Sun, 29 Jan 2017 18:37:10 +0800 Subject: [PATCH 1/2] fix quanmin.py fix #1653 --- src/you_get/extractors/quanmin.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/you_get/extractors/quanmin.py b/src/you_get/extractors/quanmin.py index 89d63ea9..668e84f9 100644 --- a/src/you_get/extractors/quanmin.py +++ b/src/you_get/extractors/quanmin.py @@ -7,13 +7,15 @@ import json import time def quanmin_download(url, output_dir = '.', merge = True, info_only = False, **kwargs): - roomid = url[url.rfind("/")+1:] - json_request_url = 'http://www.quanmin.tv/json/rooms/{}/info4.json'.format(roomid) + roomid = url.split('/')[3].split('?')[0] #add ?parameter.split and change the unstable url(from the back) rfind to split(from the front) + + #json_request_url = 'http://www.quanmin.tv/json/rooms/{}/info4.json'.format(roomid) #"http://www.quanmin.tv/json/rooms/308137/info4.json" switch to "http://m.quanmin.tv/json/rooms/308137/noinfo6.json" + json_request_url = 'http://m.quanmin.tv/json/rooms/{}/noinfo6.json'.format(roomid) content = get_html(json_request_url) data = json.loads(content) title = data["title"] - + if not data["play_status"]: raise ValueError("The live stream is not online!") real_url = "http://flv.quanmin.tv/live/{}.flv".format(roomid) From b310fdc2d583fb006ebb3a46be10488054ef1561 Mon Sep 17 00:00:00 2001 From: Justsoos Date: Sat, 4 Feb 2017 23:14:33 +0800 Subject: [PATCH 2/2] delete comments --- src/you_get/extractors/quanmin.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/you_get/extractors/quanmin.py b/src/you_get/extractors/quanmin.py index 668e84f9..bf1af659 100644 --- a/src/you_get/extractors/quanmin.py +++ b/src/you_get/extractors/quanmin.py @@ -7,9 +7,8 @@ import json import time def quanmin_download(url, output_dir = '.', merge = True, info_only = False, **kwargs): - roomid = url.split('/')[3].split('?')[0] #add ?parameter.split and change the unstable url(from the back) rfind to split(from the front) + roomid = url.split('/')[3].split('?')[0] - #json_request_url = 'http://www.quanmin.tv/json/rooms/{}/info4.json'.format(roomid) #"http://www.quanmin.tv/json/rooms/308137/info4.json" switch to "http://m.quanmin.tv/json/rooms/308137/noinfo6.json" json_request_url = 'http://m.quanmin.tv/json/rooms/{}/noinfo6.json'.format(roomid) content = get_html(json_request_url) data = json.loads(content)