[showroom] support room URLs with dashes (-)

This commit is contained in:
Mort Yao 2016-07-01 15:35:02 +02:00
parent 2cd980b1dd
commit bbe1376a86
No known key found for this signature in database
GPG Key ID: 07DA00CB78203251

View File

@ -56,8 +56,8 @@ def showroom_download_by_room_id(room_id, output_dir = '.', merge = False, info_
#----------------------------------------------------------------------
def showroom_download(url, output_dir = '.', merge = False, info_only = False, **kwargs):
""""""
if re.match( r'(\w+)://www.showroom-live.com/(\w*)', url):
room_url_key = match1(url, r'\w+://www.showroom-live.com/(\w*)')
if re.match( r'(\w+)://www.showroom-live.com/([-\w]+)', url):
room_url_key = match1(url, r'\w+://www.showroom-live.com/([-\w]+)')
room_id = showroom_get_roomid_by_room_url_key(room_url_key)
showroom_download_by_room_id(room_id, output_dir, merge,
info_only)