From 830a5eb3e43b3065c02351b621ac1633ab91a9f3 Mon Sep 17 00:00:00 2001 From: Bilal Date: Wed, 15 Jul 2020 21:14:59 +0200 Subject: [PATCH 1/5] Do not change player source if stream updates but user is watching recording --- app/assets/javascripts/channels/broadcasts.coffee | 2 +- ...ious_recordings.js.erb => stream_player.js.erb} | 6 ++++-- app/views/broadcasts/show.html.erb | 4 ++-- db/structure.sql | 14 -------------- 4 files changed, 7 insertions(+), 19 deletions(-) rename app/assets/javascripts/{play_previous_recordings.js.erb => stream_player.js.erb} (83%) diff --git a/app/assets/javascripts/channels/broadcasts.coffee b/app/assets/javascripts/channels/broadcasts.coffee index 9ed744f..d93608c 100644 --- a/app/assets/javascripts/channels/broadcasts.coffee +++ b/app/assets/javascripts/channels/broadcasts.coffee @@ -21,7 +21,7 @@ $(document).on "turbolinks:load", -> refreshBroadcastVideo: (data) -> $("#broadcast_updates").html data.status_content - if data.streamer_status == 'recording' && data.status == 'active' + if data.streamer_status == 'recording' && data.status == 'active' && !window.recording_selected $("#broadcast_video").html data.video_content new (Clappr.Player)( parentId: '#broadcast_video' diff --git a/app/assets/javascripts/play_previous_recordings.js.erb b/app/assets/javascripts/stream_player.js.erb similarity index 83% rename from app/assets/javascripts/play_previous_recordings.js.erb rename to app/assets/javascripts/stream_player.js.erb index c3c7b49..e879730 100644 --- a/app/assets/javascripts/play_previous_recordings.js.erb +++ b/app/assets/javascripts/stream_player.js.erb @@ -3,7 +3,7 @@ $(document).on("click", "[data-behavior=play_recording]", function() { return false; } - console.warn('Play prev : ', playback_url); + window.recording_selected = true; var playback_url = $(this).attr("data-playback-url") $("#broadcast_video").empty(); @@ -23,4 +23,6 @@ $(document).on("click", "[data-behavior=play_recording]", function() { $(this).siblings().children("i").remove(); $(this).addClass('active'); $(this).prepend(' '); -}); \ No newline at end of file +}); + +$(document).on("click", "[data-behavior=play_stream]", function() { window.recording_selected = false; }); \ No newline at end of file diff --git a/app/views/broadcasts/show.html.erb b/app/views/broadcasts/show.html.erb index 12e0a93..d36fccc 100644 --- a/app/views/broadcasts/show.html.erb +++ b/app/views/broadcasts/show.html.erb @@ -33,10 +33,10 @@ <%= link_to "Switch View", "#", class: "btn btn-light border dropdown-toggle", role: "button", id: "dropdownMenuLink", data: { toggle: "dropdown" }, aria: { haspopup: "true", expanded: "false" } %>
Live Streams
- <%= link_to fa_icon("check", text: @broadcast.name.titleize), "#", class: "dropdown-item active" %> + <%= link_to fa_icon("check", text: @broadcast.name.titleize), "#", data: { behavior: "play_stream"}, class: "dropdown-item active" %> <% @multi_view_broadcasts.each do |broadcast| %> <% if broadcast.id != @broadcast.id %> - <%= link_to broadcast.name.titleize, broadcast.url, class: class_string("dropdown-item", "active" => @broadcast.id == broadcast.id) %> + <%= link_to broadcast.name.titleize, broadcast.url, data: { behavior: "play_stream"}, class: class_string("dropdown-item", "active" => @broadcast.id == broadcast.id) %> <% end %> <% end %>
Previous Sessions
diff --git a/db/structure.sql b/db/structure.sql index ba4ce52..e30e5ed 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -9,20 +9,6 @@ SET xmloption = content; SET client_min_messages = warning; SET row_security = off; --- --- Name: plpgsql; Type: EXTENSION; Schema: -; Owner: - --- - -CREATE EXTENSION IF NOT EXISTS plpgsql WITH SCHEMA pg_catalog; - - --- --- Name: EXTENSION plpgsql; Type: COMMENT; Schema: -; Owner: - --- - -COMMENT ON EXTENSION plpgsql IS 'PL/pgSQL procedural language'; - - -- -- Name: fuzzystrmatch; Type: EXTENSION; Schema: -; Owner: - -- -- 2.47.3 From dcc1d098d2b044b38233c1c2d55932bce83d0643 Mon Sep 17 00:00:00 2001 From: Bilal Date: Thu, 16 Jul 2020 13:52:19 +0200 Subject: [PATCH 2/5] add spec --- .../features/user_managing_broadcasts_spec.rb | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/spec/features/user_managing_broadcasts_spec.rb b/spec/features/user_managing_broadcasts_spec.rb index 21eac96..28c25fa 100644 --- a/spec/features/user_managing_broadcasts_spec.rb +++ b/spec/features/user_managing_broadcasts_spec.rb @@ -78,6 +78,42 @@ feature 'User managing broadcasts' do expect(page).to have_content token_reset_notice end + scenario 'Player will not reload if stream is reactivated while user is watching previous recording', js: true do + broadcast = create(:broadcast, :with_stream, :with_files, project: project) + recording = create(:broadcast_recording, broadcast: broadcast) + + visit project_broadcast_path(project, broadcast) + + expect(page).to have_content stream_idle_message + + broadcast.streamer_status = :recording + broadcast.status = :active + BroadcastsChannel.broadcast_stream_updates(broadcast) + + expect(page).to have_content stream_begun_message + + broadcast.streamer_status = :idle + broadcast.status = :idle + BroadcastsChannel.broadcast_stream_updates(broadcast) + + expect(page).to have_content stream_idle_message + + click_on switch_view_dropdown + click_on recording.download_file_name + + player = find('#broadcast_video', visible: :all) + player_html_for_recording = player.native.attribute('outerHTML').clone + + broadcast.streamer_status = :recording + broadcast.status = :active + BroadcastsChannel.broadcast_stream_updates(broadcast) + + expect(page).to have_content stream_begun_message + + player_html_after_stream_starts = player.native.attribute('outerHTML') + expect(player_html_after_stream_starts).to eq player_html_for_recording + end + scenario 'user can go back and forth between live session and previous sessions', js: true do broadcast = create(:broadcast, :with_stream, :with_files, project: project) recording = create(:broadcast_recording, broadcast: broadcast) @@ -212,4 +248,14 @@ feature 'User managing broadcasts' do def token_reset_notice t 'broadcasts.update.reset_notice' end + + def stream_begun_message + 'Live stream has begun, click play to watch it' + end + + def stream_idle_message + 'Live stream is waiting to begin' + end + + end -- 2.47.3 From a076edcf8b10dbdaadfe49c14c5829bcb427150c Mon Sep 17 00:00:00 2001 From: Bilal Date: Fri, 17 Jul 2020 08:25:46 +0200 Subject: [PATCH 3/5] fix MR comment --- app/assets/javascripts/channels/broadcasts.coffee | 3 ++- app/assets/javascripts/stream_player.js.erb | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/channels/broadcasts.coffee b/app/assets/javascripts/channels/broadcasts.coffee index d93608c..f163bee 100644 --- a/app/assets/javascripts/channels/broadcasts.coffee +++ b/app/assets/javascripts/channels/broadcasts.coffee @@ -21,7 +21,8 @@ $(document).on "turbolinks:load", -> refreshBroadcastVideo: (data) -> $("#broadcast_updates").html data.status_content - if data.streamer_status == 'recording' && data.status == 'active' && !window.recording_selected + stream_selected = $("#broadcast_video").attr('video-type') == 'stream'; + if data.streamer_status == 'recording' && data.status == 'active' && stream_selected $("#broadcast_video").html data.video_content new (Clappr.Player)( parentId: '#broadcast_video' diff --git a/app/assets/javascripts/stream_player.js.erb b/app/assets/javascripts/stream_player.js.erb index e879730..4a9f00d 100644 --- a/app/assets/javascripts/stream_player.js.erb +++ b/app/assets/javascripts/stream_player.js.erb @@ -3,7 +3,7 @@ $(document).on("click", "[data-behavior=play_recording]", function() { return false; } - window.recording_selected = true; + $("#broadcast_video").attr('video-type', 'recording'); var playback_url = $(this).attr("data-playback-url") $("#broadcast_video").empty(); @@ -25,4 +25,4 @@ $(document).on("click", "[data-behavior=play_recording]", function() { $(this).prepend(' '); }); -$(document).on("click", "[data-behavior=play_stream]", function() { window.recording_selected = false; }); \ No newline at end of file +$(document).on("click", "[data-behavior=play_stream]", function() { $("#broadcast_video").attr('video-type', 'stream'); }); \ No newline at end of file -- 2.47.3 From d9f5e2cd100882734c777bb3c2a350fa35f1566a Mon Sep 17 00:00:00 2001 From: Bilal Date: Fri, 17 Jul 2020 08:40:29 +0200 Subject: [PATCH 4/5] fix spec --- spec/features/user_managing_broadcasts_spec.rb | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/spec/features/user_managing_broadcasts_spec.rb b/spec/features/user_managing_broadcasts_spec.rb index 28c25fa..00ca6bb 100644 --- a/spec/features/user_managing_broadcasts_spec.rb +++ b/spec/features/user_managing_broadcasts_spec.rb @@ -91,27 +91,24 @@ feature 'User managing broadcasts' do BroadcastsChannel.broadcast_stream_updates(broadcast) expect(page).to have_content stream_begun_message + expect(page).not_to have_css('div#broadcast_video[video-type="stream"]') broadcast.streamer_status = :idle broadcast.status = :idle BroadcastsChannel.broadcast_stream_updates(broadcast) - expect(page).to have_content stream_idle_message - click_on switch_view_dropdown click_on recording.download_file_name - player = find('#broadcast_video', visible: :all) - player_html_for_recording = player.native.attribute('outerHTML').clone + expect(page).to have_content stream_idle_message + expect(page).to have_css('div#broadcast_video[video-type="recording"]') broadcast.streamer_status = :recording broadcast.status = :active BroadcastsChannel.broadcast_stream_updates(broadcast) expect(page).to have_content stream_begun_message - - player_html_after_stream_starts = player.native.attribute('outerHTML') - expect(player_html_after_stream_starts).to eq player_html_for_recording + expect(page).to have_css('div#broadcast_video[video-type="recording"]') end scenario 'user can go back and forth between live session and previous sessions', js: true do -- 2.47.3 From fe61e5bc472fbcf77867bccc629aeae7e72fea0f Mon Sep 17 00:00:00 2001 From: Bilal Date: Fri, 17 Jul 2020 09:12:36 +0200 Subject: [PATCH 5/5] fix spec --- spec/features/user_managing_broadcasts_spec.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spec/features/user_managing_broadcasts_spec.rb b/spec/features/user_managing_broadcasts_spec.rb index 00ca6bb..44a4eea 100644 --- a/spec/features/user_managing_broadcasts_spec.rb +++ b/spec/features/user_managing_broadcasts_spec.rb @@ -91,7 +91,7 @@ feature 'User managing broadcasts' do BroadcastsChannel.broadcast_stream_updates(broadcast) expect(page).to have_content stream_begun_message - expect(page).not_to have_css('div#broadcast_video[video-type="stream"]') + expect(page).to have_selector('div#broadcast_video', count: 1) broadcast.streamer_status = :idle broadcast.status = :idle @@ -101,14 +101,14 @@ feature 'User managing broadcasts' do click_on recording.download_file_name expect(page).to have_content stream_idle_message - expect(page).to have_css('div#broadcast_video[video-type="recording"]') + expect(page).to have_selector('div#broadcast_video', count: 1) broadcast.streamer_status = :recording broadcast.status = :active BroadcastsChannel.broadcast_stream_updates(broadcast) expect(page).to have_content stream_begun_message - expect(page).to have_css('div#broadcast_video[video-type="recording"]') + expect(page).to have_selector('div#broadcast_video', count: 1) end scenario 'user can go back and forth between live session and previous sessions', js: true do -- 2.47.3