Merge pull request #3335 from malcops/feature/pm/acousticbrainz-extra…

…-fields Feature/pm/acousticbrainz extra fields
beetbox · Jul 24, 2019 · 897100c · 897100c
2 parents bd6a5cf + aa17625
commit 897100c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 1 deletion.
diff --git a/beetsplug/acousticbrainz.py b/beetsplug/acousticbrainz.py
@@ -74,6 +74,9 @@
                 'sad': 'mood_sad'
             }
         },
+        'moods_mirex': {
+            'value': 'moods_mirex'
+        },
         'ismir04_rhythm': {
             'value': 'rhythm'
         },
@@ -82,6 +85,9 @@
                 'tonal': 'tonal'
             }
         },
+        'timbre': {
+            'value': 'timbre'
+        },
         'voice_instrumental': {
             'value': 'voice_instrumental'
         },
@@ -124,7 +130,9 @@ class AcousticPlugin(plugins.BeetsPlugin):
         'mood_party': types.Float(6),
         'mood_relaxed': types.Float(6),
         'mood_sad': types.Float(6),
+        'moods_mirex': types.STRING,
         'rhythm': types.Float(6),
+        'timbre': types.STRING,
         'tonal': types.Float(6),
         'voice_instrumental': types.STRING,
     }

diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -42,6 +42,10 @@ New features:
   new ``discogs_albumid`` field from the Discogs API.
   Thanks to :user:`thedevilisinthedetails`.
   :bug:`465` :bug:`3322`
+* :doc:`/plugins/acousticbrainz`: The plugin now fetches two more additional
+  fields: ``moods_mirex`` and ``timbre``.
+  Thanks to :user:`malcops`.
+  :bug:`2860`
 
 Fixes:
 

diff --git a/docs/plugins/acousticbrainz.rst b/docs/plugins/acousticbrainz.rst
@@ -38,7 +38,9 @@ these fields:
 * ``mood_party``
 * ``mood_relaxed``
 * ``mood_sad``
+* ``moods_mirex``
 * ``rhythm``
+* ``timbre``
 * ``tonal``
 * ``voice_instrumental``
 

diff --git a/test/test_acousticbrainz.py b/test/test_acousticbrainz.py
@@ -95,7 +95,9 @@ def test_realistic(self):
             ('danceable', 0.143928021193),
             ('rhythm', 'VienneseWaltz'),
             ('mood_electronic', 0.339881360531),
-            ('mood_happy', 0.0894767045975)
+            ('mood_happy', 0.0894767045975),
+            ('moods_mirex', "Cluster3"),
+            ('timbre', "bright")
         }
         self.assertEqual(mapping, expected)