Merge branch 'develop' into feature/extension-registry

Conflicts:
	setup.py

MANIFEST.in

@@ -7,6 +7,6 @@ recursive-include docs *
 prune docs/_build
 
 recursive-include mopidy *.conf
-recursive-include mopidy/frontends/http/data *
+recursive-include mopidy/http/data *
 recursive-include tests *.py
 recursive-include tests/data *

README.rst

@@ -40,3 +40,7 @@ To get started with Mopidy, check out `the docs <http://docs.mopidy.com/>`_.
 .. image:: https://coveralls.io/repos/mopidy/mopidy/badge.png?branch=develop
    :target: https://coveralls.io/r/mopidy/mopidy?branch=develop
    :alt: Test coverage
+   
+.. image:: https://sourcegraph.com/api/repos/github.com/mopidy/mopidy/counters/views-24h.png
+   :target: https://sourcegraph.com/github.com/mopidy/mopidy
+   :alt: Mopidy stats

docs/api/core.rst

@@ -8,8 +8,8 @@ Core API
     :synopsis: Core API for use by frontends
 
 The core API is the interface that is used by frontends like
-:mod:`mopidy.frontends.mpd`. The core layer is inbetween the frontends and the
-backends.
+:mod:`mopidy.http` and :mod:`mopidy.mpd`. The core layer is inbetween the
+frontends and the backends.
 
 .. autoclass:: mopidy.core.Core
     :members:

docs/api/frontends.rst

@@ -47,5 +47,5 @@ The following requirements applies to any frontend implementation:
 Frontend implementations
 ========================
 
-* :mod:`mopidy.frontends.http`
-* :mod:`mopidy.frontends.mpd`
+* :mod:`mopidy.http`
+* :mod:`mopidy.mpd`

docs/api/http.rst

@@ -113,8 +113,8 @@ HTML file:
 If you don't use Mopidy to host your web client, you can find the JS files in
 the Git repo at:
 
-- ``mopidy/frontends/http/data/mopidy.js``
-- ``mopidy/frontends/http/data/mopidy.min.js``
+- ``mopidy/http/data/mopidy.js``
+- ``mopidy/http/data/mopidy.min.js``
 
 
 Getting the library for Node.js use

docs/changelog.rst

@@ -12,6 +12,9 @@ v0.18.0 (UNRELEASED)
 - Expose :meth:`mopidy.core.Core.version` for HTTP clients to manage
   compatibility between API versions. (Fixes: :issue:`597`)
 
+- Add :class:`mopidy.models.Ref` class for use as a lightweight reference to
+  other model types, containing just an URI, a name, and an object type.
+
 **Pluggable local libraries**
 
 Fixes issues :issue:`44`, partially resolves :issue:`397`, and causes

docs/ext/http.rst

@@ -9,12 +9,6 @@ from a web based client. See :ref:`http-api` for details on how to integrate
 with Mopidy over HTTP.
 
 
-Known issues
-============
-
-https://github.com/mopidy/mopidy/issues?labels=HTTP+frontend
-
-
 Dependencies
 ============
 
@@ -32,7 +26,7 @@ install Mopidy with the extra dependencies for required for Mopidy-HTTP::
 Default configuration
 =====================
 
-.. literalinclude:: ../../mopidy/frontends/http/ext.conf
+.. literalinclude:: ../../mopidy/http/ext.conf
     :language: ini
 
 

docs/ext/mpd.rst

@@ -12,8 +12,7 @@ server project <http://mpd.wikia.com/>`_. Mopidy does not depend on the
 original MPD server, but implements the MPD protocol itself, and is thus
 compatible with clients for the original MPD server.
 
-For more details on our MPD server implementation, see
-:mod:`mopidy.frontends.mpd`.
+For more details on our MPD server implementation, see :mod:`mopidy.mpd`.
 
 
 Known issues
@@ -54,7 +53,7 @@ None. The extension just needs Mopidy.
 Default configuration
 =====================
 
-.. literalinclude:: ../../mopidy/frontends/mpd/ext.conf
+.. literalinclude:: ../../mopidy/mpd/ext.conf
     :language: ini
 
 

docs/modules/mpd.rst

@@ -1,17 +1,17 @@
 *****************************************
-:mod:`mopidy.frontends.mpd` -- MPD server
+:mod:`mopidy.mpd` -- MPD server
 *****************************************
 
 For details on how to use Mopidy's MPD server, see :ref:`ext-mpd`.
 
-.. automodule:: mopidy.frontends.mpd
+.. automodule:: mopidy.mpd
     :synopsis: MPD server frontend
 
 
 MPD dispatcher
 ==============
 
-.. automodule:: mopidy.frontends.mpd.dispatcher
+.. automodule:: mopidy.mpd.dispatcher
     :synopsis: MPD request dispatcher
     :members:
 
@@ -19,7 +19,7 @@ MPD dispatcher
 MPD protocol
 ============
 
-.. automodule:: mopidy.frontends.mpd.protocol
+.. automodule:: mopidy.mpd.protocol
     :synopsis: MPD protocol
     :members:
 
@@ -27,7 +27,7 @@ MPD protocol
 Audio output
 ------------
 
-.. automodule:: mopidy.frontends.mpd.protocol.audio_output
+.. automodule:: mopidy.mpd.protocol.audio_output
     :synopsis: MPD protocol: audio output
     :members:
 
@@ -35,7 +35,7 @@ Audio output
 Channels
 --------
 
-.. automodule:: mopidy.frontends.mpd.protocol.channels
+.. automodule:: mopidy.mpd.protocol.channels
     :synopsis: MPD protocol: channels -- client to client communication
     :members:
 
@@ -43,7 +43,7 @@ Channels
 Command list
 ------------
 
-.. automodule:: mopidy.frontends.mpd.protocol.command_list
+.. automodule:: mopidy.mpd.protocol.command_list
     :synopsis: MPD protocol: command list
     :members:
 
@@ -51,7 +51,7 @@ Command list
 Connection
 ----------
 
-.. automodule:: mopidy.frontends.mpd.protocol.connection
+.. automodule:: mopidy.mpd.protocol.connection
     :synopsis: MPD protocol: connection
     :members:
 
@@ -59,7 +59,7 @@ Connection
 Current playlist
 ----------------
 
-.. automodule:: mopidy.frontends.mpd.protocol.current_playlist
+.. automodule:: mopidy.mpd.protocol.current_playlist
     :synopsis: MPD protocol: current playlist
     :members:
 
@@ -67,7 +67,7 @@ Current playlist
 Music database
 --------------
 
-.. automodule:: mopidy.frontends.mpd.protocol.music_db
+.. automodule:: mopidy.mpd.protocol.music_db
     :synopsis: MPD protocol: music database
     :members:
 
@@ -75,7 +75,7 @@ Music database
 Playback
 --------
 
-.. automodule:: mopidy.frontends.mpd.protocol.playback
+.. automodule:: mopidy.mpd.protocol.playback
     :synopsis: MPD protocol: playback
     :members:
 
@@ -83,7 +83,7 @@ Playback
 Reflection
 ----------
 
-.. automodule:: mopidy.frontends.mpd.protocol.reflection
+.. automodule:: mopidy.mpd.protocol.reflection
     :synopsis: MPD protocol: reflection
     :members:
 
@@ -91,7 +91,7 @@ Reflection
 Status
 ------
 
-.. automodule:: mopidy.frontends.mpd.protocol.status
+.. automodule:: mopidy.mpd.protocol.status
     :synopsis: MPD protocol: status
     :members:
 
@@ -99,7 +99,7 @@ Status
 Stickers
 --------
 
-.. automodule:: mopidy.frontends.mpd.protocol.stickers
+.. automodule:: mopidy.mpd.protocol.stickers
     :synopsis: MPD protocol: stickers
     :members:
 
@@ -107,6 +107,6 @@ Stickers
 Stored playlists
 ----------------
 
-.. automodule:: mopidy.frontends.mpd.protocol.stored_playlists
+.. automodule:: mopidy.mpd.protocol.stored_playlists
     :synopsis: MPD protocol: stored playlists
     :members:

js/Gruntfile.js

@@ -11,8 +11,8 @@ module.exports = function (grunt) {
                 " * Licensed under the Apache License, Version 2.0 */\n",
             files: {
                 own: ["Gruntfile.js", "src/**/*.js", "test/**/*-test.js"],
-                concat: "../mopidy/frontends/http/data/mopidy.js",
-                minified: "../mopidy/frontends/http/data/mopidy.min.js"
+                concat: "../mopidy/http/data/mopidy.js",
+                minified: "../mopidy/http/data/mopidy.min.js"
             }
         },
         buster: {

js/README.md

@@ -21,8 +21,8 @@ You may need to adjust hostname and port for your local setup.
 
 In the source repo, you can find the files at:
 
-- `mopidy/frontends/http/data/mopidy.js`
-- `mopidy/frontends/http/data/mopidy.min.js`
+- `mopidy/http/data/mopidy.js`
+- `mopidy/http/data/mopidy.min.js`
 
 
 Getting it for Node.js use
@@ -72,7 +72,7 @@ To run tests automatically when you save a file:
     npm start
 
 To run tests, concatenate, minify the source, and update the JavaScript files
-in `mopidy/frontends/http/data/`:
+in `mopidy/http/data/`:
 
     npm run-script build
 

mopidy/http/actor.py

@@ -14,7 +14,7 @@ from mopidy.core import CoreListener
 from . import ws
 
 
-logger = logging.getLogger('mopidy.frontends.http')
+logger = logging.getLogger('mopidy.http')
 
 
 class HttpFrontend(pykka.ThreadingActor, CoreListener):

mopidy/http/ws.py

@@ -9,7 +9,7 @@ from mopidy import core, models
 from mopidy.utils import jsonrpc
 
 
-logger = logging.getLogger('mopidy.frontends.http')
+logger = logging.getLogger('mopidy.http')
 
 
 class WebSocketResource(object):

mopidy/mpd/actor.py

@@ -7,10 +7,10 @@ import pykka
 
 from mopidy import zeroconf
 from mopidy.core import CoreListener
-from mopidy.frontends.mpd import session
+from mopidy.mpd import session
 from mopidy.utils import encoding, network, process
 
-logger = logging.getLogger('mopidy.frontends.mpd')
+logger = logging.getLogger('mopidy.mpd')
 
 
 class MpdFrontend(pykka.ThreadingActor, CoreListener):

mopidy/mpd/dispatcher.py

@@ -5,9 +5,9 @@ import re
 
 import pykka
 
-from mopidy.frontends.mpd import exceptions, protocol
+from mopidy.mpd import exceptions, protocol
 
-logger = logging.getLogger('mopidy.frontends.mpd.dispatcher')
+logger = logging.getLogger('mopidy.mpd.dispatcher')
 
 protocol.load_protocol_modules()
 
@@ -221,7 +221,7 @@ class MpdContext(object):
     #: The current :class:`MpdDispatcher`.
     dispatcher = None
 
-    #: The current :class:`mopidy.frontends.mpd.MpdSession`.
+    #: The current :class:`mopidy.mpd.MpdSession`.
     session = None
 
     #: The Mopidy configuration.

mopidy/mpd/protocol/audio_output.py

@@ -1,7 +1,7 @@
 from __future__ import unicode_literals
 
-from mopidy.frontends.mpd.exceptions import MpdNoExistError
-from mopidy.frontends.mpd.protocol import handle_request
+from mopidy.mpd.exceptions import MpdNoExistError
+from mopidy.mpd.protocol import handle_request
 
 
 @handle_request(r'disableoutput\ "(?P<outputid>\d+)"$')

mopidy/mpd/protocol/channels.py

@@ -1,7 +1,7 @@
 from __future__ import unicode_literals
 
-from mopidy.frontends.mpd.protocol import handle_request
-from mopidy.frontends.mpd.exceptions import MpdNotImplemented
+from mopidy.mpd.protocol import handle_request
+from mopidy.mpd.exceptions import MpdNotImplemented
 
 
 @handle_request(r'subscribe\ "(?P<channel>[A-Za-z0-9:._-]+)"$')

mopidy/mpd/protocol/command_list.py

@@ -1,7 +1,7 @@
 from __future__ import unicode_literals
 
-from mopidy.frontends.mpd.protocol import handle_request
-from mopidy.frontends.mpd.exceptions import MpdUnknownCommand
+from mopidy.mpd.protocol import handle_request
+from mopidy.mpd.exceptions import MpdUnknownCommand
 
 
 @handle_request(r'command_list_begin$')

mopidy/mpd/protocol/connection.py

@@ -1,7 +1,7 @@
 from __future__ import unicode_literals
 
-from mopidy.frontends.mpd.protocol import handle_request
-from mopidy.frontends.mpd.exceptions import (
+from mopidy.mpd.protocol import handle_request
+from mopidy.mpd.exceptions import (
     MpdPasswordError, MpdPermissionError)
 
 

mopidy/mpd/protocol/current_playlist.py

@@ -1,9 +1,9 @@
 from __future__ import unicode_literals
 
-from mopidy.frontends.mpd import translator
-from mopidy.frontends.mpd.exceptions import (
+from mopidy.mpd import translator
+from mopidy.mpd.exceptions import (
     MpdArgError, MpdNoExistError, MpdNotImplemented)
-from mopidy.frontends.mpd.protocol import handle_request
+from mopidy.mpd.protocol import handle_request
 
 
 @handle_request(r'add\ "(?P<uri>[^"]*)"$')

mopidy/mpd/protocol/empty.py

@@ -1,6 +1,6 @@
 from __future__ import unicode_literals
 
-from mopidy.frontends.mpd.protocol import handle_request
+from mopidy.mpd.protocol import handle_request
 
 
 @handle_request(r'[\ ]*$')

mopidy/mpd/protocol/music_db.py

@@ -5,9 +5,9 @@ import itertools
 import re
 
 from mopidy.models import Track
-from mopidy.frontends.mpd import translator
-from mopidy.frontends.mpd.exceptions import MpdArgError, MpdNotImplemented
-from mopidy.frontends.mpd.protocol import handle_request, stored_playlists
+from mopidy.mpd import translator
+from mopidy.mpd.exceptions import MpdArgError, MpdNotImplemented
+from mopidy.mpd.protocol import handle_request, stored_playlists
 
 
 LIST_QUERY = r"""

mopidy/mpd/protocol/playback.py

@@ -1,8 +1,8 @@
 from __future__ import unicode_literals
 
 from mopidy.core import PlaybackState
-from mopidy.frontends.mpd.protocol import handle_request
-from mopidy.frontends.mpd.exceptions import (
+from mopidy.mpd.protocol import handle_request
+from mopidy.mpd.exceptions import (
     MpdArgError, MpdNoExistError, MpdNotImplemented)
 
 

mopidy/mpd/protocol/reflection.py

@@ -1,7 +1,7 @@
 from __future__ import unicode_literals
 
-from mopidy.frontends.mpd.exceptions import MpdPermissionError
-from mopidy.frontends.mpd.protocol import handle_request, mpd_commands
+from mopidy.mpd.exceptions import MpdPermissionError
+from mopidy.mpd.protocol import handle_request, mpd_commands
 
 
 @handle_request(r'config$', auth_required=False)

mopidy/mpd/protocol/status.py

@@ -3,9 +3,9 @@ from __future__ import unicode_literals
 import pykka
 
 from mopidy.core import PlaybackState
-from mopidy.frontends.mpd.exceptions import MpdNotImplemented
-from mopidy.frontends.mpd.protocol import handle_request
-from mopidy.frontends.mpd.translator import track_to_mpd_format
+from mopidy.mpd.exceptions import MpdNotImplemented
+from mopidy.mpd.protocol import handle_request
+from mopidy.mpd.translator import track_to_mpd_format
 
 #: Subsystems that can be registered with idle command.
 SUBSYSTEMS = [

mopidy/mpd/protocol/stickers.py

@@ -1,7 +1,7 @@
 from __future__ import unicode_literals
 
-from mopidy.frontends.mpd.protocol import handle_request
-from mopidy.frontends.mpd.exceptions import MpdNotImplemented
+from mopidy.mpd.protocol import handle_request
+from mopidy.mpd.exceptions import MpdNotImplemented
 
 
 @handle_request(

mopidy/mpd/protocol/stored_playlists.py

@@ -2,9 +2,9 @@ from __future__ import unicode_literals
 
 import datetime as dt
 
-from mopidy.frontends.mpd.exceptions import MpdNoExistError, MpdNotImplemented
-from mopidy.frontends.mpd.protocol import handle_request
-from mopidy.frontends.mpd.translator import playlist_to_mpd_format
+from mopidy.mpd.exceptions import MpdNoExistError, MpdNotImplemented
+from mopidy.mpd.protocol import handle_request
+from mopidy.mpd.translator import playlist_to_mpd_format
 
 
 @handle_request(r'listplaylist\ ("?)(?P<name>[^"]+)\1$')

mopidy/mpd/session.py

@@ -2,10 +2,10 @@ from __future__ import unicode_literals
 
 import logging
 
-from mopidy.frontends.mpd import dispatcher, protocol
+from mopidy.mpd import dispatcher, protocol
 from mopidy.utils import formatting, network
 
-logger = logging.getLogger('mopidy.frontends.mpd')
+logger = logging.getLogger('mopidy.mpd')
 
 
 class MpdSession(network.LineProtocol):

mopidy/mpd/translator.py

@@ -2,7 +2,7 @@ from __future__ import unicode_literals
 
 import shlex
 
-from mopidy.frontends.mpd.exceptions import MpdArgError
+from mopidy.mpd.exceptions import MpdArgError
 from mopidy.models import TlTrack
 
 # TODO: special handling of local:// uri scheme

setup.py

@@ -41,9 +41,9 @@ setup(
             'mopidy-convert-config = mopidy.config.convert:main',
         ],
         'mopidy.ext': [
-            'http = mopidy.frontends.http:Extension [http]',
+            'http = mopidy.http:Extension [http]',
             'local = mopidy.backends.local:Extension',
-            'mpd = mopidy.frontends.mpd:Extension',
+            'mpd = mopidy.mpd:Extension',
             'stream = mopidy.backends.stream:Extension',
         ],
     },

tests/frontends/__init__.py

@@ -1 +0,0 @@
-from __future__ import unicode_literals

tests/frontends/mpd/__init__.py

@@ -1 +0,0 @@
-from __future__ import unicode_literals

tests/http/events_test.py

@@ -15,7 +15,7 @@ except ImportError:
     ws4py = False
 
 if cherrypy and ws4py:
-    from mopidy.frontends.http import actor
+    from mopidy.http import actor
 
 
 @unittest.skipUnless(cherrypy, 'cherrypy not found')

tests/mpd/dispatcher_test.py

@@ -6,9 +6,9 @@ import pykka
 
 from mopidy import core
 from mopidy.backends import dummy
-from mopidy.frontends.mpd.dispatcher import MpdDispatcher
-from mopidy.frontends.mpd.exceptions import MpdAckError
-from mopidy.frontends.mpd.protocol import request_handlers, handle_request
+from mopidy.mpd.dispatcher import MpdDispatcher
+from mopidy.mpd.exceptions import MpdAckError
+from mopidy.mpd.protocol import request_handlers, handle_request
 
 
 class MpdDispatcherTest(unittest.TestCase):

tests/mpd/exception_test.py

@@ -2,7 +2,7 @@ from __future__ import unicode_literals
 
 import unittest
 
-from mopidy.frontends.mpd.exceptions import (
+from mopidy.mpd.exceptions import (
     MpdAckError, MpdPermissionError, MpdUnknownCommand, MpdSystemError,
     MpdNotImplemented)
 

tests/mpd/protocol/__init__.py

@@ -7,7 +7,7 @@ import pykka
 
 from mopidy import core
 from mopidy.backends import dummy
-from mopidy.frontends.mpd import session
+from mopidy.mpd import session
 
 
 class MockConnection(mock.Mock):

tests/mpd/protocol/audio_output_test.py

@@ -1,6 +1,6 @@
 from __future__ import unicode_literals
 
-from tests.frontends.mpd import protocol
+from tests.mpd import protocol
 
 
 class AudioOutputHandlerTest(protocol.BaseTestCase):

tests/mpd/protocol/authentication_test.py

@@ -1,6 +1,6 @@
 from __future__ import unicode_literals
 
-from tests.frontends.mpd import protocol
+from tests.mpd import protocol
 
 
 class AuthenticationActiveTest(protocol.BaseTestCase):

tests/mpd/protocol/channels_test.py

@@ -1,6 +1,6 @@
 from __future__ import unicode_literals
 
-from tests.frontends.mpd import protocol
+from tests.mpd import protocol
 
 
 class ChannelsHandlerTest(protocol.BaseTestCase):

tests/mpd/protocol/command_list_test.py

@@ -1,6 +1,6 @@
 from __future__ import unicode_literals
 
-from tests.frontends.mpd import protocol
+from tests.mpd import protocol
 
 
 class CommandListsTest(protocol.BaseTestCase):

tests/mpd/protocol/connection_test.py

@@ -2,7 +2,7 @@ from __future__ import unicode_literals
 
 from mock import patch
 
-from tests.frontends.mpd import protocol
+from tests.mpd import protocol
 
 
 class ConnectionHandlerTest(protocol.BaseTestCase):

tests/mpd/protocol/current_playlist_test.py

@@ -2,7 +2,7 @@ from __future__ import unicode_literals
 
 from mopidy.models import Track
 
-from tests.frontends.mpd import protocol
+from tests.mpd import protocol
 
 
 class CurrentPlaylistHandlerTest(protocol.BaseTestCase):

tests/mpd/protocol/idle_test.py

@@ -2,9 +2,9 @@ from __future__ import unicode_literals
 
 from mock import patch
 
-from mopidy.frontends.mpd.protocol.status import SUBSYSTEMS
+from mopidy.mpd.protocol.status import SUBSYSTEMS
 
-from tests.frontends.mpd import protocol
+from tests.mpd import protocol
 
 
 class IdleHandlerTest(protocol.BaseTestCase):

tests/mpd/protocol/music_db_test.py

@@ -2,10 +2,10 @@ from __future__ import unicode_literals
 
 import unittest
 
-from mopidy.frontends.mpd.protocol import music_db
+from mopidy.mpd.protocol import music_db
 from mopidy.models import Album, Artist, SearchResult, Track
 
-from tests.frontends.mpd import protocol
+from tests.mpd import protocol
 
 
 class QueryFromMpdSearchFormatTest(unittest.TestCase):

tests/mpd/protocol/playback_test.py

@@ -5,7 +5,7 @@ import unittest
 from mopidy.core import PlaybackState
 from mopidy.models import Track
 
-from tests.frontends.mpd import protocol
+from tests.mpd import protocol
 
 
 PAUSED = PlaybackState.PAUSED

tests/mpd/protocol/reflection_test.py

@@ -1,6 +1,6 @@
 from __future__ import unicode_literals
 
-from tests.frontends.mpd import protocol
+from tests.mpd import protocol
 
 
 class ReflectionHandlerTest(protocol.BaseTestCase):

tests/mpd/protocol/regression_test.py

@@ -4,7 +4,7 @@ import random
 
 from mopidy.models import Track
 
-from tests.frontends.mpd import protocol
+from tests.mpd import protocol
 
 
 class IssueGH17RegressionTest(protocol.BaseTestCase):

tests/mpd/protocol/status_test.py

@@ -2,7 +2,7 @@ from __future__ import unicode_literals
 
 from mopidy.models import Track
 
-from tests.frontends.mpd import protocol
+from tests.mpd import protocol
 
 
 class StatusHandlerTest(protocol.BaseTestCase):

tests/mpd/protocol/stickers_test.py

@@ -1,6 +1,6 @@
 from __future__ import unicode_literals
 
-from tests.frontends.mpd import protocol
+from tests.mpd import protocol
 
 
 class StickersHandlerTest(protocol.BaseTestCase):

tests/mpd/protocol/stored_playlists_test.py

@@ -4,7 +4,7 @@ import datetime
 
 from mopidy.models import Track, Playlist
 
-from tests.frontends.mpd import protocol
+from tests.mpd import protocol
 
 
 class PlaylistsHandlerTest(protocol.BaseTestCase):

tests/mpd/status_test.py

@@ -7,8 +7,8 @@ import pykka
 from mopidy import core
 from mopidy.backends import dummy
 from mopidy.core import PlaybackState
-from mopidy.frontends.mpd import dispatcher
-from mopidy.frontends.mpd.protocol import status
+from mopidy.mpd import dispatcher
+from mopidy.mpd.protocol import status
 from mopidy.models import Track
 
 

tests/mpd/translator_test.py

@@ -4,7 +4,7 @@ import datetime
 import unittest
 
 from mopidy.utils.path import mtime
-from mopidy.frontends.mpd import translator
+from mopidy.mpd import translator
 from mopidy.models import Album, Artist, TlTrack, Playlist, Track