Merge pull request #318 from jwjacobson/dev

Dev

tune/search.py

@@ -6,10 +6,10 @@
 from .models import Tune
 
 
-def search_field(tune_set, search_term):
-    split_term = search_term.split(":")
-    field, term = split_term[0], split_term[1]
-
+def search_field(tune_set, field, term):
+    """
+    Search a specific field for a term.
+    """
     if field.lower() == "keys":
         term_query = tune_set.filter(
             Q(tune__key__icontains=term) | Q(tune__other_keys__icontains=term)
@@ -31,6 +31,9 @@ def search_field(tune_set, search_term):
 
 
 def exclude_term(tune_set, search_term):
+    """
+    Exclude a term from a search.
+    """
     excluded_term = search_term[1:]
 
     term_query = tune_set.exclude(
@@ -50,6 +53,9 @@ def exclude_term(tune_set, search_term):
 
 
 def nickname_search(tune_set, search_term):
+    """
+    Search for a composer by their nickname.
+    """
     nickname_query = tune_set.filter(
         Q(tune__composer__icontains=Tune.NICKNAMES[search_term])
     )
@@ -63,16 +69,17 @@ def query_tunes(tune_set, search_terms, timespan=None):
     searches = set()
 
     for term in search_terms:
-        if term and term[0] == "-":
+        # If the term begins with "-", exclude it from the search
+        if term.startswith("-"):
             term_query = exclude_term(tune_set, term)
 
-        elif (
-            term
-            and len(term.split(":")) > 1
-            and term.split(":")[0].lower() in Tune.field_names
-        ):
-            term_query = search_field(tune_set, term)
+        # If the term contains a colon, attempt field-specific search
+        elif ":" in term:
+            field, term = term.split(":", 1)
+            if field.lower() in Tune.field_names:
+                term_query = search_field(tune_set, field, term)
 
+        # Default, search all fields for the term
         else:
             term_query = tune_set.filter(
                 Q(tune__title__icontains=term)
@@ -98,7 +105,7 @@ def query_tunes(tune_set, search_terms, timespan=None):
     search_results = searches.pop()
 
     while searches:
-        search_results = search_results & searches.pop()
+        search_results &= searches.pop()
 
     return search_results