-<% if @claimed_recording.is_public %>
+<% if @claimed_recording.is_public || @claimed_recording.recording.has_access?(current_user) %>
<% unless @claimed_recording.recording.band.blank? %>
@@ -97,7 +97,7 @@
<% end %>
-<% if @claimed_recording.is_public %>
+<% if @claimed_recording.is_public || @claimed_recording.recording.has_access?(current_user) %>
<% if signed_in? %>
<% unless @claimed_recording.recording.band.nil? %>
<%= render :partial => "shared/landing_sidebar", :locals => {:user => @claimed_recording.recording.band, :recent_history => @claimed_recording.recording.band.recent_history} %>
diff --git a/web/config/application.rb b/web/config/application.rb
index 407ce9cab..7ef9314e1 100644
--- a/web/config/application.rb
+++ b/web/config/application.rb
@@ -179,6 +179,8 @@ if defined?(Bundler)
config.audiomixer_path = "/var/lib/audiomixer/audiomixer/audiomixerapp"
config.ffmpeg_path = ENV['FFMPEG_PATH'] || (File.exist?('/usr/local/bin/ffmpeg') ? '/usr/local/bin/ffmpeg' : '/usr/bin/ffmpeg')
+ config.normalize_ogg_path = ENV['NORMALIZE_OGG_PATH'] || (File.exist?('/usr/local/bin/normalize-ogg') ? '/usr/local/bin/normalize-ogg' : '/usr/bin/normalize-ogg')
+ config.normalize_mp3_path = ENV['NORMALIZE_MP3_PATH'] || (File.exist?('/usr/local/bin/normalize-mp3') ? '/usr/local/bin/normalize-mp3' : '/usr/bin/normalize-mp3')
# if it looks like linux, use init.d script; otherwise use kill
config.icecast_reload_cmd = ENV['ICECAST_RELOAD_CMD'] || (File.exist?('/usr/local/bin/icecast2') ? "bash -l -c #{Shellwords.escape("sudo /etc/init.d/icecast2 reload")}" : "bash -l -c #{Shellwords.escape("kill -1 `ps -f | grep /usr/local/bin/icecast | grep -v grep | awk \'{print $2}\'`")}")
diff --git a/web/config/routes.rb b/web/config/routes.rb
index 0ec493e04..6d0228f24 100644
--- a/web/config/routes.rb
+++ b/web/config/routes.rb
@@ -401,8 +401,8 @@ SampleApp::Application.routes.draw do
match '/recordings/:id/comments' => 'api_recordings#add_comment', :via => :post, :as => 'api_recordings_add_comment'
match '/recordings/:id/likes' => 'api_recordings#add_like', :via => :post, :as => 'api_recordings_add_like'
match '/recordings/:id/discard' => 'api_recordings#discard', :via => :post, :as => 'api_recordings_discard'
-
# Recordings - recorded_tracks
+
match '/recordings/:id/tracks/:track_id' => 'api_recordings#show_recorded_track', :via => :get, :as => 'api_recordings_show_recorded_track'
match '/recordings/:id/tracks/:track_id/download' => 'api_recordings#download', :via => :get, :as => 'api_recordings_download'
match '/recordings/:id/tracks/:track_id/upload_next_part' => 'api_recordings#upload_next_part', :via => :get
diff --git a/web/spec/features/music_sessions_spec.rb b/web/spec/features/music_sessions_spec.rb
index ee22f4158..4f7fba61e 100644
--- a/web/spec/features/music_sessions_spec.rb
+++ b/web/spec/features/music_sessions_spec.rb
@@ -11,6 +11,26 @@ describe "Music Session", :js => true, :type => :feature, :capybara_feature => t
subject { page }
+ describe "recorded session" do
+
+ before(:each) do
+ ActiveMusicSession.delete_all
+ MusicSession.delete_all
+ end
+
+ let(:searcher) { FactoryGirl.create(:user) }
+ let(:creator) { FactoryGirl.create(:user) }
+ let(:conn) { FactoryGirl.create(:connection, :user => creator) }
+ let(:description) {'hot recordings in here'}
+ let(:session) {FactoryGirl.create(:active_music_session, creator:creator, description: description)}
+ let(:recording) {FactoryGirl.create(:recording, music_session: session, owner: creator)}
+
+ it "won't let user join" do
+ recording.touch
+ join_session(searcher, description:'hot recordings in here', no_verify:true)
+ find('#notification p').text('The session is currently recording.')
+ end
+ end
context "last person" do
before(:each) do
diff --git a/web/spec/features/recording_landing_spec.rb b/web/spec/features/recording_landing_spec.rb
index 45875b53b..6bf9f7beb 100644
--- a/web/spec/features/recording_landing_spec.rb
+++ b/web/spec/features/recording_landing_spec.rb
@@ -1,6 +1,6 @@
require 'spec_helper'
-describe "Landing", :js => true, :type => :feature, :capybara_feature => true do
+describe "Landing" do
let (:user) { FactoryGirl.create(:user) }
@@ -10,41 +10,70 @@ describe "Landing", :js => true, :type => :feature, :capybara_feature => true do
Recording.delete_all
end
- before(:each) do
- MusicSession.delete_all
- sign_in_poltergeist(user)
- end
let (:claimed_recording) { FactoryGirl.create(:claimed_recording) }
+ let (:recording) { claimed_recording.recording }
- it "should render comments" do
+ describe "no js required" do
- recording = ClaimedRecording.first
- comment = "test comment"
- timestamp = "less than a minute ago"
- url = "/recordings/#{claimed_recording.id}"
- visit url
+ it "shows private recording to someone who was in the session" do
+ # make the session hidden
+ claimed_recording.is_public = false
+ claimed_recording.save!
- fill_in "txtRecordingComment", with: comment
- find('#btnPostComment').trigger(:click)
+ visit "/recordings/#{claimed_recording.id}"
- # (1) Test a user creating a comment and ensure it displays.
+ # and verify that after we visit the page, we can see the name of it
+ find('strong', text: 'RECORDING NOT FOUND')
- # comment body
- find('div.comment-text', text: comment)
+ # log in the user who was a part of the session
+ sign_in(claimed_recording.user)
- # timestamp
- find('div.comment-timestamp', text: timestamp)
+ visit "/recordings/#{claimed_recording.id}"
- # (2) Test a user visiting a landing page with an existing comment.
+ # and verify that after we visit the page, we can see the name of it
+ find('h2', text: claimed_recording.name)
+ end
+ end
- # re-visit page to reload from database
- visit url
- # comment body
- find('div.comment-text', text: comment)
+ describe "js required", :js => true, :type => :feature, :capybara_feature => true do
- # timestamp
- find('div.comment-timestamp', text: timestamp)
+ before(:each) do
+ MusicSession.delete_all
+ sign_in_poltergeist(user)
+ end
+
+
+ it "should render comments" do
+
+ recording = ClaimedRecording.first
+ comment = "test comment"
+ timestamp = "less than a minute ago"
+ url = "/recordings/#{claimed_recording.id}"
+ visit url
+
+ fill_in "txtRecordingComment", with: comment
+ find('#btnPostComment').trigger(:click)
+
+ # (1) Test a user creating a comment and ensure it displays.
+
+ # comment body
+ find('div.comment-text', text: comment)
+
+ # timestamp
+ find('div.comment-timestamp', text: timestamp)
+
+ # (2) Test a user visiting a landing page with an existing comment.
+
+ # re-visit page to reload from database
+ visit url
+
+ # comment body
+ find('div.comment-text', text: comment)
+
+ # timestamp
+ find('div.comment-timestamp', text: timestamp)
+ end
end
end
\ No newline at end of file
diff --git a/web/spec/support/utilities.rb b/web/spec/support/utilities.rb
index cb1268ba5..647b8f1f7 100644
--- a/web/spec/support/utilities.rb
+++ b/web/spec/support/utilities.rb
@@ -457,9 +457,11 @@ def join_session(joiner, options)
# verify the session description is seen by second client
expect(page).to have_text(description)
find('.join-link').trigger(:click)
- find('#btn-accept-terms').trigger(:click)
- expect(page).to have_selector('h2', text: 'my tracks')
- find('#session-screen .session-mytracks .session-track')
+ unless options[:no_verify]
+ find('#btn-accept-terms').trigger(:click)
+ expect(page).to have_selector('h2', text: 'my tracks')
+ find('#session-screen .session-mytracks .session-track')
+ end
end
end
diff --git a/websocket-gateway/lib/jam_websockets/server.rb b/websocket-gateway/lib/jam_websockets/server.rb
index f03ecf11e..9d27ea040 100644
--- a/websocket-gateway/lib/jam_websockets/server.rb
+++ b/websocket-gateway/lib/jam_websockets/server.rb
@@ -80,7 +80,7 @@ module JamWebsockets
@router.periodical_check_connections
EventMachine::PeriodicTimer.new(2) do
- sane_logging { @router.periodical_check_connections }
+ safety_net { sane_logging { @router.periodical_check_connections } }
end
end
@@ -89,7 +89,7 @@ module JamWebsockets
@router.periodical_check_clients
EventMachine::PeriodicTimer.new(30) do
- sane_logging { @router.periodical_check_clients }
+ safety_net { sane_logging { @router.periodical_check_clients } }
end
end
@@ -98,16 +98,29 @@ module JamWebsockets
@router.periodical_flag_connections
EventMachine::PeriodicTimer.new(2) do
- sane_logging { @router.periodical_flag_connections }
+ safety_net { sane_logging { @router.periodical_flag_connections } }
end
end
def start_stats_dump
EventMachine::PeriodicTimer.new(60) do
- @router.periodical_stats_dump
+ safety_net { @router.periodical_stats_dump }
end
end
+ # this was added for this reason: https://jamkazam.atlassian.net/browse/VRFS-2425
+ # if an unhandled exception occurs in PeriodicTimer, it just kills all future timers; doesn't kill the app.
+ # not really what you want.
+
+ # so, we signal to Bugsnag, so we know really bad stuff is happening, but we also move
+ def safety_net(&blk)
+ begin
+ blk.call
+ rescue => e
+ Bugsnag.notify(e)
+ @log.error("unhandled exception in EM Timer #{e}")
+ end
+ end
def sane_logging(&blk)
# used around repeated transactions that cause too much ActiveRecord::Base logging
# example is handling heartbeats