added filter for download/upload

Author: BrainFooLong

public/scripts/src/lang.js

@@ -54,8 +54,10 @@ gl.lang.replaceInHtml = function (el) {
   elements.removeAttr('data-translate')
   elements = el.find('[data-translate-property]')
   elements.each(function () {
-    const s = $(this).attr('data-translate-property').split(',')
-    $(this).attr(s[0], get(s[1]))
+    let s = $(this).attr('data-translate-property').split(',')
+    while (s.length >= 2) {
+      $(this).attr(s.shift(), get(s.shift()))
+    }
   })
   elements.removeAttr('data-translate-property')
 }

public/scripts/src/lang/en.json

@@ -10,8 +10,8 @@
   "log.ftpserver.readdir": "Read directory list of {directory}",
   "log.ftpserver.ready": "Server connection successfull",
   "log.ftpserver.sftpready": "SSH connection successfull",
-  "log.local.file.deleted" : "Local file deleted {file}",
-  "log.server.file.deleted" : "Server file deleted {file}",
+  "log.local.file.deleted": "Local file deleted {file}",
+  "log.server.file.deleted": "Server file deleted {file}",
   "log.server.transfers.stopped": "All transfers stopped",
   "login": "Login",
   "login.failed": "Login failed",
@@ -42,7 +42,8 @@
   "socket.disconnect": "Socket closed. Retry in 5 seconds...",
   "transfer.error": "Error",
   "transfer.mode": "Action when destination file exists",
-  "transfer.mode.rename": "Rename transfered file (Prepend a number to filename)",
+  "transfer.mode.rename": "Rename transfered file (Prepend a random string to filename)",
+  "transfer.mode.never": "Never replace",
   "transfer.mode.replace-always": "Replace always",
   "transfer.mode.replace-newer": "Replace when newer",
   "transfer.mode.replace-newer-or-sizediff": "Replace when newer or size is different",
@@ -57,5 +58,9 @@
   "modal.confirm.header": "Confirmation",
   "modal.confirm.accept": "Accept",
   "modal.confirm.cancel": "Cancel",
-  "confirm.delete.files": "Are you sure? This cannot be undone. It will delete all files recursively, so, be careful"
+  "confirm.delete.files": "Are you sure? This cannot be undone. It will delete all files recursively, so, be careful",
+  "log.server.queue.stopped": "Transfers stopped",
+  "log.transfer.file.exist": "Skip file because it already exist: {file}",
+  "filtermask" : "Filter",
+  "filtermask.tooltip" : "You can enter a filemask to download/upload only the given files. For example: *.zip -> will just filter only zip files, use spaces to use multiple filemasks"
 }

public/stylesheets/src/page.scss

@@ -333,8 +333,8 @@ textarea:invalid + span:after {
     background: white;
     display: none;
     min-width: 250px;
+    transition: 0.1s;
     > div {
-        border-bottom: 1px solid #e5e5e5;
         padding: 3px;
         cursor: pointer;
         &:hover {
@@ -353,6 +353,7 @@ textarea:invalid + span:after {
 
 .contextmenu.show {
     display: block;
+
 }
 
 .tabs {

public/tpl/serverbrowser.html

@@ -40,10 +40,27 @@
     <div class="upload" data-mode="upload" data-forceTransfer="1">Upload</div>
     <div class="upload-queue" data-mode="upload">Add to upload queue</div>
     <div class="remove">Delete</div>
+    <div class="filter">
+        <div class="input-group form-inline">
+            <div class="form-group input-group input-group-sm">
+                <span class="input-group-addon"><input type="checkbox"></span>
+                <input type="text" class="form-control" data-translate-property="data-tooltip,filtermask.tooltip,placeholder,filtermask">
+            </div>
+        </div>
+    </div>
 </div>
 
 <div class="contextmenu" data-id="server">
     <div class="download" data-mode="download" data-forceTransfer="1">Download</div>
     <div class="download-queue" data-mode="download">Add to download queue</div>
     <div class="remove">Delete</div>
+    <div class="filter">
+        <div class="input-group form-inline">
+            <div class="form-group input-group input-group-sm">
+                <span class="input-group-addon"><input type="checkbox" class="checkbox"></span>
+                <input type="text" class="form-control filtermask" data-translate-property="placeholder,filtermask">
+                <span class="input-group-addon" data-translate-property="data-tooltip,filtermask.tooltip">i</span>
+            </div>
+        </div>
+    </div>
 </div>

public/tpl/src/serverbrowser.js

@@ -149,19 +149,26 @@
   })
 
   $contextmenu.on('click', '.download, .download-queue, .upload, .upload-queue', function (ev) {
-    const $selectedFiles = $tpl.find('.' + $(this).closest('.contextmenu').attr('data-id')).find('tr.active')
+    const $currentCm = $(this).closest('.contextmenu')
+    const $selectedFiles = $tpl.find('.' + $currentCm.attr('data-id')).find('tr.active')
     let files = []
     $selectedFiles.each(function () {
       files.push($(this).data('file'))
     })
+    let filter = null
+    if ($currentCm.find('.filter .checkbox').prop('checked')) {
+      filter = $currentCm.find('.filter input.filtermask').val().trim()
+    }
+
     gl.socket.send('addToTransferQueue', {
       'localDirectory': $localDirectoryInput.val(),
       'serverDirectory': $serverDirectoryInput.val(),
       'files': files,
       'mode': $(this).attr('data-mode'),
       'server': tabParams.server,
       'recursive': true,
-      'forceTransfer': $(this).attr('data-forceTransfer') === '1'
+      'forceTransfer': $(this).attr('data-forceTransfer') === '1',
+      'filter': filter
     })
   }).on('click', '.remove', function (ev) {
     ev.stopPropagation()
@@ -187,6 +194,8 @@
         })
       }
     })
+  }).on('click', '.filter', function (ev) {
+    ev.stopPropagation()
   })
 
   loadServerDirectory(tabParams.serverDirectory || '/')

public/tpl/src/transfersettings.js

@@ -7,6 +7,7 @@
       'type': 'select',
       'label': 'transfer.mode',
       'values': {
+        'never': 'transfer.mode.never',
         'replace-always': 'transfer.mode.replace-always',
         'replace-newer': 'transfer.mode.replace-newer',
         'replace-sizediff': 'transfer.mode.replace-sizediff',

src/actions/addToTransferQueue.js

@@ -22,6 +22,11 @@ action.requireUser = true
  * @param {function} callback
  */
 action.execute = function (user, message, callback) {
+  let filterRegex = null
+  if (message.filter) {
+    filterRegex = new RegExp(message.filter.replace(/\*/g, '.*?').replace(/ /g, '|'), 'i')
+  }
+
   /**
    * Add files to queue
    * @param {FtpServer} ftpServer
@@ -80,17 +85,20 @@ action.execute = function (user, message, callback) {
           }, 150)
         }
       } else {
-        entries.push(new queue.QueueEntry(
-          db.getNextId(),
-          message.mode,
-          message.server,
-          localPath,
-          serverPath,
-          file.isDirectory,
-          'queue',
-          file.size,
-          0
-        ))
+        // if filter and match path
+        if (!filterRegex || file.path.match(filterRegex)) {
+          entries.push(new queue.QueueEntry(
+            db.getNextId(),
+            message.mode,
+            message.server,
+            localPath,
+            serverPath,
+            file.isDirectory,
+            'queue',
+            file.size,
+            0
+          ))
+        }
         nextFile()
       }
     }

src/actions/stopTransfer.js

@@ -20,8 +20,8 @@ action.requireUser = true
 action.execute = function (user, message, callback) {
   // stop queue for each server
   for (let i in FtpServer.instances) {
-    FtpServer.instances[i].stopTransfers()
     FtpServer.instances[i].server.log('log.server.queue.stopped')
+    FtpServer.instances[i].stopTransfers()
   }
 }
 

src/fstools.js

@@ -41,7 +41,7 @@ fstools.deleteRecursive = function (directory, callbackFile) {
   if (fs.existsSync(directory)) {
     fs.readdirSync(directory).forEach(function (file) {
       const curPath = path.join(directory, file)
-      if (fs.lstatSync(curPath).isDirectory()) {
+      if (fs.statSync(curPath).isDirectory()) {
         fstools.deleteRecursive(curPath)
       } else {
         fs.unlinkSync(curPath)

src/ftpServer.js

@@ -6,6 +6,7 @@ const path = require('path')
 const fs = require('fs')
 const mkdirRecursive = require('mkdir-recursive')
 const db = require(path.join(__dirname, 'db'))
+const hash = require(path.join(__dirname, 'hash'))
 const fstools = require(path.join(__dirname, 'fstools'))
 const queue = require(path.join(__dirname, 'queue'))
 const Server = require(path.join(__dirname, 'server'))
@@ -215,16 +216,17 @@ function FtpServer (id) {
         } else if ((mode === 'replace-sizediff' || mode === 'replace-newer-or-sizediff') && destStat.size !== srcStat.size) {
           skip = false
         } else if (mode === 'rename') {
-          let renameCount = 0
-          let newPath = queueEntry.localPath
-          while (fs.existsSync(newPath)) {
-            newPath = path.join(path.dirname(queueEntry.localPath), renameCount + '_' + path.basename(queueEntry.localPath))
-            renameCount++
+          if (queueEntry.mode === 'download') {
+            useLocalPath = path.join(path.dirname(queueEntry.localPath), hash.random(6) + '_' + path.basename(queueEntry.localPath))
           }
-          useLocalPath = newPath
+          if (queueEntry.mode === 'upload') {
+            useServerPath = path.join(path.dirname(queueEntry.serverPath), hash.random(6) + '_' + path.basename(queueEntry.serverPath))
+          }
+          skip = false
         }
         // skip if file not need to be transfered
         if (skip) {
+          self.server.log('log.transfer.file.exist', {'file': useLocalPath})
           end()
           return
         }
@@ -520,7 +522,7 @@ function FtpServer (id) {
     self.server.log('log.ftpserver.disconnect')
     delete FtpServer.instances[self.id]
     if (this.ftpClient) {
-      self.ftpClient.end()
+      self.ftpClient.destroy()
     }
     if (this.sshClient) {
       self.sshClient.end()