From 2d7ac225673279421b1dcd86acc5e2ea28867870 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Tue, 23 Nov 2010 09:38:47 +0100 Subject: [PATCH 1/4] docs: Update all Git repo references --- README.rst | 6 +++--- docs/changes.rst | 2 +- docs/conf.py | 2 +- docs/development/contributing.rst | 2 +- docs/installation/index.rst | 2 +- mopidy/backends/libspotify/__init__.py | 3 ++- mopidy/backends/local/__init__.py | 2 +- tests/frontends/mpd/regression_test.py | 6 +++--- 8 files changed, 13 insertions(+), 12 deletions(-) diff --git a/README.rst b/README.rst index c6187119..4f31fb59 100644 --- a/README.rst +++ b/README.rst @@ -13,7 +13,7 @@ To install Mopidy, check out * `Documentation (latest release) `_ * `Documentation (development version) `_ -* `Source code `_ -* `Issue tracker `_ +* `Source code `_ +* `Issue tracker `_ * IRC: ``#mopidy`` at `irc.freenode.net `_ -* `Download development snapshot `_ +* `Download development snapshot `_ diff --git a/docs/changes.rst b/docs/changes.rst index eadf8e75..9e895419 100644 --- a/docs/changes.rst +++ b/docs/changes.rst @@ -351,7 +351,7 @@ Mopidy is working and usable. 0.1.0a0 is an alpha release, which basicly means we will still change APIs, add features, etc. before the final 0.1.0 release. But the software is usable as is, so we release it. Please give it a try and give us feedback, either at our IRC channel or through the `issue tracker -`_. Thanks! +`_. Thanks! **Changes** diff --git a/docs/conf.py b/docs/conf.py index d0d8f3af..bb9eb3ba 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -202,4 +202,4 @@ latex_documents = [ needs_sphinx = '1.0' -extlinks = {'issue': ('http://github.com/jodal/mopidy/issues#issue/%s', 'GH-')} +extlinks = {'issue': ('http://github.com/mopidy/mopidy/issues#issue/%s', 'GH-')} diff --git a/docs/development/contributing.rst b/docs/development/contributing.rst index 4adde637..a9cd8dc3 100644 --- a/docs/development/contributing.rst +++ b/docs/development/contributing.rst @@ -137,7 +137,7 @@ Then, to generate docs:: .. note:: The documentation at http://www.mopidy.com/ is automatically updated when a - documentation update is pushed to ``jodal/mopidy`` at GitHub. + documentation update is pushed to ``mopidy/mopidy`` at GitHub. Documentation generated from the ``master`` branch is published at http://www.mopidy.com/docs/master/, and will always be valid for the latest diff --git a/docs/installation/index.rst b/docs/installation/index.rst index 9577c383..c3bbddce 100644 --- a/docs/installation/index.rst +++ b/docs/installation/index.rst @@ -88,7 +88,7 @@ development version of Mopidy:: sudo aptitude install git-core # On Ubuntu/Debian sudo brew install git # On OS X - git clone git://github.com/jodal/mopidy.git + git clone git://github.com/mopidy/mopidy.git cd mopidy/ sudo python setup.py install diff --git a/mopidy/backends/libspotify/__init__.py b/mopidy/backends/libspotify/__init__.py index 223d9968..f4087043 100644 --- a/mopidy/backends/libspotify/__init__.py +++ b/mopidy/backends/libspotify/__init__.py @@ -14,7 +14,8 @@ class LibspotifyBackend(BaseBackend): library and the `pyspotify `_ Python bindings for libspotify. - **Issues:** http://github.com/jodal/mopidy/issues/labels/backend-libspotify + **Issues:** + http://github.com/mopidy/mopidy/issues/labels/backend-libspotify **Settings:** diff --git a/mopidy/backends/local/__init__.py b/mopidy/backends/local/__init__.py index e5bfe8f8..bb5e6a5e 100644 --- a/mopidy/backends/local/__init__.py +++ b/mopidy/backends/local/__init__.py @@ -17,7 +17,7 @@ class LocalBackend(BaseBackend): """ A backend for playing music from a local music archive. - **Issues:** http://github.com/jodal/mopidy/issues/labels/backend-local + **Issues:** http://github.com/mopidy/mopidy/issues/labels/backend-local **Settings:** diff --git a/tests/frontends/mpd/regression_test.py b/tests/frontends/mpd/regression_test.py index 3cfdb855..7e7163d8 100644 --- a/tests/frontends/mpd/regression_test.py +++ b/tests/frontends/mpd/regression_test.py @@ -8,7 +8,7 @@ from mopidy.models import Track class IssueGH17RegressionTest(unittest.TestCase): """ - The issue: http://github.com/jodal/mopidy/issues#issue/17 + The issue: http://github.com/mopidy/mopidy/issues#issue/17 How to reproduce: @@ -42,7 +42,7 @@ class IssueGH17RegressionTest(unittest.TestCase): class IssueGH18RegressionTest(unittest.TestCase): """ - The issue: http://github.com/jodal/mopidy/issues#issue/18 + The issue: http://github.com/mopidy/mopidy/issues#issue/18 How to reproduce: @@ -79,7 +79,7 @@ class IssueGH18RegressionTest(unittest.TestCase): class IssueGH22RegressionTest(unittest.TestCase): """ - The issue: http://github.com/jodal/mopidy/issues/#issue/22 + The issue: http://github.com/mopidy/mopidy/issues/#issue/22 How to reproduce: From 71ede1a37b2f17f42d292096b124d846a7908905 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Tue, 28 Dec 2010 15:41:22 +0100 Subject: [PATCH 2/4] Update 0.2.0 docs to recommend libspotify 0.0.6 and mopidy/pyspotify over 0.0.4 and jodal/pyspotify --- docs/installation/libspotify.rst | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/docs/installation/libspotify.rst b/docs/installation/libspotify.rst index b3ea06fa..4860fc4b 100644 --- a/docs/installation/libspotify.rst +++ b/docs/installation/libspotify.rst @@ -22,14 +22,14 @@ install libspotify and `pyspotify `_. Installing libspotify on Linux ============================== -Download and install libspotify 0.0.4 for your OS and CPU architecture from +Download and install libspotify 0.0.6 for your OS and CPU architecture from https://developer.spotify.com/en/libspotify/. For 64-bit Linux the process is as follows:: - wget http://developer.spotify.com/download/libspotify/libspotify-0.0.4-linux6-x86_64.tar.gz - tar zxfv libspotify-0.0.4-linux6-x86_64.tar.gz - cd libspotify-0.0.4-linux6-x86_64/ + wget http://developer.spotify.com/download/libspotify/libspotify-0.0.6-linux6-x86_64.tar.gz + tar zxfv libspotify-0.0.6-linux6-x86_64.tar.gz + cd libspotify-0.0.6-linux6-x86_64/ sudo make install prefix=/usr/local sudo ldconfig @@ -67,16 +67,14 @@ Install pyspotify's dependencies. At Debian/Ubuntu systems:: In OS X no additional dependencies are needed. -Check out the pyspotify code, and install it:: +Get the pyspotify code, and install it:: - git clone git://github.com/jodal/pyspotify.git + wget --no-check-certificate -O pyspotify.tar.gz https://github.com/mopidy/pyspotify/tarball/mopidy + tar zxfv pyspotify.tar.gz cd pyspotify/pyspotify/ - sudo rm -rf build/ # If you are upgrading pyspotify sudo python setup.py install -.. note:: - - The ``sudo rm -rf build/`` step is needed if you are upgrading pyspotify. - Simply running ``python setup.py clean`` will *not* clean out the C parts - of the ``build/`` directory, and you will thus not get any changes to the C - code included in your installation. +It is important that you install pyspotify from the ``mopidy`` branch of the +``mopidy/pyspotify`` repository, as the upstream repository at +``winjer/pyspotify`` is not updated with changes needed to support e.g. +libspotify 0.0.6 and high bitrate audio. From 7dce103d9056d38a6500859a26f54069122db4fc Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Fri, 7 Jan 2011 20:18:40 +0100 Subject: [PATCH 3/4] Fix crash in Last.fm frontend if pylast was not installed or frontend not configured --- mopidy/frontends/lastfm.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mopidy/frontends/lastfm.py b/mopidy/frontends/lastfm.py index e91dd272..c4ea73c4 100644 --- a/mopidy/frontends/lastfm.py +++ b/mopidy/frontends/lastfm.py @@ -54,7 +54,8 @@ class LastfmFrontend(BaseFrontend): self.thread.destroy() def process_message(self, message): - self.connection.send(message) + if self.thread.is_alive(): + self.connection.send(message) class LastfmFrontendThread(BaseThread): @@ -68,7 +69,7 @@ class LastfmFrontendThread(BaseThread): def run_inside_try(self): self.setup() - while True: + while self.scrobbler is not None: self.connection.poll(None) message = self.connection.recv() self.process_message(message) From d32d4b2cad7750c5021428ac958da5025bfd00c1 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Fri, 7 Jan 2011 20:38:48 +0100 Subject: [PATCH 4/4] Release v0.2.1 --- docs/changes.rst | 13 +++++++++++++ mopidy/__init__.py | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/docs/changes.rst b/docs/changes.rst index 9e895419..3232cfcc 100644 --- a/docs/changes.rst +++ b/docs/changes.rst @@ -5,6 +5,19 @@ Changes This change log is used to track all major changes to Mopidy. +0.2.1 (2011-01-07) +================== + +This is a maintenance release without any new features. + +**Bugfixes** + +- Fix crash in :mod:`mopidy.frontends.lastfm` which occurred at playback if + either :mod:`pylast` was not installed or the Last.fm scrobbling was not + correctly configured. The scrobbling thread now shuts properly down at + failure. + + 0.2.0 (2010-10-24) ================== diff --git a/mopidy/__init__.py b/mopidy/__init__.py index 5e1b26de..350fc8d7 100644 --- a/mopidy/__init__.py +++ b/mopidy/__init__.py @@ -3,7 +3,7 @@ if not (2, 6) <= sys.version_info < (3,): sys.exit(u'Mopidy requires Python >= 2.6, < 3') def get_version(): - return u'0.2.0' + return u'0.2.1' class MopidyException(Exception): def __init__(self, message, *args, **kwargs):