Release 0.7.14

client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "client",
-  "version": "0.7.13",
+  "version": "0.7.14",
   "private": true,
   "scripts": {
     "build": "vite build",

client/src/App.vue

@@ -40,6 +40,13 @@
               >
                 Stop Session
               </b-dropdown-item-button>
+              <b-dropdown-item-btn
+                :disabled="CURRENT_SHOW_SESSION == null || !WEBSOCKET_HEALTHY || stoppingSession ||
+                  startingSession"
+                @click.stop.prevent="reloadClients"
+              >
+                Reload Clients
+              </b-dropdown-item-btn>
             </b-nav-item-dropdown>
           </template>
           <b-nav-item
@@ -92,7 +99,7 @@
         </b-navbar-nav>
       </b-collapse>
     </b-navbar>
     <template>
       <div
         v-if="!loaded"
         class="text-center center-spinner"
@@ -211,8 +218,23 @@
       }
       this.startingSession = false;
     },
+    async reloadClients() {
+      if (this.INTERNAL_UUID == null) {
+        this.$toast.error('Unable to start new show session');
+        return;
+      }
+      this.startingSession = true;
+      const msg = 'Are you sure you want to reload all connected clients?';
+      const action = await this.$bvModal.msgBoxConfirm(msg, {});
+      if (action === true) {
+        this.$socket.sendObj({
+          OP: 'RELOAD_CLIENTS',
+          DATA: {},
+        });
+      }
+    },
   },
   computed: {
     isAdminUser() {
       return this.CURRENT_USER != null && this.CURRENT_USER.is_admin;
     },
@@ -241,7 +263,7 @@
     ...mapGetters(['WEBSOCKET_HEALTHY', 'CURRENT_SHOW_SESSION', 'SETTINGS', 'CURRENT_USER',
       'RBAC_ROLES', 'CURRENT_USER_RBAC', 'INTERNAL_UUID']),
   },
   async created() {
     this.$router.beforeEach(async (to, from, next) => {
       if (!this.SETTINGS.has_admin_user) {
         this.$toast.error('Please create an admin user before continuing');

client/src/store/modules/show.js

@@ -16,6 +16,7 @@ export default {
     sessionFollowData: {},
     microphones: [],
     micAllocations: [],
+    noLeaderToast: null,
   },
   mutations: {
     SET_CAST_LIST(state, castList) {
@@ -57,6 +58,9 @@ export default {
     SET_MIC_ALLOCATIONS_LIST(state, micAllocations) {
       state.micAllocations = micAllocations;
     },
+    SET_TOAST_INSTANCE(state, toast) {
+      state.noLeaderToast = toast;
+    },
   },
   actions: {
     async GET_CAST_LIST(context) {
@@ -427,6 +431,11 @@ export default {
         const sessions = await response.json();
         context.commit('SET_SESSIONS_LIST', sessions.sessions);
         context.commit('SET_CURRENT_SESSION', sessions.current_session);
+        if (context.getters.NO_LEADER_TOAST
+            && context.getters.CURRENT_SHOW_SESSION.client_internal_id != null) {
+          context.getters.NO_LEADER_TOAST.dismiss();
+          context.commit('SET_TOAST_INSTANCE', null);
+        }
       } else {
         log.error('Unable to get show sessions');
       }
@@ -438,9 +447,12 @@ export default {
     },
     async NO_LEADER(context, payload) {
       await context.dispatch('GET_SHOW_SESSION_DATA');
-      Vue.$toast.warning('There is no script leader. Please scroll your own script!', {
-        duration: 0,
-      });
+      if (context.getters.NO_LEADER_TOAST == null) {
+        const instance = Vue.$toast.warning('There is no script leader. Please scroll your own script!', {
+          duration: 0,
+        });
+        context.commit('SET_TOAST_INSTANCE', instance);
+      }
     },
     SCRIPT_SCROLL(context, payload) {
       context.commit('SET_SESSION_FOLLOW_DATA', payload.DATA);
@@ -614,6 +626,9 @@ export default {
     MIC_ALLOCATIONS(state) {
       return state.micAllocations;
     },
+    NO_LEADER_TOAST(state) {
+      return state.noLeaderToast;
+    },
   }
   ,
 };

client/src/store/modules/websocket.js

@@ -26,6 +26,9 @@ export default {
       if (state.errorCount !== 0) {
         Vue.$toast.success(`Websocket reconnected after ${state.errorCount} attempts`);
         state.errorCount = 0;
+        if (router.currentRoute !== '/') {
+          window.location.reload();
+        }
       }
     },
     SOCKET_ONCLOSE(state, event) {
@@ -66,6 +69,9 @@ export default {
             router.push('/');
           }
           break;
+        case 'RELOAD_CLIENT':
+          window.location.reload();
+          break;
         default:
           log.error(`Unknown OP received from websocket: ${message.OP}`);
       }

client/src/views/show/ShowLiveView.vue

@@ -161,17 +161,26 @@
       if (this.isScriptFollowing || this.isScriptLeader) {
         if (this.CURRENT_SHOW_SESSION.latest_line_ref != null) {
           const loadCurrentPage = parseInt(this.CURRENT_SHOW_SESSION.latest_line_ref.split('_')[1], 10);
-          this.currentMinLoadedPage = Math.max(0, loadCurrentPage - this.pageBatchSize - 1);
-          this.currentLoadedPage = this.currentMinLoadedPage;
-          for (let loadIndex = this.currentMinLoadedPage;
-            loadIndex < loadCurrentPage + this.pageBatchSize; loadIndex++) {
-            // eslint-disable-next-line no-await-in-loop
-            await this.loadNextPage();
+
+          if (this.SETTINGS.enable_lazy_loading === false) {
+            this.currentMinLoadedPage = 1;
+            for (let loadIndex = 0; loadIndex < this.currentMaxPage; loadIndex++) {
+              // eslint-disable-next-line no-await-in-loop
+              await this.loadNextPage();
+            }
+          } else {
+            this.currentMinLoadedPage = Math.max(0, loadCurrentPage - this.pageBatchSize - 1);
+            this.currentLoadedPage = this.currentMinLoadedPage;
+            for (let loadIndex = this.currentMinLoadedPage;
+              loadIndex < loadCurrentPage + this.pageBatchSize; loadIndex++) {
+              // eslint-disable-next-line no-await-in-loop
+              await this.loadNextPage();
+            }
+            this.currentMinLoadedPage += 1;
           }
-          this.currentMinLoadedPage += 1;
+
           this.currentFirstPage = loadCurrentPage;
           this.currentLastPage = loadCurrentPage;
-
           await this.$nextTick();
           this.initialLoad = true;
           await this.$nextTick();
@@ -183,14 +192,28 @@
           this.computeScriptBoundaries();
         } else {
           this.currentMinLoadedPage = 1;
-          await this.loadNextPage();
+          if (this.SETTINGS.enable_lazy_loading === false) {
+            for (let loadIndex = 0; loadIndex < this.currentMaxPage; loadIndex++) {
+              // eslint-disable-next-line no-await-in-loop
+              await this.loadNextPage();
+            }
+          } else {
+            await this.loadNextPage();
+          }
           this.initialLoad = true;
           await this.$nextTick();
           this.computeScriptBoundaries();
         }
       } else {
         this.currentMinLoadedPage = 1;
-        await this.loadNextPage();
+        if (this.SETTINGS.enable_lazy_loading === false) {
+          for (let loadIndex = 0; loadIndex < this.currentMaxPage; loadIndex++) {
+            // eslint-disable-next-line no-await-in-loop
+            await this.loadNextPage();
+          }
+        } else {
+          await this.loadNextPage();
+        }
         this.initialLoad = true;
         await this.$nextTick();
         this.computeScriptBoundaries();
@@ -225,7 +248,7 @@
       const cutoffBottom = scriptContainer.offset().top + scriptContainer.outerHeight();
       const scriptSelector = $('.script-item');
 
       scriptSelector.each(function () {
         if ($(this).offset().top >= cutoffTop) {
           if (!$(this).attr('class').split(/\s+/).includes('first-script-element')) {
             scriptSelector.removeClass('first-script-element');
@@ -238,7 +261,7 @@
 
       let assignedLastScript = false;
       let lastObject = null;
       scriptSelector.each(function () {
         if (lastObject == null) {
           lastObject = this;
         } else if ($(this).offset().top > $(lastObject).offset().top
@@ -394,11 +417,14 @@
       'GET_CHARACTER_LIST', 'GET_CHARACTER_GROUP_LIST', 'LOAD_CUES', 'GET_CUE_TYPES',
       'GET_CUTS']),
   },
   computed: {
     pageIter() {
-      return [...Array(this.currentLoadedPage).keys()].map((x) => (x + 1)).filter((x) => (
-        x <= this.currentLastPage + this.pageBatchSize
-          && x >= this.currentFirstPage - this.pageBatchSize));
+      if (this.SETTINGS.enable_live_batching) {
+        return [...Array(this.currentLoadedPage).keys()].map((x) => (x + 1)).filter((x) => (
+          x <= this.currentLastPage + this.pageBatchSize
+            && x >= this.currentFirstPage - this.pageBatchSize));
+      }
+      return [...Array(this.currentMaxPage).keys()];
     },
     isScriptFollowing() {
       if (this.loadedSessionData) {
@@ -414,9 +440,9 @@
     },
     ...mapGetters(['CURRENT_SHOW_SESSION', 'GET_SCRIPT_PAGE', 'ACT_LIST', 'SCENE_LIST',
       'CHARACTER_LIST', 'CHARACTER_GROUP_LIST', 'CURRENT_SHOW', 'CUE_TYPES', 'SCRIPT_CUES',
-      'INTERNAL_UUID', 'SESSION_FOLLOW_DATA', 'SCRIPT_CUTS']),
+      'INTERNAL_UUID', 'SESSION_FOLLOW_DATA', 'SCRIPT_CUTS', 'SETTINGS']),
   },
   watch: {
     SESSION_FOLLOW_DATA() {
       if (this.isScriptFollowing) {
         let scrollToLine;

client/src/vue_components/show/config/cues/ScriptLineCueEditor.vue

@@ -30,6 +30,7 @@
           </b-button>
           <b-button
             class="cue-button"
+            :disabled="isWholeLineCut(line)"
             @click.stop="openNewForm"
           >
             <b-icon-plus-square-fill variant="success" />
@@ -41,7 +42,12 @@
           :key="`line_${lineIndex}_stage_direction`"
           style="text-align: center"
         >
-          <i class="viewable-line">{{ line.line_parts[0].line_text }}</i>
+          <i
+            class="viewable-line"
+            style="background-color: darkslateblue"
+          >
+            {{ line.line_parts[0].line_text }}
+          </i>
         </b-col>
       </template>
       <template v-else>
@@ -360,6 +366,10 @@ export default {
     cueBackgroundColour(cue) {
       return this.cueTypes.find((cueType) => (cueType.id === cue.cue_type_id)).colour;
     },
+    isWholeLineCut(line) {
+      return line.line_parts.every((linePart) => (this.linePartCuts.includes(linePart.id)
+          || linePart.line_text == null || linePart.line_text.trim().length === 0), this);
+    },
     ...mapActions(['ADD_NEW_CUE', 'EDIT_CUE', 'DELETE_CUE']),
   },
   computed: {

client/src/vue_components/show/config/script/ScriptLineViewer.vue

@@ -71,7 +71,12 @@
         :key="`line_${lineIndex}_stage_direction`"
         style="text-align: center"
       >
-        <i class="viewable-line">{{ line.line_parts[0].line_text }}</i>
+        <i
+          class="viewable-line"
+          style="background-color: darkslateblue"
+        >
+          {{ line.line_parts[0].line_text }}
+        </i>
       </b-col>
     </template>
     <b-col

client/src/vue_components/show/live/ScriptLineViewer.vue

@@ -42,7 +42,10 @@
           :key="`line_${lineIndex}_stage_direction`"
           style="text-align: center"
         >
-          <i class="viewable-line">{{ line.line_parts[0].line_text }}</i>
+          <i
+            class="viewable-line"
+            style="background-color: darkslateblue"
+          >{{ line.line_parts[0].line_text }}</i>
         </b-col>
       </template>
       <template v-else>

server/controllers/ws_controller.py

@@ -234,6 +234,15 @@ async def on_message(self, message: Union[str, bytes]): # pylint: disable=invali
                                 'SCRIPT_SCROLL',
                                 message['DATA']
                             )
+            elif ws_op == 'RELOAD_CLIENTS':
+                if show and show.current_session_id:
+                    show_session = session.query(ShowSession).get(show.current_session_id)
+                    if show_session and show_session.client_internal_id == self.__getattribute__('internal_id'):
+                        await self.application.ws_send_to_all(
+                            'RELOAD_CLIENT',
+                            'NOOP',
+                            {}
+                        )
             else:
                 get_logger().warning(f'Unknown OP {ws_op} received from '
                                      f'WebSocket connection {self.request.remote_ip}')

server/digi_server/settings.py

@@ -104,6 +104,8 @@ def __init__(self, application: DigiScriptServer, settings_path=None):
                     self._application.regen_logging)
         self.define('db_max_log_mb', int, 100, True, self._application.regen_logging)
         self.define('db_log_backups', int, 5, True, self._application.regen_logging)
+        self.define('enable_lazy_loading', bool, True, True)
+        self.define('enable_live_batching', bool, True, True)
 
         self._load(spawn_callbacks=False)