adding tracklist

faroit · Aug 16, 2016 · fa5eaf3 · fa5eaf3
1 parent bec6686
commit fa5eaf3
Show file tree

Hide file tree

Showing 4 changed files with 119 additions and 6 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1 +1 @@
-recursive-include dsdtools/configs *.yaml
+recursive-include dsdtools/configs *.*
diff --git a/dsdtools/configs/tracklist.csv b/dsdtools/configs/tracklist.csv
@@ -0,0 +1,101 @@
+ID;Track;Genre (Allmusic);Style;Duration;Subset;
+1;ANiMAL - Clinic A;Rap;UK Hip-Hop;4'05'';Test;
+2;ANiMAL - Rockshow;Rap;UK Hip-Hop;2'46'';Test;
+3;Actions - One Minute Smile;Pop/Rock;Power Pop;2'44'';Test;
+4;Al James - Schoolboy Facination;Pop/Rock;Bubblegum Pop;3'21'';Test;
+5;Angela Thomas Wade - Milk Cow Blues;Country;Country;3'31'';Test;
+6;Atlantis Bound - It Was My Fault For Waiting;Pop/Rock;Widescreen Pop/Rock;4'28'';Test;
+7;BKS - Too Much;Pop/Rock;Rock;4'04'';Test;
+8;Bill Chudziak - Children Of No-one;Pop/Rock;Classic Psychedelic Rock;3'51'';Test;
+9;Bobby Nobody - Stitch Up;Pop/Rock;Indie Pop/Rock;3'41'';Test;
+10;Carlos Gonzalez - A Place For Us;Pop/Rock;Indie Pop/Rock;4'10'';Test;
+11;Cnoc An Tursa - Bannockburn;Heavy Metal;Death Metal;4'54'';Test;
+12;Dark Ride - Burning Bridges;Heavy Metal;Heavy Metal;3'53'';Test;
+13;Drumtracks - Ghost Bitch;Pop/Rock;Leftfield Pop/Electronica;5'57'';Test;
+14;Fergessen - Back From The Start;Pop/Rock;Melodic Indie Rock;2'43'';Test;
+15;Fergessen - The Wind;Pop/Rock;Melodic Indie Rock;3'12'';Test;
+16;Forkupines - Semantics;Pop/Rock;Alternative Punk-Rock;4'34'';Test;
+17;Girls Under Glass - We Feel Alright;Electronic;Gothic Electro;5'17'';Test;
+18;Hollow Ground - Ill Fate;Heavy Metal;Death Metal;2'22'';Test;
+19;James Elder & Mark M Thompson - The English Actor;Heavy Metal;Indie Pop;3'25'';Test;
+20;James May - Dont Let Go;Pop/Rock;Acoustic Singer-Songwriter;4'02'';Test;
+21;James May - On The Line;Pop/Rock;Acoustic Singer-Songwriter;4'16'';Test;
+22;Johnny Lokke - Promises & Lies;Pop/Rock;Classic Heavy Rock;4'46'';Test;
+23;Jokers, Jacks & Kings - Sea Of Leaves;Pop/Rock;Uptempo Indie Rock;3'11'';Test;
+24;Leaf - Come Around;Pop/Rock;Atmospheric Indie Pop;4'24'';Test;
+25;Leaf - Wicked;Pop/Rock;Atmospheric Indie Pop;3'11'';Test;
+26;Louis Cressy Band - Good Time;Pop/Rock;Funk Rock;4'53'';Test;
+27;M.E.R.C. Music - Knockout;Rap;Mainstream Hip-Hop;4'30'';Test;
+28;Motor Tapes - Shore;Pop/Rock;Indie Rock;4'07'';Test;
+29;Nerve 9 - Pray For The Rain;Pop/Rock;Alternative Rock Ballad;5'44'';Test;
+30;Patrick Talbot - A Reason To Leave;Jazz;Jazz/Singer-Songwriter;4'20'';Test;
+31;Phre The Eon - Everybody's Falling Apart;Pop/Rock;Indie Funk/Rock;3'44'';Test;
+32;Raft Monk - Tiring;Pop/Rock;Electronic Rock/Pop;3'32'';Test;
+33;Sambasevam Shanmugam - Kaathaadi;Pop/Rock;Bollywood;5'18'';Test;
+34;Secretariat - Over The Top;Pop/Rock;Americana;3'59'';Test;
+35;Signe Jakobsen - What Have You Done To Me;Pop/Rock;Rock Singer-Songwriter;2'57'';Test;
+36;Skelpolu - Resurrection;Electronic;Drum & Bass;6'30'';Test;
+37;Speak Softly - Broken Man;Pop/Rock;Atmospheric Electronic Pop;4'07'';Test;
+38;Spike Mullings - Mike's Sulking;Pop/Rock;Indie Rock;4'08'';Test;
+39;Swinging Steaks - Lost My Way;Pop/Rock;Country Rock;4'58'';Test;
+40;The Long Wait - Back Home To Blue;Pop/Rock;Country Rock;4'15'';Test;
+41;The Mountaineering Club - Mallory;Pop/Rock;Atmospheric Indie Pop;4'04'';Test;
+42;The Wrong'Uns - Rothko;Pop/Rock;Acoustic Indie Pop;3'22'';Test;
+43;Timboz - Pony;Heavy Metal;Screamo Metal;4'07'';Test;
+44;Tom McKenzie - Directions;Pop/Rock;Acoustic Singer-Songwriter;2'56'';Test;
+45;Traffic Experiment - Sirens;Pop/Rock;Melodic Alt Rock;6'55'';Test;
+46;Triviul - Dorothy;Pop/Rock;Leftfield Pop/Electronica;3'01'';Test;
+47;Voelund - Comfort Lives In Belief;Pop/Rock;Laid-back Blues-Rock;3'18'';Test;
+48;We Fell From The Sky - Not You;Heavy Metal;High-Energy Heavy Rock;3'28'';Test;
+49;Young Griffo - Facade;Heavy Metal;Anthemic Heavy Rock;2'48'';Test;
+50;Zeno - Signs;Pop/Rock;Epic Indie Rock;3'54'';Test;
+51;AM Contra - Heart Peripheral;Pop/Rock;Electronic Dance Pop;3'30'';Dev;
+52;ANiMAL - Easy Tiger;Rap;UK Hip-Hop;4'15'';Dev;
+53;Actions - Devil's Words;Pop/Rock;Power Pop;3'17'';Dev;
+54;Actions - South Of The Water;Pop/Rock;Power Pop;3'11'';Dev;
+55;Angels In Amplifiers - I'm Alright;Pop/Rock;Smooth Acoustic Rock;3'00'';Dev;
+56;Arise - Run Run Run;Reggae;Roots Reggae;3'39'';Dev;
+57;BKS - Bulldozer;Pop/Rock;Rock;6'47'';Dev;
+58;Ben Carrigan - We'll Talk About It All Tonight;Pop/Rock;Orchestral Indie Pop;4'15'';Dev;
+59;Black Bloc - If You Want Success;Pop/Rock;Political Funk/Rock;6'39'';Dev;
+60;Buitraker - Revo X;Pop/Rock;Basque Indie Rock;4'36'';Dev;
+61;Chris Durban - Celebrate;Electronic;Dark Break-based Dance;5'25'';Dev;
+62;Cristina Vane - So Easy;Pop/Rock;Acoustic Singer-Songwriter;4'14'';Dev;
+63;Detsky Sad - Walkie Talkie;Pop/Rock;Ukrainian Indie Rock;3'10'';Dev;
+64;Enda Reilly - Cur An Long Ag Seol;Pop/Rock;Irish-Language Singer-Songwriter;3'07'';Dev;
+65;Fergessen - Nos Palpitants;Pop/Rock;Melodic Indie Rock;3'18'';Dev;
+66;Flags - 54;Pop/Rock;Buckley-esque Indie Rock;5'15'';Dev;
+67;Georgia Wonder - Siren;Pop/Rock;Pop Disco/Rock ;7'10'';Dev;
+68;Giselle - Moss;Electronic;Electronica/Classical Crossover;3'15'';Dev;
+69;Hollow Ground - Left Blind;Heavy Metal;Death Metal;2'39'';Dev;
+70;James May - All Souls Moon;Pop/Rock;Acoustic Singer-Songwriter;3'41'';Dev;
+71;James May - If You Say;Pop/Rock;Acoustic Singer-Songwriter;3'32'';Dev;
+72;Jay Menon - Through My Eyes;Pop/Rock;Intimate Pop Ballad;4'13'';Dev;
+73;Johnny Lokke - Whisper To A Scream;Pop/Rock;Classic Heavy Rock;4'16'';Dev;
+74;Juliet's Rescue - Heartbeats;Pop/Rock;Club Rock;4'28;Dev;
+75;Leaf - Summerghost;Pop/Rock;Atmospheric Indie Pop;3'52'';Dev;
+76;Little Chicago's Finest - My Own;Rap;Hip-Hop;4'42'';Dev;
+77;Lyndsey Ollard - Catching Up;Pop/Rock;MOR Singer-Songwriter;3'47'';Dev;
+78;Moosmusic - Big Dummy Shake;Pop/Rock;Indie Pop/Rock;3'19'';Dev;
+79;Mu - Too Bright;Pop/Rock;Alternative Electro Rock;4'32'';Dev;
+80;North To Alaska - All The Same;Pop/Rock;Emo Rock;4'08'';Dev;
+81;Patrick Talbot - Set Free Me;Jazz;Jazz/Singer-Songwriter;4'50'';Dev;
+82;Punkdisco - Oral Hygiene;Pop/Rock;Punk Electronica;3'42'';Dev;
+83;Remember December - C U Next Time;Pop/Rock;Alt Pop/Rock;3'46'';Dev;
+84;Secretariat - Borderline;Pop/Rock;Americana;4'35'';Dev;
+85;Side Effects Project - Sing With Me;Rap;West-Coast Hip-Hop;4'04'';Dev;
+86;Skelpolu - Human Mistakes;Electronic;Drum & Bass;5'13'';Dev;
+87;Skelpolu - Together Alone;Electronic;Drum & Bass;5'20'';Dev;
+88;Speak Softly - Like Horses;Pop/Rock;Atmospheric Electronic Pop;5'01'';Dev;
+89;St Vitus - Word Gets Around;Pop/Rock;Indie Singer-Songwriter;4'07'';Dev;
+90;The Doppler Shift - Atrophy;Pop/Rock;Epic Indie Rock;5'31'';Dev;
+91;The Long Wait - Dark Horses;Pop/Rock;Country Rock;4'54'';Dev;
+92;The Sunshine Garcia Band - For I Am The Moon;Reggae;Reggae/Gospel;5'08'';Dev;
+93;Tim Taler - Stalker;Pop/Rock;Ukrainian Art-Punk;3'34'';Dev;
+94;Titanium - Haunted Age;Heavy Metal;Black Metal;3'56'';Dev;
+95;Traffic Experiment - Once More (With Feeling);Pop/Rock;Melodic Alt Rock;6'57'';Dev;
+96;Triviul - Angelsaint;Pop/Rock;Leftfield Pop/Electronica;3'51'';Dev;
+97;Triviul feat. The Fiend - Widow;Pop/Rock;Urban R&B/Pop;3'43'';Dev;
+98;Wall Of Death - Femme;Heavy Metal;Black Metal;3'47'';Dev;
+99;Young Griffo - Blood To Bone;Heavy Metal;Anthemic Heavy Rock;4'03'';Dev;
+100;Young Griffo - Pennies;Heavy Metal;Anthemic Heavy Rock;4'26'';Dev;
diff --git a/dsdtools/evaluate.py b/dsdtools/evaluate.py
@@ -5,6 +5,18 @@
 import json
 from os import path as op
 import scipy
+import csv
+
+
+def load_track_list(csv_file='configs/tracklist.csv'):
+    tracklist = [None]*101
+    with open(csv_file, 'rt') as csvfile:
+        spamreader = csv.reader(csvfile, delimiter=';')
+        # skip header
+        next(spamreader)
+        for i, row in enumerate(spamreader):
+            tracklist[int(row[0])] = row[1]
+    return tracklist
 
 
 class Data(object):
@@ -24,6 +36,7 @@ def __init__(self):
         ]
 
         self.df = pd.DataFrame(columns=self.columns)
+        self.tracklist = load_track_list()
 
     def row2series(self, **row_data):
         return pd.Series(row_data)
@@ -63,10 +76,9 @@ def import_mat(self, filename, estimate_name=''):
                             try:
                                 track_id = int(split_name[0])
                             except ValueError:
-                                if subset == 'Dev':
-                                    track_id = 55
-                                else:
-                                    track_id = 0
+                                track_id = int(
+                                    self.tracklist.index(tdata['name'][0])
+                                )
 
                             series = self.row2series(
                                 track_id=track_id,

diff --git a/setup.py b/setup.py
@@ -41,7 +41,7 @@
         ],
 
         package_data={
-            'dsdtools': ['configs/dsd100.yaml'],
+            'dsdtools': ['configs/dsd100.yaml', 'configs/tracklist.csv'],
         },
 
         extras_require={