cleanup

Conflicts:
	telemeta/models/query.py

diff --git a/telemeta/models/query.py b/telemeta/models/query.py
index 0fd1df3476cff3abbd6b126dfaac322b22860d5d..12aa7e10c088edb0e2702d5bfc8be1dd5178aab7 100644 (file)
--- a/telemeta/models/query.py
+++ b/telemeta/models/query.py
@@ -206,13 +206,14 @@ class MediaItemQuerySet(CoreQuerySet):
     def by_instrument(self, name):
         "Find items by instrument"
         from telemeta.models.instrument import Instrument
-        instruments = Instrument.objects.filter(name=name)
-        items = []
-        for instrument in instruments:
-            performances = instrument.performances.all()
+        from telemeta.models.media import MediaItemPerformance
+        instruments = Instrument.objects.filter(name__contains=name)
+        perf = []
+        if instruments:
+            performances = MediaItemPerformance.objects.filter(instrument__in=instruments)
             for performance in performances:
-                items.append(performance.media_item)
-        return items
+                perf.append(performance)
+        return self.filter(performances__in=perf).distinct()
 
 class MediaItemManager(CoreManager):
     "Manage media items queries"