* adding error info to debug VRFS-1140 and pagination in progress on VRFS-1135
This commit is contained in:
parent
8b7761f98f
commit
8cfe032dc2
|
|
@ -50,7 +50,7 @@ class MixUploader < CarrierWave::Uploader::Base
|
|||
system(ffmpeg_cmd)
|
||||
|
||||
unless $? == 0
|
||||
raise "ffmpeg metadata copy failed"
|
||||
raise "ffmpeg metadata copy failed. cmd=#{ffmpeg_cmd}"
|
||||
end
|
||||
|
||||
FileUtils.mv output_file, input_file
|
||||
|
|
@ -67,7 +67,7 @@ class MixUploader < CarrierWave::Uploader::Base
|
|||
system(ffmpeg_cmd)
|
||||
|
||||
unless $? == 0
|
||||
raise "ffmpeg mp3 convert failed"
|
||||
raise "ffmpeg mp3 convert failed. cmd=#{ffmpeg_cmd}"
|
||||
end
|
||||
|
||||
model.mp3_md5 = Digest::MD5.file(output_file).hexdigest
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ class RecordedTrackUploader < CarrierWave::Uploader::Base
|
|||
system(ffmpeg_cmd)
|
||||
|
||||
unless $? == 0
|
||||
raise "ffmpeg failed"
|
||||
raise "ffmpeg failed. cmd: #{ffmpeg_cmd}"
|
||||
end
|
||||
|
||||
FileUtils.mv output_file, input_file
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ module JamRuby
|
|||
belongs_to :recording, class_name: "JamRuby::Recording", inverse_of: :feed, foreign_key: 'recording_id'
|
||||
belongs_to :music_session_history, class_name: "JamRuby::MusicSessionHistory", inverse_of: :feed, foreign_key: 'music_session_id'
|
||||
|
||||
def self.index(params = {})
|
||||
Feed.includes(:recording).includes(:music_session_history).order('created_at DESC').limit(20)
|
||||
def self.index(params = {start:0, limit:20})
|
||||
Feed.includes(:recording).includes(:music_session_history).order('created_at DESC').offset(params[:start]).limit(params[:limit])
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,7 +1,18 @@
|
|||
class ApiFeedsController < ApiController
|
||||
|
||||
def index
|
||||
@feeds = Feed.index(current_user)
|
||||
# parse out since parameter
|
||||
since = params[:since]
|
||||
if since
|
||||
start, limit = since.split(':')
|
||||
start = start.to_i
|
||||
limit = limit.to_i
|
||||
else
|
||||
start = 0
|
||||
limit = 20
|
||||
end
|
||||
|
||||
@feeds = Feed.index({user: current_user, start: start, limit: limit})
|
||||
end
|
||||
|
||||
end
|
||||
Loading…
Reference in New Issue