From 4e16c1f80b009001aaea6f8baca5dfbfa9b58c11 Mon Sep 17 00:00:00 2001
From: Cian Ruane <CianLR@users.noreply.github.com>
Date: Fri, 16 Oct 2015 01:23:09 +0100
Subject: [PATCH] [clyp] Add extractor
Update __init__.py
[clyp.it] Extract ID idiomatically and make duration and description optional
---
youtube_dl/extractor/__init__.py | 1 +
youtube_dl/extractor/clyp.py | 57 ++++++++++++++++++++++++++++++++
2 files changed, 58 insertions(+)
create mode 100644 youtube_dl/extractor/clyp.py
diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
index 6318ac4a2..f98e6487e 100644
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -90,6 +90,7 @@ from .cliphunter import CliphunterIE
from .clipsyndicate import ClipsyndicateIE
from .cloudy import CloudyIE
from .clubic import ClubicIE
+from .clyp import ClypIE
from .cmt import CMTIE
from .cnet import CNETIE
from .cnn import (
diff --git a/youtube_dl/extractor/clyp.py b/youtube_dl/extractor/clyp.py
new file mode 100644
index 000000000..906729b30
--- /dev/null
+++ b/youtube_dl/extractor/clyp.py
@@ -0,0 +1,57 @@
+# coding: utf-8
+
+from __future__ import unicode_literals
+
+import re
+
+from .common import InfoExtractor
+
+
+class ClypIE(InfoExtractor):
+ _VALID_URL = r'https?://(?:www\.)?clyp\.it/(?P<id>[a-z0-9]+)'
+
+ _TESTS = [{
+ 'url': 'https://clyp.it/ojz2wfah',
+ 'md5': '1d4961036c41247ecfdcc439c0cddcbb',
+ 'info_dict': {
+ 'id': 'ojz2wfah',
+ 'ext': 'mp3',
+ 'title': 'Krisson80 - bits wip wip',
+ 'description': '#Krisson80BitsWipWip #chiptune\n#wip',
+ },
+ }, {
+ 'url': 'https://clyp.it/ojz2wfah',
+ 'only_matching': True,
+ }]
+
+ def _real_extract(self, url):
+ audio_id = self._match_id(url)
+ api_url = 'https://api.clyp.it/' + audio_id
+ metadata = self._download_json(api_url, audio_id)
+
+ title = metadata['Title']
+
+ description = None
+ if metadata['Description']: description = metadata['Description']
+
+ duration = None
+ if metadata['Duration']: duration = int(metadata['Duration'])
+
+ formats = [
+ {
+ 'url': metadata['OggUrl'],
+ 'format_id': 'ogg',
+ 'preference': -2
+ },{
+ 'url': metadata['Mp3Url'],
+ 'format_id': 'mp3',
+ 'preference': -1
+ }]
+
+ return {
+ 'id': audio_id,
+ 'title': title,
+ 'formats': formats,
+ 'description': description,
+ 'duration': duration
+ }