From 34a748189583244d4b9ebee18bc7c3a1727beabf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= Date: Mon, 7 Apr 2014 10:25:12 +0200 Subject: [PATCH] radioob: get rid of magic MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Pierre Mazière --- weboob/applications/radioob/radioob.py | 45 ++++++++++++-------------- 1 file changed, 20 insertions(+), 25 deletions(-) diff --git a/weboob/applications/radioob/radioob.py b/weboob/applications/radioob/radioob.py index 00a1e819..300c2b59 100644 --- a/weboob/applications/radioob/radioob.py +++ b/weboob/applications/radioob/radioob.py @@ -22,7 +22,6 @@ import sys import os import re import requests -import magic from weboob.capabilities.radio import ICapRadio, Radio from weboob.capabilities.audio import ICapAudio, BaseAudio @@ -179,30 +178,26 @@ class Radioob(ReplApplication): self.logger.debug(u'You can set the media_player key to the player you prefer in the radioob ' 'configuration file.') - r=requests.get(stream.url, stream=True) - buf=r.iter_content(256).next() - m=magic.open(magic.MIME_TYPE) - m.load() - mime=m.buffer(buf).strip() - if mime == "text/plain" or \ - mime == "audio/x-scpls" or \ - mime == "application/x-mpegurl": - playlistFormat=None - r=requests.get(stream.url, stream=True) - for line in r.iter_lines(): - if playlistFormat is None: - if line == "[playlist]": - playlistFormat = "pls" - elif line == "#EXTM3U": - playlistFormat = "m3u" - elif playlistFormat == "pls": - if line.startswith('File'): - stream.url = line.split('=', 1).pop(1).strip() - break - elif playlistFormat == "m3u": - if line[0] != "#": - stream.url = line.strip(); - break + r = requests.get(stream.url, stream=True) + buf = r.iter_content(512).next() + r.close() + playlistFormat = None + for line in buf.split("\n"): + if playlistFormat is None: + if line == "[playlist]": + playlistFormat = "pls" + elif line == "#EXTM3U": + playlistFormat = "m3u" + else: + break + elif playlistFormat == "pls": + if line.startswith('File'): + stream.url = line.split('=', 1).pop(1).strip() + break + elif playlistFormat == "m3u": + if line[0] != "#": + stream.url = line.strip() + break self.player.play(stream, player_name=player_name, player_args=media_player_args) except (InvalidMediaPlayer, MediaPlayerNotFound) as e: