aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoman Sebastian Karwacik <roman.karwacik@rwth-aachen.de>2020-06-02 13:07:10 +0200
committerinsaneracist <insaneracist@cyberdude.com>2020-11-02 16:09:20 -0800
commitb11a88fc243a078c2addbcf0d1377bd65495bc05 (patch)
treec6227387885ed83778e6a60c731fc8ad5eec1835
parentaa13f124a5afcca3af3086ab7bcdc74783a95127 (diff)
downloadhypervideo-pre-b11a88fc243a078c2addbcf0d1377bd65495bc05.tar.lz
hypervideo-pre-b11a88fc243a078c2addbcf0d1377bd65495bc05.tar.xz
hypervideo-pre-b11a88fc243a078c2addbcf0d1377bd65495bc05.zip
[zoomus] Adjusted url regex, now allowing for arbitrary long ids, dont throw warning if password field not found
-rw-r--r--youtube_dlc/extractor/zoomus.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/youtube_dlc/extractor/zoomus.py b/youtube_dlc/extractor/zoomus.py
index f61f35da8..9aae30d37 100644
--- a/youtube_dlc/extractor/zoomus.py
+++ b/youtube_dlc/extractor/zoomus.py
@@ -13,7 +13,7 @@ from ..utils import (
class ZoomUSIE(InfoExtractor):
IE_NAME = 'zoom.us'
- _VALID_URL = r'https://(?:.*).?zoom.us/rec(?:ording)?/play/(?P<id>[^?&=]{64})'
+ _VALID_URL = r'https://(?:.*).?zoom.us/rec(?:ording)?/play/(?P<id>[A-Za-z0-9\-_]+)'
_TEST = {
'url': 'https://zoom.us/recording/play/SILVuCL4bFtRwWTtOCFQQxAsBQsJljFtm9e4Z_bvo-A8B-nzUSYZRNuPl3qW5IGK',
@@ -29,7 +29,7 @@ class ZoomUSIE(InfoExtractor):
display_id = self._match_id(url)
webpage = self._download_webpage(url, display_id)
- password_protected = self._search_regex(r'<form[^>]+?id="(password_form)"', webpage, 'password field', fatal=False)
+ password_protected = self._search_regex(r'<form[^>]+?id="(password_form)"', webpage, 'password field', fatal=False, default=None)
if password_protected is not None:
self._verify_video_password(url, display_id, webpage)
webpage = self._download_webpage(url, display_id)