Globs #140
Globs #140
Conversation
| @@ -13,7 +13,7 @@ function getDirectoryContents(remotePath, options) { | |||
| method: "PROPFIND", | |||
| headers: { | |||
| Accept: "text/plain", | |||
| Depth: 1 | |||
| Depth: options.deep ? "infinity" : 1 | |||
There was a problem hiding this comment.
This already exists in master.. perhaps you could merge/rebase your branch?
There was a problem hiding this comment.
Hopefully I cleaned up the history correctly. I'm willing to try again if necessary.
| @@ -1,7 +1,7 @@ | |||
| const pathPosix = require("path-posix"); | |||
| const joinURL = require("url-join"); | |||
| const { merge } = require("../merge.js"); | |||
| const { handleResponseCode, processResponsePayload } = require("../response.js"); | |||
| const { handleResponseCode, processResponsePayload, processGlobFilter } = require("../response.js"); | |||
There was a problem hiding this comment.
Could you alphabetise this please?
| if (options.glob && options.glob.pattern) { | ||
| return processGlobFilter(files, options.glob); | ||
| } | ||
| return files; |
There was a problem hiding this comment.
This could perhaps be made a tad simpler, something like .then(files => options.glob && options.glob.pattern ? processGlobFilter(files, options.glob) : files)
source/response.js
Outdated
| @@ -1,3 +1,5 @@ | |||
| import minimatch from "minimatch"; | |||
There was a problem hiding this comment.
This should be a commonjs require
source/response.js
Outdated
| module.exports = { | ||
| handleResponseCode, | ||
| processResponsePayload | ||
| processResponsePayload, | ||
| processGlobFilter |
There was a problem hiding this comment.
This could be alphabetised..
source/response.js
Outdated
| @@ -18,7 +20,12 @@ function processResponsePayload(response, data, isDetailed = false) { | |||
| : data; | |||
| } | |||
|
|
|||
| function processGlobFilter(files, glob) { | |||
There was a problem hiding this comment.
This could be alphabetised..
test/server/index.js
Outdated
| @@ -18,7 +18,8 @@ function createServer(dir, authType) { | |||
| const server = new ws.WebDAVServer({ | |||
| port: 9988, | |||
| httpAuthentication: auth, | |||
| privilegeManager: privilegeManager | |||
| privilegeManager: privilegeManager, | |||
| maxRequestDepth: Infinity | |||
There was a problem hiding this comment.
This is also already in master. It should be handled by a rebase.
| @@ -104,4 +104,22 @@ describe("getDirectoryContents", function() { | |||
| .that.matches(/^[a-f0-9]{32}$/); | |||
| }); | |||
| }); | |||
|
|
|||
| it("returns all directory contents when deep = true which translates to depth:'infinity')", function() { | |||
| }); | ||
| }); | ||
|
|
||
| it("glob filter test')", function() { |
There was a problem hiding this comment.
Extra ) in title. The name could perhaps be better - supports globbing files perhaps.
|
Thank you @skoschik! |
#122
Hey guys, I like this idea but I had a slightly different take on implementing it... And I'm just gonna put it out there with a PR.
What about passing another option property to getDirectoryContents and letting the filtering happen there? I like getDirectoryContents because we can pull a single directory or pull everything with an infinite depth request. I wasn't sure if getMatchingPaths was intended on doing an infinite depth request or just working in a single directory.
I used the minimatch library from isaacs (it's a dependency of node-glob 👍 )
Thanks for letting me butt in