Merge pull request #1 from adamjakab/devel

Devel
adamjakab · Mar 13, 2020 · 9cca5b5 · 9cca5b5
2 parents 3203b52 + ed8d48a
commit 9cca5b5
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 19 deletions.
diff --git a/BEETSDIR/config.yaml b/BEETSDIR/config.yaml
@@ -27,7 +27,7 @@ xtractor:
     threads: 1
     force: no
     quiet: no
-    items_per_run: 1
+    items_per_run: 0
     keep_output: yes
     keep_profiles: no
     output_path: /Users/jackisback/Documents/Projects/Python/BeetsPluginXtractor/BEETSDIR/xtraction
@@ -41,17 +41,17 @@ xtractor:
         highlevel:
             compute: 1
             svm_models:
-                - svm_models/danceability.history
-                - svm_models/gender.history
-                - svm_models/genre_rosamerica.history
-                - svm_models/mood_acoustic.history
-                - svm_models/mood_aggressive.history
-                - svm_models/mood_electronic.history
-                - svm_models/mood_happy.history
-                - svm_models/mood_party.history
-                - svm_models/mood_relaxed.history
-                - svm_models/mood_sad.history
-                - svm_models/voice_instrumental.history
+                - /Users/jackisback/Documents/Projects/Other/extractors/svm_models_beta5/danceability.history
+                - /Users/jackisback/Documents/Projects/Other/extractors/svm_models_beta5/gender.history
+                - /Users/jackisback/Documents/Projects/Other/extractors/svm_models_beta5/genre_rosamerica.history
+                - /Users/jackisback/Documents/Projects/Other/extractors/svm_models_beta5/mood_acoustic.history
+                - /Users/jackisback/Documents/Projects/Other/extractors/svm_models_beta5/mood_aggressive.history
+                - /Users/jackisback/Documents/Projects/Other/extractors/svm_models_beta5/mood_electronic.history
+                - /Users/jackisback/Documents/Projects/Other/extractors/svm_models_beta5/mood_happy.history
+                - /Users/jackisback/Documents/Projects/Other/extractors/svm_models_beta5/mood_party.history
+                - /Users/jackisback/Documents/Projects/Other/extractors/svm_models_beta5/mood_relaxed.history
+                - /Users/jackisback/Documents/Projects/Other/extractors/svm_models_beta5/mood_sad.history
+                - /Users/jackisback/Documents/Projects/Other/extractors/svm_models_beta5/voice_instrumental.history
         chromaprint:
             compute: 0
 
diff --git a/beetsplug/xtractor/command.py b/beetsplug/xtractor/command.py
@@ -135,18 +135,17 @@ def show_version_information(self):
 
     def xtract(self):
         # Setup the query
-        query = self.query
+        query = " ".join(self.query)
 
-        # Append one low and one high level attribute that should be there after xtraction
+        # Append one low OR one high level attribute that should be there after xtraction
         if not self.cfg_force:
-            query.append("bpm:0")
-            query.append("gender::^$")
+            query = "bpm:0 , gender::^$"
 
         # Get the library items
-        library_items = self.lib.items(self.query)
+        library_items = self.lib.items(query)
 
         if len(library_items) == 0:
-            self._say("No items were found with the specified query: {}".format(query))
+            self._say("No items were found with the specified query: '{}'".format(query))
             return
 
         # Limit the number of items per run (0 means no limit)

diff --git a/beetsplug/xtractor/version.py b/beetsplug/xtractor/version.py
@@ -4,4 +4,4 @@
 #  Created: 3/13/20, 12:17 AM
 #  License: See LICENSE.txt
 
-__version__ = '0.1.0'
+__version__ = '0.1.1'