projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add an extractor for videofy.me (closes #1171)
[youtube-dl]
/
youtube_dl
/
utils.py
diff --git
a/youtube_dl/utils.py
b/youtube_dl/utils.py
index 76fa2950c63aca88bb6e8755bde455aefbaa625d..59eeaf4a89084783e1ca2607840b3b7dfc4670f5 100644
(file)
--- a/
youtube_dl/utils.py
+++ b/
youtube_dl/utils.py
@@
-35,6
+35,11
@@
try:
except ImportError: # Python 2
from urlparse import urlparse as compat_urllib_parse_urlparse
except ImportError: # Python 2
from urlparse import urlparse as compat_urllib_parse_urlparse
+try:
+ import urllib.parse as compat_urlparse
+except ImportError: # Python 2
+ import urlparse as compat_urlparse
+
try:
import http.cookiejar as compat_cookiejar
except ImportError: # Python 2
try:
import http.cookiejar as compat_cookiejar
except ImportError: # Python 2
@@
-201,8
+206,8
@@
else:
if sys.version_info >= (2,7):
def find_xpath_attr(node, xpath, key, val):
""" Find the xpath xpath[@key=val] """
if sys.version_info >= (2,7):
def find_xpath_attr(node, xpath, key, val):
""" Find the xpath xpath[@key=val] """
- assert re.match(r'^[a-z]+$', key)
- assert re.match(r'^[a-z]*$', val)
+ assert re.match(r'^[a-z
A-Z
]+$', key)
+ assert re.match(r'^[a-z
A-Z@\s
]*$', val)
expr = xpath + u"[@%s='%s']" % (key, val)
return node.find(expr)
else:
expr = xpath + u"[@%s='%s']" % (key, val)
return node.find(expr)
else:
@@
-645,12
+650,12
@@
def unified_strdate(date_str):
pass
return upload_date
pass
return upload_date
-def determine_ext(url):
+def determine_ext(url
, default_ext=u'unknown_video'
):
guess = url.partition(u'?')[0].rpartition(u'.')[2]
if re.match(r'^[A-Za-z0-9]+$', guess):
return guess
else:
guess = url.partition(u'?')[0].rpartition(u'.')[2]
if re.match(r'^[A-Za-z0-9]+$', guess):
return guess
else:
- return
u'unknown_video'
+ return
default_ext
def date_from_str(date_str):
"""
def date_from_str(date_str):
"""