From 3c8205896575e52c30b59a3a02b3df6d7ffaed0f Mon Sep 17 00:00:00 2001
From: pl <0x00-pl@gmail.com>
Date: Sun, 16 Nov 2014 21:54:03 +0800
Subject: [PATCH] 	modified:   src/you_get/extractors/douyutv.py 	switch
 to newer common functions.

---
 src/you_get/extractors/douyutv.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/you_get/extractors/douyutv.py b/src/you_get/extractors/douyutv.py
index 8674add0..40d36d16 100644
--- a/src/you_get/extractors/douyutv.py
+++ b/src/you_get/extractors/douyutv.py
@@ -7,16 +7,16 @@ import re
 import json
 
 def douyutv_download(url, output_dir = '.', merge = True, info_only = False):
-    html = get_html(url)
+    html = get_content(url)
     room_id_patt = r'"room_id":(\d{1,99}),'
     title_patt = r'<div class="headline clearfix">\s*<h1>([^<]{1,9999})</h1>'
     title_patt_backup = r'<title>([^<]{1,9999})</title>'
     
-    roomid = re.findall(room_id_patt,html)[0]
-    title = r1_of([title_patt,title_patt_backup], html)
+    roomid = match1(html, room_id_patt)
+    title = match1(html, title_patt) or match1(html, title_patt_backup)
     title = unescape_html(title)
 
-    conf = get_html("http://www.douyutv.com/api/client/room/"+roomid)
+    conf = get_content("http://www.douyutv.com/api/client/room/"+roomid)
     metadata = json.loads(conf)
     
     rtmp_live= metadata.get('data').get('rtmp_live')