From 0cd19e672542c2a2c47a7ccc5e683a8462c7d5c0 Mon Sep 17 00:00:00 2001
From: Seth Call <sethcall@gmail.com>
Date: Mon, 22 Feb 2016 20:05:44 -0600
Subject: [PATCH] * update jmep logic

---
 db/manifest                             |  3 ++-
 db/up/acapella_rename.sql               |  2 ++
 ruby/lib/jam_ruby/jam_track_importer.rb | 18 +++++++++++++++---
 web/lib/tasks/jam_tracks.rake           |  7 +------
 4 files changed, 20 insertions(+), 10 deletions(-)
 create mode 100644 db/up/acapella_rename.sql

diff --git a/db/manifest b/db/manifest
index 23fd550a6..dac7cba7e 100755
--- a/db/manifest
+++ b/db/manifest
@@ -334,4 +334,5 @@ test_drive_lessons.sql
 whitelist.sql
 teacher_student_flags.sql
 add_sale_source_col.sql
-jamblaster_v2.sql
\ No newline at end of file
+jamblaster_v2.sql
+acapella_rename.sql
\ No newline at end of file
diff --git a/db/up/acapella_rename.sql b/db/up/acapella_rename.sql
new file mode 100644
index 000000000..df474501f
--- /dev/null
+++ b/db/up/acapella_rename.sql
@@ -0,0 +1,2 @@
+UPDATE genres set description = 'A Cappella' where id = 'acapella';
+
diff --git a/ruby/lib/jam_ruby/jam_track_importer.rb b/ruby/lib/jam_ruby/jam_track_importer.rb
index f870834a6..9adbcf137 100644
--- a/ruby/lib/jam_ruby/jam_track_importer.rb
+++ b/ruby/lib/jam_ruby/jam_track_importer.rb
@@ -176,12 +176,24 @@ module JamRuby
         if result_code == 0
           bpm = output.to_f
 
-          @@log.debug("bpm: #{bpm} start_time: #{start_time}")
+          offset = 0.140
+          if bpm >= 60 && bpm < 80
+            offset = 0.110
+          elsif bpm >= 80 && bpm < 100
+            offset = 0.080
+          elsif bpm >= 100 && bpm < 120
+            offset = 0.050
+          elsif bpm >= 120
+            offset = 0.020
+          end
 
-          metro_fin = "#{Time.at(start_time).utc.strftime("%H:%M:%S")}:#{((start_time - start_time.to_i) * 1000).round}"
+          @@log.debug("bpm: #{bpm} start_time: #{start_time}, offset: #{offset}")
+
+          start_time += offset
+          metro_fin = "#{Time.at(start_time).utc.strftime("%H:%M:%S")}:#{((start_time - start_time.to_i) * 1000).round.to_s.rjust(3, "0")}"
 
           jmep = ""
-          jmep << "# created via code using bpm/silence detection (bpm:#{bpm})\r\n"
+          jmep << "# created via code using bpm/silence detection (bpm:#{bpm} offset:#{offset})\r\n"
           jmep << "prelude@10.0 #number of seconds before music starts\r\n"
           jmep << "metro_fin@#{metro_fin} bpm=#{bpm}, ticks=8, pmode=stream, name=Beep, play=mono"
 
diff --git a/web/lib/tasks/jam_tracks.rake b/web/lib/tasks/jam_tracks.rake
index 7ada13f6e..f4d30cbe2 100644
--- a/web/lib/tasks/jam_tracks.rake
+++ b/web/lib/tasks/jam_tracks.rake
@@ -79,7 +79,7 @@ namespace :jam_tracks do
     end
 
     if path.start_with?('mapped')
-      JamTrackImporter.storage_format = 'Paris'
+      JamTrackImporter.storage_format = 'Tency'
     end
 
     JamTrackImporter.synchronize_from_meta("#{path}/meta.yml", skip_audio_upload: false)
@@ -181,11 +181,6 @@ namespace :jam_tracks do
     JamTrackImporter.synchronize_all(skip_audio_upload: false)
   end
 
-  task sync_tim_tracks: :environment do |task, args|
-    JamTrackImporter.storage_format = 'TimTracks'
-    JamTrackImporter.synchronize_all(skip_audio_upload:false)
-  end
-
   task tency_dups: :environment do |task, args|
 
   end