mirror of
https://github.com/ytdl-org/youtube-dl.git
synced 2024-09-08 21:45:05 +00:00
[mtv] Update tests and xpath function for new title extraction
This commit is contained in:
parent
2250865fb0
commit
af1588c05f
|
@ -180,7 +180,7 @@ class MTVIggyIE(MTVServicesInfoExtractor):
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
'id': '984696',
|
'id': '984696',
|
||||||
'ext': 'mp4',
|
'ext': 'mp4',
|
||||||
'title': 'Short',
|
'title': 'Arcade Fire: Behind the Scenes at the Biggest Music Experiment Yet',
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
_FEED_URL = 'http://all.mtvworldverticals.com/feed-xml/'
|
_FEED_URL = 'http://all.mtvworldverticals.com/feed-xml/'
|
||||||
|
|
|
@ -11,7 +11,7 @@ class SpikeIE(MTVServicesInfoExtractor):
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
'id': 'b9c8221a-4e50-479a-b86d-3333323e38ba',
|
'id': 'b9c8221a-4e50-479a-b86d-3333323e38ba',
|
||||||
'ext': 'mp4',
|
'ext': 'mp4',
|
||||||
'title': 'Can Allen Ride A Hundred Year-Old Motorcycle?',
|
'title': 'Auction Hunters|Can Allen Ride A Hundred Year-Old Motorcycle?',
|
||||||
'description': 'md5:fbed7e82ed5fad493615b3094a9499cb',
|
'description': 'md5:fbed7e82ed5fad493615b3094a9499cb',
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
|
@ -224,7 +224,7 @@ if sys.version_info >= (2,7):
|
||||||
def find_xpath_attr(node, xpath, key, val):
|
def find_xpath_attr(node, xpath, key, val):
|
||||||
""" Find the xpath xpath[@key=val] """
|
""" Find the xpath xpath[@key=val] """
|
||||||
assert re.match(r'^[a-zA-Z]+$', key)
|
assert re.match(r'^[a-zA-Z]+$', key)
|
||||||
assert re.match(r'^[a-zA-Z0-9@\s:.]*$', val)
|
assert re.match(r'^[a-zA-Z0-9@\s:._]*$', val)
|
||||||
expr = xpath + u"[@%s='%s']" % (key, val)
|
expr = xpath + u"[@%s='%s']" % (key, val)
|
||||||
return node.find(expr)
|
return node.find(expr)
|
||||||
else:
|
else:
|
||||||
|
|
Loading…
Reference in a new issue