Merge pull request #412 from nono/start-sync

Improve the start synchronisation sequence

Author: kosssi

gui/app/main.js

@@ -370,6 +370,15 @@ const startSync = (force) => {
   })
 }
 
+const appLoaded = () => {
+  if (desktop.config.hasDevice()) {
+    device = desktop.config.getDevice()
+    if (device.deviceName && device.url && device.path) {
+      setTimeout(startSync, 20)
+    }
+  }
+}
+
 const createWindow = () => {
   runAsService = new BrowserWindow({ show: false })
   mainWindow = new BrowserWindow(windowOptions)
@@ -381,21 +390,16 @@ const createWindow = () => {
     mainWindow.setMenu(null)
   }
   mainWindow.on('closed', () => { mainWindow = null })
-  mainWindow.webContents.on('dom-ready', () => {
-    if (desktop.config.hasDevice()) {
-      device = desktop.config.getDevice()
-      if (device.deviceName && device.url && device.path) {
-        setTimeout(startSync, 20)
-      }
-    }
-  })
+  mainWindow.webContents.on('dom-ready', appLoaded)
 }
 
 loadLastFiles()
 
 app.on('ready', () => {
   if (process.argv.indexOf('--hidden') === -1) {
     createWindow()
+  } else {
+    appLoaded()
   }
   tray = new electron.Tray(`${__dirname}/images/tray-icon-linux/idle.png`)
   setTrayIcon('idle')

src/local/watcher.coffee

@@ -20,6 +20,12 @@ class LocalWatcher
     constructor: (@syncPath, @prep, @pouch) ->
         @side = 'local'
 
+        # Use a queue for checksums to avoid computing many checksums at the
+        # same time. It's better for performance (hard disk are faster with
+        # linear readings).
+        @checksumer = async.queue @computeChecksum
+
+
     # Start chokidar, the filesystem watcher
     # https://github.com/paulmillr/chokidar
     #
@@ -140,9 +146,13 @@ class LocalWatcher
             else                    "file"
         return [mimeType, fileClass]
 
-    # Get checksum for given file
+    # Put a checksum computation in the queue
     checksum: (filePath, callback) ->
-        stream = fs.createReadStream filePath
+        @checksumer.push filePath: filePath, callback
+
+    # Get checksum for given file
+    computeChecksum: (task, callback) ->
+        stream = fs.createReadStream task.filePath
         checksum = crypto.createHash 'sha1'
         checksum.setEncoding 'hex'
         stream.on 'end', ->