Merge pull request #1536 from adriantombu/feature/sound-option

Toggle the sound notifications

src/renderer/lib/migrations.js

@@ -28,6 +28,7 @@ function run (state) {
   if (semver.lt(version, '0.14.0')) migrate_0_14_0(saved)
   if (semver.lt(version, '0.17.0')) migrate_0_17_0(saved)
   if (semver.lt(version, '0.17.2')) migrate_0_17_2(saved)
+  if (semver.lt(version, '0.21.0')) migrate_0_21_0(saved)
 
   // Config is now on the new version
   state.saved.version = config.APP_VERSION
@@ -206,3 +207,10 @@ function migrate_0_17_2 (saved) {
     } catch (err) {}
   }
 }
+
+function migrate_0_21_0 (saved) {
+  if (saved.prefs.soundNotifications == null) {
+    // The app used to always have sound notifications enabled
+    saved.prefs.soundNotifications = true
+  }
+}

src/renderer/lib/sound.js

@@ -1,4 +1,5 @@
 module.exports = {
+  init,
   play
 }
 
@@ -8,6 +9,9 @@ const path = require('path')
 
 const VOLUME = 0.25
 
+// App state to access the soundNotifications preference
+let state
+
 /* Cache of Audio elements, for instant playback */
 const cache = {}
 
@@ -46,7 +50,15 @@ const sounds = {
   }
 }
 
+function init (appState) {
+  state = appState
+}
+
 function play (name) {
+  if (!state.saved.prefs.soundNotifications) {
+    return
+  }
+
   let audio = cache[name]
   if (!audio) {
     const sound = sounds[name]

src/renderer/lib/state.js

@@ -121,6 +121,7 @@ function setupStateSaved (cb) {
       openExternalPlayer: false,
       externalPlayerPath: null,
       startup: false,
+      soundNotifications: true,
       autoAddTorrents: false,
       torrentsFolderPath: '',
       highestPlaybackPriority: true

src/renderer/main.js

@@ -74,6 +74,7 @@ function onState (err, _state) {
   window.dispatch = dispatch
 
   telemetry.init(state)
+  sound.init(state)
 
   // Log uncaught JS errors
   window.addEventListener(

src/renderer/pages/preferences-page.js

@@ -26,6 +26,9 @@ class PreferencesPage extends React.Component {
 
     this.handleStartupChange =
       this.handleStartupChange.bind(this)
+
+    this.handlesoundNotificationsChange =
+      this.handlesoundNotificationsChange.bind(this)
   }
 
   downloadPathSelector () {
@@ -186,25 +189,39 @@ class PreferencesPage extends React.Component {
     dispatch('updatePreferences', 'startup', isChecked)
   }
 
-  setStartupSection () {
+  setStartupCheckbox () {
     if (config.IS_PORTABLE) {
       return
     }
 
     return (
-      <PreferencesSection title='Startup'>
       <Preference>
         <Checkbox
           className='control'
           checked={this.props.state.saved.prefs.startup}
-            label={'Open WebTorrent on startup.'}
+          label={'Open WebTorrent on startup'}
           onCheck={this.handleStartupChange}
         />
       </Preference>
-      </PreferencesSection>
     )
   }
 
+  soundNotificationsCheckbox () {
+    return (
+      <Preference>
+        <Checkbox
+          className='control'
+          checked={this.props.state.saved.prefs.soundNotifications}
+          label={'Enable sounds'}
+          onCheck={this.handlesoundNotificationsChange} />
+      </Preference>
+    )
+  }
+
+  handlesoundNotificationsChange (e, isChecked) {
+    dispatch('updatePreferences', 'soundNotifications', isChecked)
+  }
+
   handleSetDefaultApp () {
     dispatch('updatePreferences', 'isFileHandler', true)
   }
@@ -230,7 +247,10 @@ class PreferencesPage extends React.Component {
         <PreferencesSection title='Default torrent app'>
           {this.setDefaultAppButton()}
         </PreferencesSection>
-        {this.setStartupSection()}
+        <PreferencesSection title='General'>
+          {this.setStartupCheckbox()}
+          {this.soundNotificationsCheckbox()}
+        </PreferencesSection>
       </div>
     )
   }