redirects

public/js/recorder.js

@@ -76,12 +76,7 @@ function microphone_recorder_events() {
   case "saved":
     var name = arguments[1];
     var data = $.parseJSON(arguments[2]);
-    if(data.saved) {
-      $('#upload_status').css({'color': '#0F0'}).text(name + " was saved");
-    } else {
-      $('#upload_status').css({'color': '#F00'}).text(name + " was not saved");
-    }
-    window.location.reload();
+    window.location.href = data.location;
     break;
 
   case "save_failed":
@@ -94,8 +89,6 @@ function microphone_recorder_events() {
     var name = arguments[1];
     var bytesLoaded = arguments[2];
     var bytesTotal = arguments[3];
-    // $('#upload_status').css({'color': '#000'}).text(name + " progress: " + bytesLoaded + " / " + bytesTotal);
-    $('#upload_status').hide();
     break;
   }
 }

soundlock.rb

@@ -24,9 +24,8 @@ class Soundlock < Sinatra::Base
   end
 
   post "/record" do
-    upload(params[:file])
-
-    "saved"
+    lock = upload(params[:file])
+    "{\"location\": \"/lock/#{lock.id}\"}"
   end
 
   get "/lock/:id" do
@@ -48,7 +47,7 @@ class Soundlock < Sinatra::Base
   post "/lock/:id" do
     @lock = Echonest::Track.find(params[:id])
     if @lock && (@solver = upload(params[:file], @lock)) && @solver.similar_to?(@lock)
-      erb :solved
+      "{\"location\": \"/solver/#{@solver.id}\"}"
     else
       erb :error
     end

views/index.erb

@@ -30,14 +30,14 @@
   <tr>
     <th>#</th>
     <th>at</th>
-    <th># solved</th>
-    <th>beats</th>
+    <th>solved / tries</th>
+    <th>important events at</th>
   </tr>
 <% @locks.sort_by(&:created_at).each do |lock| %>
   <tr>
     <td><a href="/lock/<%= lock.id %>"><%= lock.id %></a></td>
     <td><%= lock.created_at.strftime("%Y-%m-%d %I:%M") %></td>
-    <td><%= lock.solvers.size %></td>
+    <td><%= "#{lock.solvers.select(&:valid?).size} / #{lock.solvers.size}" %></td>
     <td><%= lock.beats.inspect %></td>
   </tr>
 <% end %>