From 7e28b115a280b1bc584990fc3b01ea50b8b5b6e4 Mon Sep 17 00:00:00 2001 From: Seth Call Date: Sat, 12 Sep 2015 14:59:21 -0500 Subject: [PATCH] * allow jkz's to be built --- ruby/lib/jam_ruby/resque/jam_track_mixdown_packager.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ruby/lib/jam_ruby/resque/jam_track_mixdown_packager.rb b/ruby/lib/jam_ruby/resque/jam_track_mixdown_packager.rb index 77aeb0054..297edfbc7 100644 --- a/ruby/lib/jam_ruby/resque/jam_track_mixdown_packager.rb +++ b/ruby/lib/jam_ruby/resque/jam_track_mixdown_packager.rb @@ -344,8 +344,12 @@ module JamRuby py_root = APP_CONFIG.jamtracks_dir step = 0 + private_key = nil + # we need to make the id of the custom mix be the name of the file (ID.ogg) + custom_mix_name = File.join(tmp_dir, "#{@mixdown.id}.ogg") + FileUtils.mv(@speed_mix_file, custom_mix_name) jam_file_opts = "" - jam_file_opts << " -i #{Shellwords.escape("#{track_filename}+#{jam_track_track.part}")}" + jam_file_opts << " -i #{Shellwords.escape("#{custom_mix_name}+mixdown")}" sku = @mixdown_package.id title = @mixdown.name @@ -353,7 +357,7 @@ module JamRuby py_file = File.join(py_root, "jkcreate.py") version = @mixdown_package.version - @@log.info "Executing python source in #{py_file}, outputting to #{tmp_dir} (#{output})" + log.info "Executing python source in #{py_file}, outputting to #{tmp_dir} (#{output})" cli = "python #{py_file} -D -k #{sku} -p #{Shellwords.escape(tmp_dir)}/pkey.pem -s #{Shellwords.escape(tmp_dir)}/skey.pem #{jam_file_opts} -o #{Shellwords.escape(output)} -t #{Shellwords.escape(title)} -V #{Shellwords.escape(version)}"