Release 4.2.0 (#351)

* Add resize for background and text for Overlay (#210)

* Add resize for background and text for Overlay

* reverse buttons

* Remove mocha

* 206 handle port conflict gracefully (#227)

* check for pre-defined 12 ports. If none are available, then display an error message and quite gracefully

* formatting errors

* resolve merge conflict

* removed console log messages

* Add opacity and separate fonts for overlay (#226)

lint fixes

remove logo

Gurbani font size

fix defaults

* 182 present next line in a different style (#215)

* 182 Added opacity for next line. Combined animation for all but the main gurbani line

* 182: Change Style of next Line

* 182 Added opacity for next line. Combined animation for all but the main gurbani line

* 182: Change Style of next Line

* 182 Added opacity for next line. Combined animation for all but the main gurbani line

* 182: Change Style of next Line

* Supporting next line Gurbani Font Sizes 1 through 16

* New UI (#228)

* Allows choosing source in search settings

* Adds rehatnamas in search sources

* implements new UI

* Adds plus minus button overlay and minor bug fixes

* Update defaults.json

* Fixes bugs in high priority list

* Fixes height issue when keyboard is opened

* Fixes the sync between settings

* Uses constant keys for source id

* Fixes issues in the PR 228

* Fixes minor bugs

* WIP: Fixes clutters issue in new UI (#229)

* Fixes clutter issues in new ui

* Increases navigator width for mac

* Shortens the search type label

* Fixes z-index of footer

* Fixes minimize icon in presenter view

* Adds dropdown for search type; Adds minimize/maximize button in non presenter window

* Adds minimize icon on all views

* Fixes select dropdown and viewer size in presentation mode

* Fixes issue #234: presenter view when casting in new UI not correct size (#237)

* Fixes size of viewer window in presenter view (issue 234)

* Fixes overflow on smaller screen in presenter-view

* [235] Fixes Cast not showing next line for new UI (#238)

* [246] Prevents multiple instances of secondary windows (#247)

* [231] Allow Scripture filtering and quick swith between search types

* Hide scripture filter if all is selected and no results. fix ang search default.

* default only for all

* Shows presenter-view without external display (#248)

* Shows presenter-view without external display

* fixes presenter-view switching while casting

* Fixes anncouncement box style and scripture filter style

* Show empty slide on obs

* Show which scripture is selected

* Show maximize when search panel is minimized

* Update copyright in about STTM

* Overlap text (#278)

* changes how transitions function to prevent overlapping

* lints properly

* Adds display options tab (#243)

* Adds display tab

* adds options in the display tab

* Maintains consistency with event listeners

* Switches to dropdown instead of select for more tabs

* Fixes cast menu in windows (#277)

* Adds Debounce for shabad selection (#284)

* Debounce search results click

* Debounce hukamnamaButton and anandKarajButton

* debounce on leading edge

* remove console log

* Update version and changelog (#287)

* Update version and changelog

* Update CHANGELOG.md

* Update CHANGELOG.md

* Fix #281 Clears the current shabad when selecting a shabad (#299)

* Fix #281 Clears the current shabad when selecting a shabad

* clean up code

* replaces ampersand with and (#306)

* fixes instruction for mac packaging (#310)

* Fix #298 Increase size range for bani overlay (#311)

* adds custom slides to obs overlay, fixes #296 (#305)

* adds slides to obs overlay

* removes console log and broadcast flag

* Show Larivaar in overlay file (#314)

* Increasing padding for overlay content bar (#315)

* Realm (#308)

* Realm migration script and first letter search

* Decompress bzip2

* Download latest Realm DB
Remove SQLite3 and zip processes

* Remove table aliases
Full word search
Respect order

* Update MD5 path

* chmod downloaded file so it can be used

* Update Realm schemas

* Update search, loadShabad, getAng, loadAng for realm

* Update loadAdjacentShabad for Realm
Commit forgotten line

* Update schema definitions

* Update randomShabad for realm

* Update SourceID queries to include schema

* Make Gurmukhi full word search case-sensitive

* Remove timers

* Update viewer to use Realm

* Fix #205

* Fix 73 consolidate search (#313)

* Promisify all search methods and perform all searches inside local banidb module

* Update viewer.js to use local banidb module
ES6-ify functions for scope consistency

* fix #73

* Fix Hukamnama retrieval

* Clarify database cleanup comment

* Add docs for all local banidb api methods

* Rexpect source during first-letter searches

* Fixes sttm logo on 4:3 screen (#285)

* Fixes sttm logo on 4:3 screen

* Fixes logo position

* Fix #302 and Fix #323 Style fixes for download bar and theme selector (#325)

* fixes next line windows (#327)

* Fix 291 overlay auto adjust (#326)

* Consolidate socket.io emits from main process
Send overlay vars and last line on new connection

* Use OBS output inside webview for overlay preview
Use CSS for layout configuration
Add sample line for preview-only
Send overlayPrefs in realtime on change
Use % padding for bar size changes
Use vh font sizes

* Fix #291
Update defaults

* Fix linting error

* Fix #304 Use Verdana for transl(iter)ation in OBS output

* Fix #307 Load Akhand Paath View correctly (#320)

* Fix #307 Load Akhand Paath View correctly

* Fixed disabling of apv during casting

* add sub label for apv switch

* Allow live feed file directory (#328)

* Update Readme (#332)

* Update Readme

* Update

* Spelling Fixes

* fix more grammar

* even more spelling fixes

* Fix #331 Move Others tab to same line as all tabs (#334)

Remove more-tabs functionality
Hide labels for tabs on smaller screens and show tooltips

* Fix #338 Show blank overlay on emplty slide (#339)

* Fix #337 Retain presenter view when casting stopped (#340)

* Fix 336  (#342)

* Fix #336 Move decompress action to main process

* Use adm-zip and move process back to desktop_scripts for simplicity

* Fix extracted filename

* Use extract-zip

* Fix 323 hover regression (#343)

* Fix #323 Mitigate regression for list hovers

* Remove unneeded rule

* Fix vulnerable packages (#347)

* Fix #336 Disable search during database download (#346)

* Fix #336 Disable search during database download

* Decompress new DB into a different folder and then replace the older DB
Revert disabled search approach

* Revert download message and add also display when downloading (non-forced)

* Fix #344 Disable Ang search during DB download

* Update Changelog and Package Version - 4.2 release (#349)

.eslintrc

@@ -6,8 +6,7 @@
     "node": true
   },
   "rules": {
-    "no-mixed-operators": "off",
-    "arrow-parens": ["warn", "as-needed"]
+    "no-mixed-operators": "off"
   },
   "settings": {
     "import/core-modules": "electron"

CHANGELOG.md

@@ -1,5 +1,21 @@
 ## SikhiToTheMax Desktop App
 
+### 4.2.0 - _181031_
+#### Improved
+* **Searching**: Your searches will be faster than ever thanks to our improved database.
+* **Bani Overlay** - 
+  * You can now Overlay with Lareevaar! 
+  * "Insert" slide options (custom slide, Waheguru slide, blank slide, etc) now appear on the overlay.
+  * The font for the English translation looks cooler.
+  * The overlaying padding and sizes are way smarter.
+* **Chromecast** - Spacing on ChromeCast now matches Presenter View preview
+* Moved the "Others" tab in Presenter View to a dedicated location rather than a drop-down
+* Bug Fixes
+* Style Fixes
+
+#### Added
+* **Live Feed** - Added ability to choose where you save Live Feed Text Files
+
 ### 4.1.0 - _180824_
 
 #### Improved

README.md

@@ -1,5 +1,18 @@
-SikhiToTheMax Desktop App
-=========================
+# SikhiToTheMax Desktop App
+
+Originally developed by SHARE Charity UK, SikhiToTheMax has become a de facto standard for Keertans and Gurdwaras around the world to display Gurbani on screens for Sangat to join into the depth of Gurbani and translations.
+
+SikhiToTheMax is now developed by Khalis Foundation as Seva to the Panth and Khalis Foundation is working hard to ensure it lives up to its name.
+Khalis Foundation Sevadaars are currently working hard to build a newer version of SikhiToTheMax app using modern technologies.
+
+Download: https://khalisfoundation.org/portfolio/sikhitothemax/
+
+Developer: Khalis Foundation and sevadars (see committers for more details)
+
+Acknowledgements: Bhai Tarsem Singh UK, SHARE UK, Khalis Foundation, Khalsa Foundation UK, Dr. Sant Singh Khalsa, Dr. Kulbir Singh Thind
+
+Powered by [<img height="30" src="http://www.banidb.com/wp-content/uploads/2018/03/full-banidb-logo.png">](http://banidb.com)
+
 
 [![Build Status](https://api.travis-ci.org/KhalisFoundation/sttm-desktop.svg?branch=release)](https://travis-ci.org/KhalisFoundation/sttm-desktop) [![Build Status](https://ci.appveyor.com/api/projects/status/github/khalisfoundation/sttm-desktop?branch=release&svg=true)](https://ci.appveyor.com/project/navdeepsinghkhalsa/sttm-desktop)
 
@@ -18,7 +31,7 @@ SikhiToTheMax Desktop App
 
 Create the app package for your system:
 
- * **macOS** - Run `npm run pack:osx`
+ * **macOS** - Run `npm run pack:mac`
  * **Windows 64-bit** - Run `npm run pack:win`
  * **Windows 32-bit** - Run `npm run pack:win32`
  * **Linux/Ubuntu 64-bit** - Run `npm run pack:linux`

app.js

@@ -118,14 +118,14 @@ autoUpdater.on('update-downloaded', () => {
     type: 'info',
     buttons: [
       'Dismiss',
-      'Install & Restart',
+      'Install and Restart',
     ],
     defaultId: 1,
     title: 'Update available.',
     message: 'Update available.',
     detail: 'Update downloaded and ready to install',
     cancelId: 0,
-  }, response => {
+  }, (response) => {
     if (response === 1) {
       autoUpdater.quitAndInstall();
     }
@@ -150,7 +150,7 @@ function checkForExternalDisplay() {
   const electronScreen = electron.screen;
   const displays = electronScreen.getAllDisplays();
   let externalDisplay = null;
-  Object.keys(displays).forEach(i => {
+  Object.keys(displays).forEach((i) => {
     if (displays[i].bounds.x !== 0 || displays[i].bounds.y !== 0) {
       externalDisplay = displays[i];
     }
@@ -293,7 +293,8 @@ ipcMain.on('clear-apv', () => {
 });
 
 function createBroadcastFiles(arg) {
-  const userDataPath = electron.app.getPath('userData');
+  const liveFeedLocation = store.get('userPrefs.app.live-feed-location');
+  const userDataPath = (liveFeedLocation === 'default' || !liveFeedLocation) ? electron.app.getPath('desktop') : liveFeedLocation;
   const gurbaniFile = `${userDataPath}/sttm-Gurbani.txt`;
   const englishFile = `${userDataPath}/sttm-English.txt`;
   try {
@@ -307,10 +308,30 @@ function createBroadcastFiles(arg) {
   }
 }
 
-ipcMain.on('show-line', (event, arg) => {
+let lastLine;
+const showLine = (line, socket = io) => {
+  const overlayPrefs = store.get('obs');
+  const payload = Object.assign(line, overlayPrefs);
+  socket.emit('show-line', payload);
+};
+
+const updateOverlayVars = () => {
   const overlayPrefs = store.get('obs');
-  const payload = Object.assign(arg, overlayPrefs);
-  io.emit('show-line', payload);
+  io.emit('update-prefs', overlayPrefs);
+};
+
+ipcMain.on('update-overlay-vars', updateOverlayVars);
+
+io.on('connection', (socket) => {
+  updateOverlayVars();
+  if (lastLine) {
+    showLine(lastLine, socket);
+  }
+});
+
+ipcMain.on('show-line', (event, arg) => {
+  lastLine = arg;
+  showLine(arg);
   if (viewerWindow) {
     viewerWindow.webContents.send('show-line', arg);
   } else {
@@ -325,7 +346,6 @@ ipcMain.on('show-line', (event, arg) => {
 });
 
 ipcMain.on('show-empty-slide', () => {
-  const overlayPrefs = store.get('obs');
   const emptyLine = {
     Line: {
       Gurmukhi: '',
@@ -334,16 +354,24 @@ ipcMain.on('show-empty-slide', () => {
       Transliteration: '',
     },
   };
-  const payload = Object.assign(emptyLine, overlayPrefs);
-
-  io.emit('show-line', payload);
-
+  showLine(emptyLine);
+  const overlayPrefs = store.get('obs');
   if (overlayPrefs.live) {
     createBroadcastFiles(emptyLine);
   }
 });
 
 ipcMain.on('show-text', (event, arg) => {
+  const textLine = {
+    Line: {
+      Gurmukhi: arg.isGurmukhi ? arg.text : '',
+      English: !arg.isGurmukhi ? arg.text : '',
+      PunjabiUni: '',
+      Transliteration: '',
+    },
+  };
+  showLine(textLine);
+
   if (viewerWindow) {
     viewerWindow.webContents.send('show-text', arg);
   } else {
@@ -352,6 +380,9 @@ ipcMain.on('show-text', (event, arg) => {
       data: arg,
     });
   }
+  if (arg.live) {
+    createBroadcastFiles(arg);
+  }
 });
 
 ipcMain.on('scroll-from-main', (event, arg) => {