update instrument CSV parsing

Parisson · Jan 13, 2015 · 4759413 · 4759413
1 parent f6bf025
commit 4759413
Showing 1 changed file with 12 additions and 14 deletions.
diff --git a/telemeta/models/media.py b/telemeta/models/media.py
@@ -588,24 +588,22 @@ def to_dict_with_more(self):
                                             kwargs={'public_id': self.public_id, 'media_id': media.id}))
             i += 1
 
-        i = 0
+
+        instruments = []
+        instrument_vernacular_names = []
+        performers = []
+
         for performance in self.performances.all():
-            tag = 'instrument_name' + '_' + str(i)
             if performance.instrument:
-                metadata[tag] = performance.instrument.name
-            else:
-                metadata[tag] = ''
+                instruments.append(performance.instrument.name)
             if performance.alias:
-                tag = 'vernacular_name' + '_' + str(i)
-                metadata[tag] = performance.alias.name
-            else:
-                metadata[tag] = ''
+                instrument_vernacular_names.append(performance.alias.name)
             if performance.musicians:
-                tag = 'musicians' + '_' + str(i)
-                metadata[tag] = performance.musicians
-            else:
-                metadata[tag] = ''
-            i += 1
+                performers.append(performance.musicians.replace('et', ';'))
+
+        metadata['instruments'] = ';'.join(instruments)
+        metadata['instrument_vernacular_names'] = ';'.join(instrument_vernacular_names)
+        metadata['performers'] = ';'.join(performers)
 
         i = 0
         for indentifier in self.identifiers.all():