From 491bc8cda5040cc21d917283f3cb4da7e776b55a Mon Sep 17 00:00:00 2001 From: Seth Call Date: Sat, 16 Jan 2016 20:54:22 -0600 Subject: [PATCH] * fix null mark by specifying client = true --- web/app/controllers/api_jam_track_mixdowns_controller.rb | 8 ++++---- web/app/controllers/api_jam_tracks_controller.rb | 6 ++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/web/app/controllers/api_jam_track_mixdowns_controller.rb b/web/app/controllers/api_jam_track_mixdowns_controller.rb index 3cef88912..634421ebf 100644 --- a/web/app/controllers/api_jam_track_mixdowns_controller.rb +++ b/web/app/controllers/api_jam_track_mixdowns_controller.rb @@ -87,17 +87,17 @@ class ApiJamTrackMixdownsController < ApiController if @package.ready? - fingerprint = params[:mark] - DownloadTracker.check(current_user, request.remote_ip, @package, !@jam_track_right.redeemed, fingerprint, jkclient_agent?) @package.update_download_count now = Time.now @package.last_downloaded_at = now @package.first_downloaded_at = now if @package.first_downloaded_at.nil? @package.save! - if params[:download] - redirect_to @package.sign_url(120, 'application/octet-stream', "attachment; filename=\"#{@package.jam_track_mixdown.name}.#{params[:file_type]}\"") + if params[:download] + DownloadTracker.check(current_user, request.remote_ip, @package, !@jam_track_right.redeemed, params[:mark], false) + redirect_to @package.sign_url(120, 'application/octet-stream', "attachment; filename=\"#{@package.jam_track_mixdown.name}.#{params[:file_type]}\"") else + DownloadTracker.check(current_user, request.remote_ip, @package, !@jam_track_right.redeemed, params[:mark], true) redirect_to @package.sign_url(120) end diff --git a/web/app/controllers/api_jam_tracks_controller.rb b/web/app/controllers/api_jam_tracks_controller.rb index f1738be47..e1b6d1bab 100644 --- a/web/app/controllers/api_jam_tracks_controller.rb +++ b/web/app/controllers/api_jam_tracks_controller.rb @@ -166,13 +166,11 @@ class ApiJamTracksController < ApiController jam_track_track = JamTrackTrack.find(params[:stem_id]) end - fingerprint = params[:mark] - - DownloadTracker.check(current_user, request.remote_ip, jam_track_track, !@jam_track_right.redeemed, fingerprint, jkclient_agent?) - if params[:download] + DownloadTracker.check(current_user, request.remote_ip, jam_track_track, !@jam_track_right.redeemed, params[:mark], false) redirect_to jam_track_track.web_download_sign_url(120, params[:file_type], 'application/octet-stream', "attachment; filename=\"#{@jam_track_right.jam_track.name + '-' + jam_track_track.display_name}.mp3\"") else + DownloadTracker.check(current_user, request.remote_ip, jam_track_track, !@jam_track_right.redeemed, params[:mark], true) redirect_to jam_track_track.web_download_sign_url(120, params[:file_type]) end