Move unrelated code out of menu.js and ipc.js

main/dialog.js

@@ -5,15 +5,18 @@ module.exports = {
   openTorrentAddress
 }
 
-var config = require('../config')
 var electron = require('electron')
+
+var config = require('../config')
+var log = require('./log')
 var windows = require('./windows')
 
 /**
  * Show open dialog to create a single-file torrent.
  */
 function openSeedFile () {
   if (!windows.main.win) return
+  log('openSeedFile')
   var opts = {
     title: 'Select a file for the torrent.',
     properties: [ 'openFile' ]
@@ -22,7 +25,7 @@ function openSeedFile () {
   electron.dialog.showOpenDialog(windows.main.win, opts, function (selectedPaths) {
     resetTitle()
     if (!Array.isArray(selectedPaths)) return
-    windows.main.send('dispatch', 'showCreateTorrent', selectedPaths)
+    windows.main.dispatch('showCreateTorrent', selectedPaths)
   })
 }
 
@@ -33,6 +36,7 @@ function openSeedFile () {
  */
 function openSeedDirectory () {
   if (!windows.main.win) return
+  log('openSeedDirectory')
   var opts = process.platform === 'darwin'
     ? {
       title: 'Select a file or folder for the torrent.',
@@ -46,7 +50,7 @@ function openSeedDirectory () {
   electron.dialog.showOpenDialog(windows.main.win, opts, function (selectedPaths) {
     resetTitle()
     if (!Array.isArray(selectedPaths)) return
-    windows.main.send('dispatch', 'showCreateTorrent', selectedPaths)
+    windows.main.dispatch('showCreateTorrent', selectedPaths)
   })
 }
 
@@ -55,6 +59,7 @@ function openSeedDirectory () {
  */
 function openTorrentFile () {
   if (!windows.main.win) return
+  log('openTorrentFile')
   var opts = {
     title: 'Select a .torrent file to open.',
     filters: [{ name: 'Torrent Files', extensions: ['torrent'] }],
@@ -65,7 +70,7 @@ function openTorrentFile () {
     resetTitle()
     if (!Array.isArray(selectedPaths)) return
     selectedPaths.forEach(function (selectedPath) {
-      windows.main.send('dispatch', 'addTorrent', selectedPath)
+      windows.main.dispatch('addTorrent', selectedPath)
     })
   })
 }
@@ -74,15 +79,16 @@ function openTorrentFile () {
  * Show modal dialog to open a torrent URL (magnet uri, http torrent link, etc.)
  */
 function openTorrentAddress () {
-  windows.main.send('showOpenTorrentAddress')
+  log('openTorrentAddress')
+  windows.main.dispatch('openTorrentAddress')
 }
 
 /**
  * Dialogs on do not show a title on OS X, so the window title is used instead.
  */
 function setTitle (title) {
   if (process.platform === 'darwin') {
-    windows.main.send('dispatch', 'setTitle', title)
+    windows.main.dispatch('setTitle', title)
   }
 }
 

main/dock.js

@@ -0,0 +1,59 @@
+module.exports = {
+  downloadFinished,
+  init,
+  setBadge
+}
+
+var electron = require('electron')
+
+var app = electron.app
+
+var dialog = require('./dialog')
+var log = require('./log')
+
+/**
+ * Add a right-click menu to the dock icon. (OS X)
+ */
+function init () {
+  if (!app.dock) return
+  var menu = electron.Menu.buildFromTemplate(getMenuTemplate())
+  app.dock.setMenu(menu)
+}
+
+/**
+ * Bounce the Downloads stack if `path` is inside the Downloads folder. (OS X)
+ */
+function downloadFinished (path) {
+  if (!app.dock) return
+  log(`downloadFinished: ${path}`)
+  app.dock.downloadFinished(path)
+}
+
+/**
+ * Display string in dock badging area. (OS X)
+ */
+function setBadge (text) {
+  if (!app.dock) return
+  log(`setBadge: ${text}`)
+  app.dock.setBadge(String(text))
+}
+
+function getMenuTemplate () {
+  return [
+    {
+      label: 'Create New Torrent...',
+      accelerator: 'CmdOrCtrl+N',
+      click: () => dialog.openSeedDirectory()
+    },
+    {
+      label: 'Open Torrent File...',
+      accelerator: 'CmdOrCtrl+O',
+      click: () => dialog.openTorrentFile()
+    },
+    {
+      label: 'Open Torrent Address...',
+      accelerator: 'CmdOrCtrl+U',
+      click: () => dialog.openTorrentAddress()
+    }
+  ]
+}

main/index.js

@@ -9,6 +9,7 @@ var announcement = require('./announcement')
 var config = require('../config')
 var crashReporter = require('../crash-reporter')
 var dialog = require('./dialog')
+var dock = require('./dock')
 var handlers = require('./handlers')
 var ipc = require('./ipc')
 var log = require('./log')
@@ -61,8 +62,8 @@ function init () {
   app.on('ready', function () {
     isReady = true
 
-    windows.main.create()
-    windows.webtorrent.create()
+    windows.main.init()
+    windows.webtorrent.init()
     menu.init()
 
     // To keep app startup fast, some code is delayed.
@@ -80,28 +81,29 @@ function init () {
 
     app.isQuitting = true
     e.preventDefault()
-    windows.main.send('dispatch', 'saveState') // try to save state on exit
+    windows.main.dispatch('saveState') // try to save state on exit
     ipcMain.once('savedState', () => app.quit())
     setTimeout(() => app.quit(), 2000) // quit after 2 secs, at most
   })
 
   app.on('activate', function () {
-    if (isReady) windows.main.create()
+    if (isReady) windows.main.show()
   })
 }
 
 function delayedInit () {
   announcement.init()
-  tray.init()
+  dock.init()
   handlers.install()
+  tray.init()
   updater.init()
 }
 
 function onOpen (e, torrentId) {
   e.preventDefault()
 
   if (app.ipcReady) {
-    windows.main.send('dispatch', 'onOpen', torrentId)
+    windows.main.dispatch('onOpen', torrentId)
     // Magnet links opened from Chrome won't focus the app without a setTimeout.
     // The confirmation dialog Chrome shows causes Chrome to steal back the focus.
     // Electron issue: https://github.com/atom/electron/issues/4338
@@ -148,6 +150,6 @@ function processArgv (argv) {
     }
   })
   if (paths.length > 0) {
-    windows.main.send('dispatch', 'onOpen', paths)
+    windows.main.dispatch('onOpen', paths)
   }
 }