From 8cfe032dc264b0041f0d20b2500da228b9a8cd97 Mon Sep 17 00:00:00 2001
From: Seth Call <seth@jamkazam.com>
Date: Sun, 16 Feb 2014 14:04:24 +0000
Subject: [PATCH] * adding error info to debug VRFS-1140 and pagination in
 progress on VRFS-1135

---
 ruby/lib/jam_ruby/app/uploaders/mix_uploader.rb     |  4 ++--
 .../app/uploaders/recorded_track_uploader.rb        |  2 +-
 ruby/lib/jam_ruby/models/feed.rb                    |  4 ++--
 web/app/controllers/api_feeds_controller.rb         | 13 ++++++++++++-
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/ruby/lib/jam_ruby/app/uploaders/mix_uploader.rb b/ruby/lib/jam_ruby/app/uploaders/mix_uploader.rb
index f672d804f..a0fe4c2e5 100644
--- a/ruby/lib/jam_ruby/app/uploaders/mix_uploader.rb
+++ b/ruby/lib/jam_ruby/app/uploaders/mix_uploader.rb
@@ -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
diff --git a/ruby/lib/jam_ruby/app/uploaders/recorded_track_uploader.rb b/ruby/lib/jam_ruby/app/uploaders/recorded_track_uploader.rb
index 441dcdfa3..17a80a752 100644
--- a/ruby/lib/jam_ruby/app/uploaders/recorded_track_uploader.rb
+++ b/ruby/lib/jam_ruby/app/uploaders/recorded_track_uploader.rb
@@ -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
diff --git a/ruby/lib/jam_ruby/models/feed.rb b/ruby/lib/jam_ruby/models/feed.rb
index 4909c2fe7..21e373966 100644
--- a/ruby/lib/jam_ruby/models/feed.rb
+++ b/ruby/lib/jam_ruby/models/feed.rb
@@ -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
diff --git a/web/app/controllers/api_feeds_controller.rb b/web/app/controllers/api_feeds_controller.rb
index d4c0b9583..a4d4127c6 100644
--- a/web/app/controllers/api_feeds_controller.rb
+++ b/web/app/controllers/api_feeds_controller.rb
@@ -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
\ No newline at end of file