Added track info to json response and make API thread safe

.gitignore

@@ -0,0 +1,14 @@
+solr/solr/logs/
+solr/solr/data/
+solr/solr/solr/index/
+solr/solr/solr/spellchecker
+*.pyc
+*.swp
+*.log
+.idea/
+**/target/
+*.iml
+.classpath
+.project
+.settings
+.DS_Store

API/api.py

@@ -17,7 +17,6 @@
 except ImportError:
     import simplejson as json
 
-
 # Very simple web facing API for FP dist
 
 urls = (
@@ -29,14 +28,15 @@
 
 class ingest:
     def POST(self):
-        params = web.input(track_id="default", fp_code="", artist=None, release=None, track=None, length=None, codever=None)
+        params = web.input(track_id="default", fp_code="", artist=None, release=None, track=None, length=None, codever=None, source=None, genre=None, bitrate=None, sample_rate=None)
+        print params
         if params.track_id == "default":
             track_id = fp.new_track_id()
         else:
             track_id = params.track_id
         if params.length is None or params.codever is None:
             return web.webapi.BadRequest()
-        
+
         # First see if this is a compressed code
         if re.match('[A-Za-z\/\+\_\-]', params.fp_code) is not None:
            code_string = fp.decode_code_string(params.fp_code)
@@ -45,31 +45,44 @@ def POST(self):
         else:
             code_string = params.fp_code
 
-        data = {"track_id": track_id, 
+        data = {"track_id": track_id,
                 "fp": code_string,
                 "length": params.length,
                 "codever": params.codever }
         if params.artist: data["artist"] = params.artist
         if params.release: data["release"] = params.release
         if params.track: data["track"] = params.track
+        if params.source: data["source"] = params.source
+        if params.genre: data["genre"] = params.genre
+        if params.bitrate: data["bitrate"] = params.bitrate
+        if params.sample_rate: data["sample_rate"] = params.sample_rate
+
         fp.ingest(data, do_commit=True, local=False)
 
         return json.dumps({"track_id":track_id, "status":"ok"})
-
-
+
 class query:
+    def DELETE(self):
+        params = web.input(track_id="")
+        fp.delete(params.track_id.encode("utf-8"))
+
     def POST(self):
         return self.GET()
-        
+
     def GET(self):
         stuff = web.input(fp_code="")
         response = fp.best_match_for_query(stuff.fp_code)
+        track_info = {key: value for key, value in response.metadata.items()
+                     if key != "import_date"}
+        if "track_id" in track_info.keys():
+            track_info["track_id"] = track_info["track_id"].split("-")[0]
+
         return json.dumps({"ok":True, "query":stuff.fp_code, "message":response.message(), "match":response.match(), "score":response.score, \
-                        "qtime":response.qtime, "track_id":response.TRID, "total_time":response.total_time})
+                         "qtime":response.qtime, "track_id":response.TRID, "total_time":response.total_time, "track_info":track_info})
 
 
 application = web.application(urls, globals())#.wsgifunc()
-        
+
 if __name__ == "__main__":
     application.run()