andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename m3u conversion helper to parse_m3u

Browse Source
This commit is contained in:
Thomas Adamcik 2010-04-27 21:25:23 +02:00
parent 19fe5d3506
commit d64980411d
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mopidy/backends/gstreamer.py
View File

@ -16,7 +16,7 @@ import threading
from mopidy.backends import *
from mopidy.models import Playlist, Track
from mopidy import settings
from mopidy.utils import m3u_to_uris
from mopidy.utils import parse_m3u
logger = logging.getLogger(u'backends.gstreamer')
@ -127,7 +127,7 @@ class GStreamerStoredPlaylistsController(BaseStoredPlaylistsController):
for m3u in glob.glob(os.path.join(self._folder, '*.m3u')):
name = os.path.basename(m3u)[:len('.m3u')]
track_uris = m3u_to_uris(m3u)
track_uris = parse_m3u(m3u)
tracks = map(lambda u: Track(uri=u), track_uris)
playlist = Playlist(tracks=tracks, name=name)

2
mopidy/utils.py
View File

@ -93,7 +93,7 @@ def spotify_uri_to_int(uri, output_bits=31):
full_id >>= output_bits
return int(compressed_id)
def m3u_to_uris(file_path):
def parse_m3u(file_path):
"""
Convert M3U file list of uris

16
tests/utils_test.py
View File

@ -5,7 +5,7 @@ import tempfile
import unittest
import urllib
from mopidy.utils import m3u_to_uris
from mopidy.utils import parse_m3u
def data(name):
folder = os.path.dirname(__file__)
@ -24,22 +24,22 @@ encoded_uri = 'file://' + urllib.pathname2url(encoded_path.encode('utf-8'))
class M3UToUriTest(unittest.TestCase):
def test_empty_file(self):
uris = m3u_to_uris(data('empty.m3u'))
uris = parse_m3u(data('empty.m3u'))
self.assertEqual([], uris)
def test_basic_file(self):
uris = m3u_to_uris(data('one.m3u'))
uris = parse_m3u(data('one.m3u'))
self.assertEqual([song1_uri], uris)
def test_file_with_comment(self):
uris = m3u_to_uris(data('comment.m3u'))
uris = parse_m3u(data('comment.m3u'))
self.assertEqual([song1_uri], uris)
def test_file_with_absolute_files(self):
with tempfile.NamedTemporaryFile() as file:
file.write(song1_path)
file.flush()
uris = m3u_to_uris(file.name)
uris = parse_m3u(file.name)
self.assertEqual([song1_uri], uris)
def test_file_with_multiple_absolute_files(self):
@ -48,16 +48,16 @@ class M3UToUriTest(unittest.TestCase):
file.write('# comment \n')
file.write(song2_path)
file.flush()
uris = m3u_to_uris(file.name)
uris = parse_m3u(file.name)
self.assertEqual([song1_uri, song2_uri], uris)
def test_file_with_uri(self):
with tempfile.NamedTemporaryFile() as file:
file.write(song1_uri)
file.flush()
uris = m3u_to_uris(file.name)
uris = parse_m3u(file.name)
self.assertEqual([song1_uri], uris)
def test_encoding_is_latin1(self):
uris = m3u_to_uris(data('encoding.m3u'))
uris = parse_m3u(data('encoding.m3u'))
self.assertEqual([encoded_uri], uris)