projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[megaphone] Add extractor
[youtube-dl]
/
youtube_dl
/
extractor
/
generic.py
diff --git
a/youtube_dl/extractor/generic.py
b/youtube_dl/extractor/generic.py
index 36c81eda92184f9d7597b4a06ec0e6a33bf6d81a..9678c32c44f43af88ae5249abe39c8239631b229 100644
(file)
--- a/
youtube_dl/extractor/generic.py
+++ b/
youtube_dl/extractor/generic.py
@@
-97,6
+97,7
@@
from .washingtonpost import WashingtonPostIE
from .wistia import WistiaIE
from .mediaset import MediasetIE
from .joj import JojIE
from .wistia import WistiaIE
from .mediaset import MediasetIE
from .joj import JojIE
+from .megaphone import MegaphoneIE
class GenericIE(InfoExtractor):
class GenericIE(InfoExtractor):
@@
-2790,6
+2791,13
@@
class GenericIE(InfoExtractor):
return self.playlist_from_matches(
joj_urls, video_id, video_title, ie=JojIE.ie_key())
return self.playlist_from_matches(
joj_urls, video_id, video_title, ie=JojIE.ie_key())
+ # Look for megaphone.fm embeds
+ mpfn_urls = MegaphoneIE._extract_urls(webpage)
+ if mpfn_urls:
+ return self.playlist_from_matches(
+ mpfn_urls, video_id, video_title, ie=MegaphoneIE.ie_key())
+
+
def merge_dicts(dict1, dict2):
merged = {}
for k, v in dict1.items():
def merge_dicts(dict1, dict2):
merged = {}
for k, v in dict1.items():