Use simpler glob format parameter

brandlabs · Mar 2, 2019 · 493636b · 493636b
1 parent 966fd52
commit 493636b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/source/interface/directoryContents.js b/source/interface/directoryContents.js
@@ -28,8 +28,7 @@ function getDirectoryContents(remotePath, options) {
         .then(parseXML)
         .then(result => getDirectoryFiles(result, options.remotePath, remotePath, options.details))
         .then(files => processResponsePayload(response, files, options.details))
-        .then(files => options.glob && options.glob.pattern ? processGlobFilter(files, options.glob) : files)
-        ;
+        .then(files => (options.glob ? processGlobFilter(files, options.glob) : files));
 }
 
 function getDirectoryFiles(result, serverBasePath, requestPath, isDetailed = false) {

diff --git a/source/response.js b/source/response.js
@@ -12,7 +12,7 @@ function handleResponseCode(response) {
 }
 
 function processGlobFilter(files, glob) {
-    return files.filter(file => minimatch(file.filename, glob.pattern, { matchBase: true }));
+    return files.filter(file => minimatch(file.filename, glob, { matchBase: true }));
 }
 
 function processResponsePayload(response, data, isDetailed = false) {