From 1fe55ac872495b33a1c5d5a0610b75daa82f73be Mon Sep 17 00:00:00 2001 From: "Franc[e]sco" Date: Tue, 17 Nov 2015 19:46:30 +0100 Subject: [PATCH 1/2] added openings.moe support --- youtube_dl/extractor/__init__.py | 2 +- youtube_dl/extractor/openingsmoe.py | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 youtube_dl/extractor/openingsmoe.py diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py index 26e5745d6..118a084c2 100644 --- a/youtube_dl/extractor/__init__.py +++ b/youtube_dl/extractor/__init__.py @@ -132,7 +132,6 @@ from .dfb import DFBIE from .dhm import DHMIE from .dotsub import DotsubIE from .douyutv import DouyuTVIE -from .dplay import DPlayIE from .dramafever import ( DramaFeverIE, DramaFeverSeriesIE, @@ -453,6 +452,7 @@ from .ooyala import ( OoyalaIE, OoyalaExternalIE, ) +from .openingsmoe import OpeningsMoeIE from .orf import ( ORFTVthekIE, ORFOE1IE, diff --git a/youtube_dl/extractor/openingsmoe.py b/youtube_dl/extractor/openingsmoe.py new file mode 100644 index 000000000..a3ee7189a --- /dev/null +++ b/youtube_dl/extractor/openingsmoe.py @@ -0,0 +1,29 @@ +from .common import InfoExtractor + +class OpeningsMoeIE(InfoExtractor): + _VALID_URL = r'(?:http://)?(?:www\.)?openings\.moe/.*' + _TEST = { + u"url": u"http://openings.moe/?video=InstallLinux.webm", + u"md5": u"0197c23fb5124395a51d4bc483506d61", + u"info_dict": { + u"id": "InstallLinux", + u"url": u"http://openings.moe/video/InstallLinux.webm", + u"ext": u"webm", + u"title": u"openings.moe", + } + } + + def _real_extract(self, url): + webpage = self._download_webpage(url, "") + self.report_extraction("") + + video_id = self._html_search_regex( + r'', + webpage, u"Video URL") + + return { + u"id": video_id, + u"url": u"http://openings.moe/video/" + video_id + u".webm", + u"ext": u"webm", + u"title": u"openings.moe", + } From b6a493dd74f535d229d4e85693a50f77dc67fd37 Mon Sep 17 00:00:00 2001 From: "Franc[e]sco" Date: Tue, 17 Nov 2015 19:56:47 +0100 Subject: [PATCH 2/2] accidentally removed dplay --- youtube_dl/extractor/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py index 118a084c2..f75b988d9 100644 --- a/youtube_dl/extractor/__init__.py +++ b/youtube_dl/extractor/__init__.py @@ -132,6 +132,7 @@ from .dfb import DFBIE from .dhm import DHMIE from .dotsub import DotsubIE from .douyutv import DouyuTVIE +from .dplay import DPlayIE from .dramafever import ( DramaFeverIE, DramaFeverSeriesIE,