Merge pull request #1154 from webtorrent/watch-folder
Merging watch folder feature.
This commit is contained in:
50
src/main/folder-watcher.js
Normal file
50
src/main/folder-watcher.js
Normal file
@@ -0,0 +1,50 @@
|
||||
const chokidar = require('chokidar')
|
||||
const log = require('./log')
|
||||
|
||||
class FolderWatcher {
|
||||
constructor ({window, state}) {
|
||||
this.window = window
|
||||
this.state = state
|
||||
this.torrentsFolderPath = null
|
||||
this.watching = false
|
||||
}
|
||||
|
||||
isEnabled () {
|
||||
return this.state.saved.prefs.autoAddTorrents
|
||||
}
|
||||
|
||||
start () {
|
||||
// Stop watching previous folder before
|
||||
// start watching a new one.
|
||||
if (this.watching) this.stop()
|
||||
|
||||
const torrentsFolderPath = this.state.saved.prefs.torrentsFolderPath
|
||||
this.torrentsFolderPath = torrentsFolderPath
|
||||
if (!torrentsFolderPath) return
|
||||
|
||||
const glob = `${torrentsFolderPath}/**/*.torrent`
|
||||
log('Folder Watcher: watching: ', glob)
|
||||
|
||||
const options = {
|
||||
ignoreInitial: true,
|
||||
awaitWriteFinish: true
|
||||
}
|
||||
this.watcher = chokidar.watch(glob, options)
|
||||
this.watcher
|
||||
.on('add', (path) => {
|
||||
log('Folder Watcher: added torrent: ', path)
|
||||
this.window.dispatch('addTorrent', path)
|
||||
})
|
||||
|
||||
this.watching = true
|
||||
}
|
||||
|
||||
stop () {
|
||||
log('Folder Watcher: stop.')
|
||||
if (!this.watching) return
|
||||
this.watcher.close()
|
||||
this.watching = false
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = FolderWatcher
|
||||
@@ -72,13 +72,16 @@ function init () {
|
||||
if (err) throw err
|
||||
|
||||
isReady = true
|
||||
const state = results.state
|
||||
|
||||
windows.main.init(results.state, {hidden: hidden})
|
||||
windows.main.init(state, {hidden: hidden})
|
||||
windows.webtorrent.init()
|
||||
menu.init()
|
||||
|
||||
// To keep app startup fast, some code is delayed.
|
||||
setTimeout(delayedInit, config.DELAYED_INIT)
|
||||
setTimeout(() => {
|
||||
delayedInit(state)
|
||||
}, config.DELAYED_INIT)
|
||||
|
||||
// Report uncaught exceptions
|
||||
process.on('uncaughtException', (err) => {
|
||||
@@ -121,17 +124,24 @@ function init () {
|
||||
})
|
||||
}
|
||||
|
||||
function delayedInit () {
|
||||
function delayedInit (state) {
|
||||
if (app.isQuitting) return
|
||||
|
||||
const announcement = require('./announcement')
|
||||
const dock = require('./dock')
|
||||
const updater = require('./updater')
|
||||
const FolderWatcher = require('./folder-watcher')
|
||||
const folderWatcher = new FolderWatcher({window: windows.main, state})
|
||||
|
||||
announcement.init()
|
||||
dock.init()
|
||||
updater.init()
|
||||
|
||||
ipc.setModule('folderWatcher', folderWatcher)
|
||||
if (folderWatcher.isEnabled()) {
|
||||
folderWatcher.start()
|
||||
}
|
||||
|
||||
if (process.platform === 'win32') {
|
||||
const userTasks = require('./user-tasks')
|
||||
userTasks.init()
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
module.exports = {
|
||||
init
|
||||
init,
|
||||
setModule
|
||||
}
|
||||
|
||||
const electron = require('electron')
|
||||
@@ -13,6 +14,14 @@ const windows = require('./windows')
|
||||
// Messages from the main process, to be sent once the WebTorrent process starts
|
||||
const messageQueueMainToWebTorrent = []
|
||||
|
||||
// Will hold modules injected from the app that will be used on fired
|
||||
// IPC events.
|
||||
const modules = {}
|
||||
|
||||
function setModule (name, module) {
|
||||
modules[name] = module
|
||||
}
|
||||
|
||||
function init () {
|
||||
const ipc = electron.ipcMain
|
||||
|
||||
@@ -58,7 +67,7 @@ function init () {
|
||||
})
|
||||
|
||||
/**
|
||||
* Events
|
||||
* Player Events
|
||||
*/
|
||||
|
||||
ipc.on('onPlayerOpen', function () {
|
||||
@@ -106,6 +115,28 @@ function init () {
|
||||
thumbar.onPlayerPause()
|
||||
})
|
||||
|
||||
/**
|
||||
* Folder Watcher Events
|
||||
*/
|
||||
|
||||
ipc.on('startFolderWatcher', function () {
|
||||
if (!modules['folderWatcher']) {
|
||||
log('IPC ERR: folderWatcher module is not defined.')
|
||||
return
|
||||
}
|
||||
|
||||
modules['folderWatcher'].start()
|
||||
})
|
||||
|
||||
ipc.on('stopFolderWatcher', function () {
|
||||
if (!modules['folderWatcher']) {
|
||||
log('IPC ERR: folderWatcher module is not defined.')
|
||||
return
|
||||
}
|
||||
|
||||
modules['folderWatcher'].stop()
|
||||
})
|
||||
|
||||
/**
|
||||
* Shell
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user