seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

* fixing urls getting messed with my mount uploader

This commit is contained in:
Seth Call 2015-03-09 16:35:39 -05:00
parent 28ebbe893c
commit 882f2267cf
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruby/lib/jam_ruby/app/uploaders/jam_track_track_uploader.rb
View File

@ -23,7 +23,7 @@ class JamTrackTrackUploader < CarrierWave::Uploader::Base
end
def filename
if model.id
if model.id && !model.skip_uploader
model.manually_uploaded_filename(mounted_as)
end
end

2
ruby/lib/jam_ruby/jam_track_importer.rb
View File

@ -415,6 +415,8 @@ module JamRuby
ogg_44100_s3_path = track.filename(ogg_44100_filename)
ogg_48000_s3_path = track.filename(ogg_48000_filename)
track.skip_uploader = true
if skip_audio_upload
track["url_44"] = ogg_44100_s3_path
track["md5_44"] = 'md5'

6
ruby/lib/jam_ruby/models/jam_track_track.rb
View File

@ -13,7 +13,7 @@ module JamRuby
attr_accessible :jam_track_id, :track_type, :instrument, :instrument_id, :position, :part, as: :admin
attr_accessible :url_44, :url_48, :md5_44, :md5_48, :length_44, :length_48, as: :admin
attr_accessor :original_audio_s3_path
attr_accessor :original_audio_s3_path, :skip_uploader
validates :position, presence: true, numericality: {only_integer: true}, length: {in: 1..1000}
validates :part, length: {maximum: 25}
@ -39,9 +39,9 @@ module JamRuby
def manually_uploaded_filename(mounted_as)
if track_type == 'Master'
filename("Master Mix-#{mounted_as == :url_48 ? '48000' : '4100'}.ogg")
filename("Master Mix-#{mounted_as == :url_48 ? '48000' : '44100'}.ogg")
else
filename("#{jam_track.name} Stem - #{instrument.description}-#{part}-#{mounted_as == :url_48 ? '48000' : '41000'}.ogg")
filename("#{jam_track.name} Stem - #{instrument.description}-#{part}-#{mounted_as == :url_48 ? '48000' : '44100'}.ogg")
end
end

1
web/jt_metadata.json
View File

@ -1 +0,0 @@
{"container_file": "/var/folders/05/1jpzfcln1hq9p666whnd7chr0000gn/T/d20150308-31681-vc9f0r/jam-track-20.jkz", "version": "0", "coverart": null, "rsa_priv_file": "/var/folders/05/1jpzfcln1hq9p666whnd7chr0000gn/T/d20150308-31681-vc9f0r/skey.pem", "tracks": [{"name": "/var/folders/05/1jpzfcln1hq9p666whnd7chr0000gn/T/d20150308-31681-vc9f0r/2ec95da6-c49c-4f71-baf5-7602590598be.ogg", "trackName": "track_00"}], "rsa_pub_file": "/var/folders/05/1jpzfcln1hq9p666whnd7chr0000gn/T/d20150308-31681-vc9f0r/pkey.pem", "jamktrack_info": "/var/folders/05/1jpzfcln1hq9p666whnd7chr0000gn/T/tmpMOuH3w"}