From 461cead4f788f6a69902f350b9143a5e1588b57d Mon Sep 17 00:00:00 2001
From: tsantala <tsantala@tsantala-desktop.(none)>
Date: Tue, 6 Aug 2013 04:34:24 +0300
Subject: [PATCH 1/2] changes
---
youtube_dl/extractor/AddAnime.py | 54 ++++++++++++++++++++++++++++++++
youtube_dl/extractor/__init__.py | 2 ++
2 files changed, 56 insertions(+)
create mode 100644 youtube_dl/extractor/AddAnime.py
diff --git a/youtube_dl/extractor/AddAnime.py b/youtube_dl/extractor/AddAnime.py
new file mode 100644
index 000000000..43b0b24fe
--- /dev/null
+++ b/youtube_dl/extractor/AddAnime.py
@@ -0,0 +1,54 @@
+import re
+
+from .common import InfoExtractor
+from ..utils import (
+ ExtractorError,
+)
+from bs4 import BeautifulSoup
+
+
+class AddAnimeIE(InfoExtractor):
+
+ _VALID_URL = r'^(?:http?://)?(?:\w+\.)?add-anime\.net/watch_video.php\?(?:.*?)v=(?P<video_id>[\w_]+)(?:.*)'
+ IE_NAME = u'AddAnime'
+ _TEST = {
+ u'url': u'http://www.add-anime.net/watch_video.php?v=24MR3YO5SAS9',
+ u'file': u'137499050692ced.flv',
+ u'md5': u'0813c2430bea7a46bf13acf3406992f4',
+ u'info_dict': {
+ u"description": u"One Piece 606",
+ u"uploader": u"mugiwaraQ8",
+ u"title": u"One Piece 606"
+ }
+ }
+
+ def _real_extract(self, url):
+ mobj = re.match(self._VALID_URL, url)
+ if mobj is None:
+ raise ExtractorError(u'Invalid URL: %s' % url)
+
+ video_id = mobj.group('video_id')
+
+ webpage = self._download_webpage(url, video_id)
+
+ video_url = self._search_regex(r'var normal_video_file = "(.*?)",',
+ webpage, u'video URL')
+
+ video_title = self._og_search_title(webpage)
+
+ video_description = self._og_search_description(webpage)
+
+ soup = BeautifulSoup(webpage)
+
+ video_uploader= soup.find("meta", {"author":""})['content']
+
+ info = {
+ 'id': video_id,
+ 'url': video_url,
+ 'ext': 'flv',
+ 'title': video_title,
+ 'description': video_description,
+ 'uploader': video_uploader
+ }
+
+ return [info]
diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
index 84c02c2ed..28dcb2cc4 100644
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -1,3 +1,5 @@
+
+from .AddAnime import AddAnimeIE
from .archiveorg import ArchiveOrgIE
from .ard import ARDIE
from .arte import ArteTvIE
From 5a27ecdd2ec83ba6e1069428c4c0fb3bd61f638c Mon Sep 17 00:00:00 2001
From: kkalpakloglou <kkalpakloglou@yahoo.com>
Date: Fri, 16 Aug 2013 23:54:09 +0300
Subject: [PATCH 2/2] Update AddAnime.py
---
youtube_dl/extractor/AddAnime.py | 25 +++++++++++--------------
1 file changed, 11 insertions(+), 14 deletions(-)
diff --git a/youtube_dl/extractor/AddAnime.py b/youtube_dl/extractor/AddAnime.py
index 43b0b24fe..a312fa97e 100644
--- a/youtube_dl/extractor/AddAnime.py
+++ b/youtube_dl/extractor/AddAnime.py
@@ -1,11 +1,6 @@
import re
from .common import InfoExtractor
-from ..utils import (
- ExtractorError,
-)
-from bs4 import BeautifulSoup
-
class AddAnimeIE(InfoExtractor):
@@ -17,7 +12,6 @@ class AddAnimeIE(InfoExtractor):
u'md5': u'0813c2430bea7a46bf13acf3406992f4',
u'info_dict': {
u"description": u"One Piece 606",
- u"uploader": u"mugiwaraQ8",
u"title": u"One Piece 606"
}
}
@@ -31,24 +25,27 @@ class AddAnimeIE(InfoExtractor):
webpage = self._download_webpage(url, video_id)
- video_url = self._search_regex(r'var normal_video_file = "(.*?)",',
- webpage, u'video URL')
+
+ def find_between( webpage, first, last ):
+ try:
+ start = webpage.index( first ) + len( first )
+ end = webpage.index( last, start )
+ return webpage[start:end]
+ except ValueError:
+ return ""
+
+ video_url = find_between( webpage, "var normal_video_file = '", "';" )
video_title = self._og_search_title(webpage)
video_description = self._og_search_description(webpage)
-
- soup = BeautifulSoup(webpage)
-
- video_uploader= soup.find("meta", {"author":""})['content']
info = {
'id': video_id,
'url': video_url,
'ext': 'flv',
'title': video_title,
- 'description': video_description,
- 'uploader': video_uploader
+ 'description': video_description
}
return [info]