From 6bd7fb9df5f2b6f4e01d820888a7cc959b3f82cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A9stin=20Reed?= <trox1972@users.noreply.github.com>
Date: Sat, 1 Oct 2016 15:12:45 +0200
Subject: [PATCH] [freesound] Improve metadata extraction

---
 youtube_dl/extractor/freesound.py | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/youtube_dl/extractor/freesound.py b/youtube_dl/extractor/freesound.py
index 5ff62af2a..08960823b 100644
--- a/youtube_dl/extractor/freesound.py
+++ b/youtube_dl/extractor/freesound.py
@@ -3,6 +3,7 @@ from __future__ import unicode_literals
 import re
 
 from .common import InfoExtractor
+from ..utils import get_element_by_id
 
 
 class FreesoundIE(InfoExtractor):
@@ -20,20 +21,18 @@ class FreesoundIE(InfoExtractor):
     }
 
     def _real_extract(self, url):
-        mobj = re.match(self._VALID_URL, url)
-        music_id = mobj.group('id')
+        music_id = self._match_id(url)
         webpage = self._download_webpage(url, music_id)
-        title = self._html_search_regex(
-            r'<div id="single_sample_header">.*?<a href="#">(.+?)</a>',
-            webpage, 'music title', flags=re.DOTALL)
-        description = self._html_search_regex(
-            r'<div id="sound_description">(.*?)</div>', webpage, 'description',
-            fatal=False, flags=re.DOTALL)
+
+        title = self._og_search_property('audio:title', webpage)
+        description = re.sub(r'</?p>', '', get_element_by_id('sound_description',
+            webpage).strip())
 
         return {
             'id': music_id,
             'title': title,
             'url': self._og_search_property('audio', webpage, 'music url'),
-            'uploader': self._og_search_property('audio:artist', webpage, 'music uploader'),
+            'uploader': self._og_search_property('audio:artist', webpage,
+                'music uploader', fatal=False),
             'description': description,
         }