Rename mopidy.frontends.mpd.{serializer => translator} to match naming in backends.

This commit is contained in:
Johannes Knutsen 2010-08-13 20:48:38 +02:00
parent bb19dda499
commit e1f8a0bf72
6 changed files with 14 additions and 12 deletions

View File

@ -32,6 +32,8 @@ Another great release.
``single`` without quotes to work better with BitMPC.
- Fixed delete current playing track from playlist, which crashed several
clients.
- Rename ``mopidy.frontends.mpd.{serializer => translator}`` to match naming
in backends.
- Backend API:

View File

@ -8,7 +8,7 @@ from mopidy.backends.base.current_playlist import BaseCurrentPlaylistController
from mopidy.backends.base.library import BaseLibraryController
from mopidy.backends.base.playback import BasePlaybackController
from mopidy.backends.base.stored_playlists import BaseStoredPlaylistsController
from mopidy.frontends.mpd import serializer
from mopidy.frontends.mpd import translator
from mopidy.models import Playlist
from mopidy.utils import get_class

View File

@ -2,7 +2,7 @@ from copy import copy
import logging
import random
from mopidy.frontends.mpd import serializer
from mopidy.frontends.mpd import translator
logger = logging.getLogger('mopidy.backends.base')
@ -196,4 +196,4 @@ class BaseCurrentPlaylistController(object):
def mpd_format(self, *args, **kwargs):
"""Not a part of the generic backend API."""
kwargs['cpids'] = [ct[0] for ct in self._cp_tracks]
return serializer.tracks_to_mpd_format(self.tracks, *args, **kwargs)
return translator.tracks_to_mpd_format(self.tracks, *args, **kwargs)

View File

@ -1,6 +1,6 @@
from copy import copy
from mopidy.frontends.mpd import serializer
from mopidy.frontends.mpd import translator
class ImmutableObject(object):
"""
@ -136,7 +136,7 @@ class Track(ImmutableObject):
return list(self._artists)
def mpd_format(self, *args, **kwargs):
return serializer.track_to_mpd_format(self, *args, **kwargs)
return translator.track_to_mpd_format(self, *args, **kwargs)
class Playlist(ImmutableObject):
@ -177,7 +177,7 @@ class Playlist(ImmutableObject):
return len(self._tracks)
def mpd_format(self, *args, **kwargs):
return serializer.playlist_to_mpd_format(self, *args, **kwargs)
return translator.playlist_to_mpd_format(self, *args, **kwargs)
def with_(self, uri=None, name=None, tracks=None, last_modified=None):
"""

View File

@ -1,12 +1,12 @@
import datetime as dt
import unittest
from mopidy.frontends.mpd import serializer
from mopidy.frontends.mpd import translator
from mopidy.models import Album, Artist, Playlist, Track
class TrackMpdFormatTest(unittest.TestCase):
def test_mpd_format_for_empty_track(self):
result = serializer.track_to_mpd_format(Track())
result = translator.track_to_mpd_format(Track())
self.assert_(('file', '') in result)
self.assert_(('Time', 0) in result)
self.assert_(('Artist', '') in result)
@ -25,7 +25,7 @@ class TrackMpdFormatTest(unittest.TestCase):
date=dt.date(1977, 1, 1),
length=137000,
)
result = serializer.track_to_mpd_format(track, position=9, cpid=122)
result = translator.track_to_mpd_format(track, position=9, cpid=122)
self.assert_(('file', 'a uri') in result)
self.assert_(('Time', 137) in result)
self.assert_(('Artist', 'an artist') in result)
@ -38,7 +38,7 @@ class TrackMpdFormatTest(unittest.TestCase):
def test_mpd_format_artists(self):
track = Track(artists=[Artist(name=u'ABBA'), Artist(name=u'Beatles')])
self.assertEqual(serializer.track_artists_to_mpd_format(track),
self.assertEqual(translator.track_artists_to_mpd_format(track),
u'ABBA, Beatles')
@ -46,12 +46,12 @@ class PlaylistMpdFormatTest(unittest.TestCase):
def test_mpd_format(self):
playlist = Playlist(tracks=[
Track(track_no=1), Track(track_no=2), Track(track_no=3)])
result = serializer.playlist_to_mpd_format(playlist)
result = translator.playlist_to_mpd_format(playlist)
self.assertEqual(len(result), 3)
def test_mpd_format_with_range(self):
playlist = Playlist(tracks=[
Track(track_no=1), Track(track_no=2), Track(track_no=3)])
result = serializer.playlist_to_mpd_format(playlist, 1, 2)
result = translator.playlist_to_mpd_format(playlist, 1, 2)
self.assertEqual(len(result), 1)
self.assertEqual(dict(result[0])['Track'], 2)