diff --git a/main/ipc.js b/main/ipc.js index 1846542d..3393a6c6 100644 --- a/main/ipc.js +++ b/main/ipc.js @@ -2,7 +2,6 @@ module.exports = { init } -var debug = require('debug')('webtorrent-app:ipcMain') var electron = require('electron') var app = electron.app @@ -95,7 +94,7 @@ function setBounds (bounds, maximize) { } function setAspectRatio (aspectRatio, extraSize) { - debug('setAspectRatio %o %o', aspectRatio, extraSize) + log('setAspectRatio %o %o', aspectRatio, extraSize) if (windows.main) { windows.main.setAspectRatio(aspectRatio, extraSize) } @@ -103,13 +102,13 @@ function setAspectRatio (aspectRatio, extraSize) { // Display string in dock badging area (OS X) function setBadge (text) { - debug('setBadge %s', text) + log('setBadge %s', text) if (app.dock) app.dock.setBadge(String(text)) } // Show progress bar. Valid range is [0, 1]. Remove when < 0; indeterminate when > 1. function setProgress (progress) { - debug('setProgress %s', progress) + log('setProgress %s', progress) if (windows.main) { windows.main.setProgressBar(progress) } @@ -117,12 +116,12 @@ function setProgress (progress) { function blockPowerSave () { powerSaveBlockID = powerSaveBlocker.start('prevent-display-sleep') - debug('blockPowerSave %d', powerSaveBlockID) + log('blockPowerSave %d', powerSaveBlockID) } function unblockPowerSave () { if (powerSaveBlocker.isStarted(powerSaveBlockID)) { powerSaveBlocker.stop(powerSaveBlockID) - debug('unblockPowerSave %d', powerSaveBlockID) + log('unblockPowerSave %d', powerSaveBlockID) } } diff --git a/main/menu.js b/main/menu.js index 3c1b01c0..1e52e2ff 100644 --- a/main/menu.js +++ b/main/menu.js @@ -10,12 +10,12 @@ module.exports = { toggleFullScreen } -var debug = require('debug')('webtorrent-app:menu') var electron = require('electron') var app = electron.app var config = require('../config') +var log = require('./log') var windows = require('./windows') var appMenu, dockMenu @@ -29,7 +29,7 @@ function init () { } function toggleFullScreen (flag) { - debug('toggleFullScreen %s', flag) + log('toggleFullScreen %s', flag) if (windows.main && windows.main.isVisible()) { flag = flag != null ? flag : !windows.main.isFullScreen() windows.main.setFullScreen(flag) @@ -38,7 +38,7 @@ function toggleFullScreen (flag) { // Sets whether the window should always show on top of other windows function toggleFloatOnTop (flag) { - debug('toggleFloatOnTop %s', flag) + log('toggleFloatOnTop %s', flag) if (windows.main) { flag = flag != null ? flag : !windows.main.isAlwaysOnTop() windows.main.setAlwaysOnTop(flag) @@ -59,32 +59,32 @@ function decreaseVolume () { } function toggleDevTools () { - debug('toggleDevTools') + log('toggleDevTools') if (windows.main) { windows.main.toggleDevTools() } } function reloadWindow () { - debug('reloadWindow') + log('reloadWindow') if (windows.main) { windows.main.webContents.reloadIgnoringCache() } } function addFakeDevice (device) { - debug('addFakeDevice %s', device) + log('addFakeDevice %s', device) windows.main.send('addFakeDevice', device) } function onWindowShow () { - debug('onWindowShow') + log('onWindowShow') getMenuItem('Full Screen').enabled = true getMenuItem('Float on Top').enabled = true } function onWindowHide () { - debug('onWindowHide') + log('onWindowHide') getMenuItem('Full Screen').enabled = false getMenuItem('Float on Top').enabled = false } diff --git a/package.json b/package.json index 479107ef..c26f5fdc 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,6 @@ "application-config-path": "^0.1.0", "chromecasts": "^1.8.0", "create-torrent": "^3.22.1", - "debug": "^2.2.0", "drag-drop": "^2.11.0", "electron-localshortcut": "^0.6.0", "electron-prebuilt": "0.37.2", @@ -61,7 +60,6 @@ }, "scripts": { "clean": "node ./bin/clean.js", - "debug": "DEBUG=* electron .", "package": "npm install && npm prune && npm dedupe && node ./bin/package.js", "size": "npm run package -- darwin && du -ch dist/WebTorrent-darwin-x64 | grep total", "start": "electron .",