diff --git a/.mailmap b/.mailmap index 260770b8..e19cc5cc 100644 --- a/.mailmap +++ b/.mailmap @@ -8,5 +8,5 @@ John Bäckstrand Alli Witheford Alexandre Petitjean Alexandre Petitjean -Javier Domingo Cansino +Javier Domingo Cansino Lasse Bigum diff --git a/.travis.yml b/.travis.yml index b793e530..8e991c3e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ install: - "wget -O - http://apt.mopidy.com/mopidy.gpg | sudo apt-key add -" - "sudo wget -O /etc/apt/sources.list.d/mopidy.list http://apt.mopidy.com/mopidy.list" - "sudo apt-get update || true" - - "sudo apt-get install $(apt-cache depends mopidy | awk '$2 !~ /mopidy/ {print $2}')" + - "sudo apt-get install $(apt-cache depends mopidy | awk '$2 !~ /mopidy|python:any/ {print $2}')" - "pip install coveralls flake8" before_script: diff --git a/AUTHORS b/AUTHORS index e59b92e2..8269452d 100644 --- a/AUTHORS +++ b/AUTHORS @@ -24,6 +24,8 @@ - Alli Witheford - Alexandre Petitjean - Terje Larsen -- Javier Domingo Cansino +- Javier Domingo Cansino - Pavol Babincak +- Javier Domingo - Lasse Bigum +- David Eisner diff --git a/docs/authors.rst b/docs/authors.rst index 33a25bc1..54ba95af 100644 --- a/docs/authors.rst +++ b/docs/authors.rst @@ -4,7 +4,13 @@ Authors ******* -Contributors to Mopidy in the order of appearance: +Mopidy is copyright 2009-2013 Stein Magnus Jodal and contributors. Mopidy is +licensed under the `Apache License, Version 2.0 +`_. + +The following persons have contributed to Mopidy. The list is in the order of +first contribution. For details on who have contributed what, please refer to +our Git repository. .. include:: ../AUTHORS diff --git a/docs/changelog.rst b/docs/changelog.rst index e45381a7..727c7885 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -4,6 +4,71 @@ Changelog This changelog is used to track all major changes to Mopidy. + +v0.17.0 (UNRELEASED) +==================== + +**Core** + +- The search field ``track`` has been renamed to ``track_name`` to avoid + confusion with ``track_no``. (Fixes: :issue:`535`) + +**Local backend** + +- Library scanning has been switched back to custom code due to various issues + with GStreamer's built in scanner in 0.10. This also fixes the scanner + slowdown. (Fixes: :issue:`565`) + +- When scanning, we no longer default the album artist to be the same as the + track artist. Album artist is now only populated if the scanned file got an + explicit album artist set. + +- The scanner will now extract multiple artists from files with multiple artist + tags. + +- Fix scanner so that time of last modification is respected when deciding + which files can be skipped. + +**MPD frontend** + +- The MPD service is now published as a Zeroconf service if avahi-daemon is + running on the system. Some MPD clients will use this to present Mopidy as an + available server on the local network without needing any configuration. See + the :confval:`mpd/zeroconf` config value to change the service name or + disable the service. (Fixes: :issue:`39`) + +**HTTP frontend** + +- The HTTP service is now published as a Zeroconf service if avahi-daemon is + running on the system. Some browsers will present HTTP Zeroconf services on + the local network as "local sites" bookmarks. See the + :confval:`http/zeroconf` config value to change the service name or disable + the service. (Fixes: :issue:`39`) + + +v0.16.1 (2013-11-02) +==================== + +This is very small release to get Mopidy's Debian package ready for inclusion +in Debian. + +**Commands** + +- Fix removal of last dir level in paths to dependencies in + ``mopidy --show-deps`` output. + +- Add manpages for all commands. + +**Local backend** + +- Fix search filtering by track number that was added in 0.16.0. + +**MPD frontend** + +- Add support for ``list "albumartist" ...`` which was missed when ``find`` and + ``search`` learned to handle ``albumartist`` in 0.16.0. (Fixes: :issue:`553`) + + v0.16.0 (2013-10-27) ==================== diff --git a/docs/commands/index.rst b/docs/commands/index.rst new file mode 100644 index 00000000..bc169465 --- /dev/null +++ b/docs/commands/index.rst @@ -0,0 +1,13 @@ +.. _commands: + +******** +Commands +******** + +Mopidy comes with the following commands: + +.. toctree:: + :maxdepth: 1 + :glob: + + ** diff --git a/docs/commands/mopidy-convert-config.rst b/docs/commands/mopidy-convert-config.rst new file mode 100644 index 00000000..66876556 --- /dev/null +++ b/docs/commands/mopidy-convert-config.rst @@ -0,0 +1,98 @@ +.. _mopidy-convert-config: + +***************************** +mopidy-convert-config command +***************************** + +Synopsis +======== + +mopidy-convert-config + + +Description +=========== + +Mopidy is a music server which can play music both from multiple sources, like +your local hard drive, radio streams, and from Spotify and SoundCloud. Searches +combines results from all music sources, and you can mix tracks from all +sources in your play queue. Your playlists from Spotify or SoundCloud are also +available for use. + +The ``mopidy-convert-config`` command is used to convert ``settings.py`` +configuration files used by ``mopidy`` < 0.14 to the ``mopidy.conf`` config +file used by ``mopidy`` >= 0.14. + + +Options +======= + +.. program:: mopidy-convert-config + +This program does not take any options. It looks for the pre-0.14 settings file +at ``$XDG_CONFIG_DIR/mopidy/settings.py``, and if it exists it converts it and +ouputs a Mopidy 0.14 compatible ini-format configuration. If you don't already +have a config file at ``$XDG_CONFIG_DIR/mopidy/mopidy.conf``, you're asked if +you want to save the converted config to that file. + + +Example +======= + +Given the following contents in ``~/.config/mopidy/settings.py``: + +:: + + LOCAL_MUSIC_PATH = u'~/music' + MPD_SERVER_HOSTNAME = u'::' + SPOTIFY_PASSWORD = u'secret' + SPOTIFY_USERNAME = u'alice' + +Running ``mopidy-convert-config`` will convert the config and create a new +``mopidy.conf`` config file: + +.. code-block:: none + + $ mopidy-convert-config + Checking /home/alice/.config/mopidy/settings.py + Converted config: + + [spotify] + username = alice + password = ******** + + [mpd] + hostname = :: + + [local] + media_dir = ~/music + + Write new config to /home/alice/.config/mopidy/mopidy.conf? [yN] y + Done. + +Contents of ``~/.config/mopidy/mopidy.conf`` after the conversion: + +.. code-block:: ini + + [spotify] + username = alice + password = secret + + [mpd] + hostname = :: + + [local] + media_dir = ~/music + + +See also +======== + +:ref:`mopidy(1) ` + + +Reporting bugs +============== + +Report bugs to Mopidy's issue tracker at + diff --git a/docs/commands/mopidy-scan.rst b/docs/commands/mopidy-scan.rst new file mode 100644 index 00000000..e8c25f77 --- /dev/null +++ b/docs/commands/mopidy-scan.rst @@ -0,0 +1,59 @@ +.. _mopidy-scan-cmd: + +******************* +mopidy-scan command +******************* + +Synopsis +======== + +mopidy-scan + [-h] [--version] [-q] [-v] + + +Description +=========== + +Mopidy is a music server which can play music both from multiple sources, like +your local hard drive, radio streams, and from Spotify and SoundCloud. Searches +combines results from all music sources, and you can mix tracks from all +sources in your play queue. Your playlists from Spotify or SoundCloud are also +available for use. + +The ``mopidy-scan`` command is used to index a music library to make it +available for playback with ``mopidy``. + + +Options +======= + +.. program:: mopidy-scan + +.. cmdoption:: --version + + Show Mopidy's version number and exit. + +.. cmdoption:: -h, --help + + Show help message and exit. + +.. cmdoption:: -q, --quiet + + Show less output: warning level and higher. + +.. cmdoption:: -v, --verbose + + Show more output: debug level and higher. + + +See also +======== + +:ref:`mopidy(1) ` + + +Reporting bugs +============== + +Report bugs to Mopidy's issue tracker at + diff --git a/docs/commands/mopidy.rst b/docs/commands/mopidy.rst new file mode 100644 index 00000000..df4766c3 --- /dev/null +++ b/docs/commands/mopidy.rst @@ -0,0 +1,124 @@ +.. _mopidy-cmd: + +************** +mopidy command +************** + +Synopsis +======== + +mopidy + [-h] [--version] [-q] [-v] [--save-debug-log] [--show-config] + [--show-deps] [--config CONFIG_FILES] [-o CONFIG_OVERRIDES] + + +Description +=========== + +Mopidy is a music server which can play music both from multiple sources, like +your local hard drive, radio streams, and from Spotify and SoundCloud. Searches +combines results from all music sources, and you can mix tracks from all +sources in your play queue. Your playlists from Spotify or SoundCloud are also +available for use. + +The ``mopidy`` command is used to start the server. + + +Options +======= + +.. program:: mopidy + +.. cmdoption:: -h, --help + + Show help message and exit. + +.. cmdoption:: --version + + Show Mopidy's version number and exit. + +.. cmdoption:: -q, --quiet + + Show less output: warning level and higher. + +.. cmdoption:: -v, --verbose + + Show more output: debug level and higher. + +.. cmdoption:: --save-debug-log + + Save debug log to the file specified in the :confval:`logging/debug_file` + config value, typically ``./mopidy.log``. + +.. cmdoption:: --show-config + + Show the current effective config. All configuration sources are merged + together to show the effective document. Secret values like passwords are + masked out. Config for disabled extensions are not included. + +.. cmdoption:: --show-deps + + Show dependencies, their versions and installation location. + +.. cmdoption:: --config + + Specify config file to use. To use multiple config files, separate them + with colon. The later files override the earlier ones if there's a + conflict. + +.. cmdoption:: -o