Changeset 86f7310

Timestamp:

03/05/12 13:17:31 (16 months ago)

Author:

yomguy <yomguy@…>

Branches:

master, crem, crem2, dev, dev2, diadems, generic, instru_search, lam, nlivemulti, release/1.4.4, security, social, storage, test

Children:

bf87cda

Parents:

3c13a83 (diff), dd763818 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

yomguy <yomguy@…> (03/05/12 13:17:31)

git-committer:

yomguy <yomguy@…> (03/05/12 13:17:31)

Message:

Merge branch 'master' into dev

Files:

• README.rst (modified) (2 diffs)
• telemeta/models/media.py (modified) (1 diff)
• telemeta/models/query.py (modified) (5 diffs)
• telemeta/templates/telemeta/search_criteria.html (modified) (1 diff)
• telemeta/templates/telemeta/search_results.html (modified) (1 diff)
• telemeta/views/base.py (modified) (1 diff)

README.rst

@@ -4 +4 @@
 
 For personal or collaborative media archiving projects,
-research laboratories and digital humanities,
+research laboratories and digital humanities.
 
-based on Django, Python, full DHTML, CSS and JavaScript.
+Based on Django, Python, full DHTML, CSS and JavaScript.
 
 
@@ -14 +14 @@
 Telemeta is a free and open source web audio archiving software which introduces useful and secure methods to backup, index, transcode, analyse and publish any digitalized audio file with its metadata. It is dedicated to professionnals who wants to easily organize, backup and publish documented sound collections of audio files, CDs, digitalized vinyls and magnetic tapes over a strong database, in accordance with open web standards.
 
-Here are the main features of Telemeta:
+Main features:
 
  * Secure archiving, editing and publishing of audio files over internet.

telemeta/models/media.py

@@ -408 +408 @@
             title += ' ' + self.track
         return title
+
+    @property
+    def instruments(self):
+        "Return the instruments of the item"
+        instruments = []
+        performances = MediaItemPerformance.objects.filter(media_item=self)
+        for performance in performances:
+            instrument = performance.instrument
+            alias = performance.alias
+            if not instrument in instruments:
+                instruments.append(instrument)
+            if not alias in instruments:
+                instruments.append(alias)
+
+        instruments.sort(self.__name_cmp)
+        return instruments
+
+        instruments.verbose_name = _("instruments")
 
 

telemeta/models/query.py

@@ -201 +201 @@
         return self.filter(file__contains='/')
 
+    def by_instrument(self, instrument):
+        "Find items by instrument"
+        return self.filter(instruments__in=instrument)
+
 
 class MediaItemManager(CoreManager):
@@ -244 +248 @@
         return self.get_query_set().sound(*args, **kwargs)
     sound.__doc__ = MediaItemQuerySet.sound.__doc__
+
+    def by_instrument(self, *args, **kwargs):
+        return self.get_query_set().by_instrument(*args, **kwargs)
+    by_instrument.__doc__ = MediaItemQuerySet.by_instrument.__doc__
 
 
@@ -332 +340 @@
         return self.filter(items__file__contains='/').distinct()
 
+    def by_instrument(self, instrument):
+        "Find collections by instrument"
+        return self.filter(items__instruments__in=instrument).distinct()
+
 
 class MediaCollectionManager(CoreManager):
@@ -375 +387 @@
         return self.get_query_set().sound(*args, **kwargs)
     sound.__doc__ = MediaCollectionQuerySet.sound.__doc__
+
+    def by_instrument(self, *args, **kwargs):
+        return self.get_query_set().by_instrument(*args, **kwargs)
+    by_instrument.__doc__ = MediaCollectionQuerySet.by_instrument.__doc__
 
 
@@ -478 +494 @@
         return self.get_query_set().quick_search(*args, **kwargs)
     quick_search.__doc__ = MediaFondsQuerySet.quick_search.__doc__
+
+
+class InstrumentQuerySet(CoreQuerySet):
+    "Base class for all media instrument query sets"
+
+    def quick_search(self, pattern):
+        "Perform a quick search on text and char fields"
+        from telemeta.models.instrument import Instrument
+        mod = Instrument()
+        pattern = pattern.strip()
+        q = Q(code__contains=pattern)
+        fields = mod.to_dict()
+        keys =  fields.keys()
+        for field in keys:
+            field_str = str(mod._meta.get_field(field))
+            if 'CharField' in field_str or 'TextField' in field_str:
+                q = q | word_search_q(field, pattern)
+        return self.filter(q)
+
+
+class InstrumentManager(CoreManager):
+    "Manage instrument queries"
+
+    def get_query_set(self):
+        "Return instrument query sets"
+        return InstrumentQuerySet(self.model)
+
+    def quick_search(self, *args, **kwargs):
+        return self.get_query_set().quick_search(*args, **kwargs)
+    quick_search.__doc__ = InstrumentQuerySet.quick_search.__doc__

telemeta/templates/telemeta/search_criteria.html

@@ -63 +63 @@
     <label for="location">{% field_label "Location" %}</label>
     <input type="text" name="location" id="location" value="{{ criteria.location }}" />
+    </p>
+
+    <p>
+    <label for="instrument">{% field_label "Instrument" %}</label>
+    <input type="text" name="instrument" id="instrument" />
     </p>
 

telemeta/templates/telemeta/search_results.html

@@ -28 +28 @@
   {% if criteria.location %}
     <li><b>{% field_label "Location" %}:</b> {{criteria.location}}</li>
+  {% endif %}
+  {% if criteria.instrument %}
+  <li><b>{% field_label "Instrument" %}:</b> {{criteria.instrument}}</li>
   {% endif %}
   {% if criteria.ethnic_group %}

telemeta/views/base.py

@@ -339 +339 @@
                 collections.sound(),
                 items.sound()),
+            'instrument': lambda value: (
+                collections.by_instrument(value),
+                items.by_instrument(value)),
         }