Fixed mopidy compatibility implementation (Closes #21)

diff --git a/data/man/info.xml b/data/man/info.xml
index 61b84c419a0c0681d50e1eaa2df312d46f02b67f..a67755b7a51c37a03959238e25cf3bd5f651ed9e 100644 (file)
--- a/data/man/info.xml
+++ b/data/man/info.xml
@@ -5,7 +5,7 @@
   <!ENTITY dhemail     "kaliko@azylum.org">
   <!ENTITY dhusername  "&dhfirstname; &dhsurname;">
   <!ENTITY dhpackage "mpd-sima">
-  <!ENTITY release   "0.15.0">
+  <!ENTITY release   "0.15.1">
   <!-- TITLE should be something like "User commands" or similar (see
        http://www.tldp.org/HOWTO/Man-Page/q2.html). -->
   <!ENTITY dhtitle     "&dhpackage; &release; User Manual">

diff --git a/data/man/mpd-sima.1 b/data/man/mpd-sima.1
index 549dbcf978a1b6ad4e5dbd97be5d1dcc0be608d6..e5a9e28af9fdcf2273621018c74f5f38d4c33ce3 100644 (file)
--- a/data/man/mpd-sima.1
+++ b/data/man/mpd-sima.1
@@ -3,11 +3,11 @@
 .\"    Author: Jack Kaliko <kaliko@azylum.org>
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
 .\"      Date: 03/19/2019
-.\"    Manual: mpd-sima 0.15.0 User Manual
+.\"    Manual: mpd-sima 0.15.1 User Manual
 .\"    Source: mpd-sima
 .\"  Language: English
 .\"
-.TH "MPD\-SIMA" "1" "03/19/2019" "mpd-sima" "mpd-sima 0.15.0 User Manual"
+.TH "MPD\-SIMA" "1" "03/19/2019" "mpd-sima" "mpd-sima 0.15.1 User Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

diff --git a/data/man/mpd_sima.cfg.5 b/data/man/mpd_sima.cfg.5
index 2294468f51a2d401d3c951f1d1311cd2eb93a846..6096153cf7aa4b2e7cdd9f9d0208cbfcf0deb752 100644 (file)
--- a/data/man/mpd_sima.cfg.5
+++ b/data/man/mpd_sima.cfg.5
@@ -3,11 +3,11 @@
 .\"    Author: Jack Kaliko <kaliko@azylum.org>
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
 .\"      Date: 03/19/2019
-.\"    Manual: mpd-sima 0.15.0 User Manual
+.\"    Manual: mpd-sima 0.15.1 User Manual
 .\"    Source: mpd-sima
 .\"  Language: English
 .\"
-.TH "MPD_SIMA\&.CFG" "5" "03/19/2019" "mpd-sima" "mpd-sima 0.15.0 User Manual"
+.TH "MPD_SIMA\&.CFG" "5" "03/19/2019" "mpd-sima" "mpd-sima 0.15.1 User Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

diff --git a/data/man/mpd_sima.cfg.5.html b/data/man/mpd_sima.cfg.5.html
index 5956e6587b8ea11cb64781143f1fea86a3492373..b1d40d030d3d06e9cc44d69c173adc820f216f63 100644 (file)
--- a/data/man/mpd_sima.cfg.5.html
+++ b/data/man/mpd_sima.cfg.5.html
@@ -27,7 +27,7 @@ consume=30
                 Bene:</em></span> inline comment are possible using <em class="parameter"><code>'#'</code></em>).</p><p>The default values are used in the options lists below.</p><div class="refsect2"><a name="MPD"></a><h3>MPD section</h3><p>This section is meant to configure MPD access, MPD host
                 address / port and password if necessary.</p><div class="variablelist"><dl class="variablelist"><dt><span class="term"><code class="option">[MPD]</code></span></dt><dd></dd><dt><span class="term"><code class="option">host=</code><em class="replaceable"><code>localhost</code></em></span></dt><dd><p>Set MPD host. Use IP or FQDN.</p></dd><dt><span class="term"><code class="option">port=</code><em class="replaceable"><code>6600</code></em></span></dt><dd><p>Set host port to access MPD to.</p></dd><dt><span class="term"><code class="option">password=</code><em class="replaceable"><code>s3cr3t</code></em></span></dt><dd><p>Set MPD password to use. Do not use this option
                             if you don't have enabled password protected access
-                            on your MPD server.</p></dd></dl></div></div><div class="refsect2"><a name="log"></a><h3>log section</h3><p>Configure logging.</p><div class="variablelist"><dl class="variablelist"><dt><span class="term"><code class="option">[log]</code></span></dt><dd><p></p></dd><dt><span class="term"><code class="option">logfile=</code></span></dt><dd><p>File to log to, usually in dæmon mode.<br>Defaut
+                            on your MPD server.</p></dd></dl></div></div><div class="refsect2"><a name="log"></a><h3>log section</h3><p>Configure logging.</p><div class="variablelist"><dl class="variablelist"><dt><span class="term"><code class="option">[log]</code></span></dt><dd><p></p></dd><dt><span class="term"><code class="option">logfile=</code></span></dt><dd><p>File to log to, usually in dæmon mode.<br>Default
                             (empty or unset) is to log to stdin/stdout.</p></dd><dt><span class="term"><code class="option">verbosity=</code><em class="replaceable"><code>info</code></em></span></dt><dd><p>Logging verbosity among
                             <em class="replaceable"><code>debug</code></em>,
                             <em class="replaceable"><code>info</code></em>,
@@ -77,7 +77,7 @@ consume=30
                         </p></dd></div><div class="refsect2"><a name="lastfm"></a><h3>LastFm section</h3><p>LastFM plugin's configuration.</p><div class="variablelist"><dl class="variablelist"><dt><span class="term"><code class="option">[lastfm]</code></span></dt><dd></dd><dt><span class="term"><code class="option">queue_mode=</code><em class="replaceable"><code>track</code></em></span></dt><dd><p>Queue mode to use among
                             <em class="replaceable"><code>track</code></em>,
                             <em class="replaceable"><code>top</code></em> and
-                            <em class="replaceable"><code>album</code></em> (see <a class="xref" href="#queue_mode" title="QUEUE MODES">the section called &#8220;QUEUE MODES&#8221;</a> for info about queue modes).</p></dd><dt><span class="term"><code class="option">max_art=</code><em class="replaceable"><code>10</code></em></span></dt><dd><p>Number of similar artist to retrieve from local
+                            <em class="replaceable"><code>album</code></em> (see <a class="xref" href="#queue_mode" title="QUEUE MODES">the section called &#8220;QUEUE MODES&#8221;</a> for info about queue modes).</p></dd><dt><span class="term"><code class="option">max_art=</code><em class="replaceable"><code>10</code></em></span></dt><dd><p>Maximum number of similar artist to retrieve from local
                             media library.<br>When set to something superior
                             to zero, it tries to get as much similar artists
                             from media library.</p></dd><dt><span class="term"><code class="option">depth=</code><em class="replaceable"><code>1</code></em></span></dt><dd><p>How many artists to base on similar artists
@@ -89,7 +89,11 @@ consume=30
                             (it often happens with OST).<br>
                             Only relevant in "track" queue mode.</p></dd><dt><span class="term"><code class="option">track_to_add=</code><em class="replaceable"><code>1</code></em></span></dt><dd><p>How many track(s) to add. Only relevant in
                             <code class="option">top</code> and <code class="option">track</code>
-                            queue modes.</p></dd><dt><span class="term"><code class="option">album_to_add=</code><em class="replaceable"><code>1</code></em></span></dt><dd><p>How many album(s) to add. Only relevant in
+                            queue modes. This is actually an upper limit,
+                            min(<code class="option">max_art</code>,
+                            <code class="option">track_to_add</code>) will be used, and
+                            <code class="option">max_art</code> might be inferior lower
+                            than value set in config.</p></dd><dt><span class="term"><code class="option">album_to_add=</code><em class="replaceable"><code>1</code></em></span></dt><dd><p>How many album(s) to add. Only relevant in
                             <code class="option">album</code> queue modes.</p></dd><dt><span class="term"><code class="option">cache=</code><em class="replaceable"><code>True</code></em></span></dt><dd><p>Whether or not to use on-disk persistent http
                             cache.<br>When set to "true", sima will use a
                             persistent cache for its http client. The cache is

diff --git a/data/man/simadb_cli.1 b/data/man/simadb_cli.1
index 46d5fda65e00c426e5d3984a46d9a2fafc53cb36..543284152be9ba3733345cfee838653c45cf8352 100644 (file)
--- a/data/man/simadb_cli.1
+++ b/data/man/simadb_cli.1
@@ -3,11 +3,11 @@
 .\"    Author: Jack Kaliko <kaliko@azylum.org>
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
 .\"      Date: 03/19/2019
-.\"    Manual: mpd-sima 0.15.0 User Manual
+.\"    Manual: mpd-sima 0.15.1 User Manual
 .\"    Source: mpd-sima
 .\"  Language: English
 .\"
-.TH "SIMADB_CLI" "1" "03/19/2019" "mpd-sima" "mpd-sima 0.15.0 User Manual"
+.TH "SIMADB_CLI" "1" "03/19/2019" "mpd-sima" "mpd-sima 0.15.1 User Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

diff --git a/doc/Changelog b/doc/Changelog
index 383a70cbb2b61b67977a2511b3e55f332216dd2e..4da7084a5fa624850ab44d2cd79f4189b229ff90 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,9 @@
+MPD_sima v0.15.1
+
+ * Fixed mopidy compatibility implementation
+
+-- kaliko jack <kaliko@azylum.org> Tue, 19 Mar 2019 15:14:48 +0100
+
 MPD_sima v0.15.0
 
  * Remove EchoNest support (Closes #10)

diff --git a/sima/info.py b/sima/info.py
index 64bf3922739b5dfca9f29f27946759e8895bab88..44ed82fbbddb385c8f7cf78161d759bc14c414cc 100644 (file)
--- a/sima/info.py
+++ b/sima/info.py
@@ -12,7 +12,7 @@ short.
 """
 
 
-__version__ = '0.15.0'
+__version__ = '0.15.1'
 __author__ = 'kaliko jack'
 __email__ = 'kaliko@azylum.org'
 __url__ = 'git://git.kaliko.me/sima.git'

diff --git a/sima/utils/config.py b/sima/utils/config.py
index 182059bad0990148b68ae55a45944e7de77e4fbb..b21b1f9597a2f9470fd7e72a4e16746cb8a5fdea 100644 (file)
--- a/sima/utils/config.py
+++ b/sima/utils/config.py
@@ -55,6 +55,7 @@ DEFAULT_CONF = {
             'musicbrainzid': "true",
             'repeat_disable_queue': "true",
             'single_disable_queue': "true",
+            'mopidy_compat': "false",
             },
         'daemon':{
             'daemon': False,