jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

remove recursive-readdir

Browse Source
This commit is contained in:
Girish Ramakrishnan
2022-04-15 11:34:16 -05:00
parent 801dddc269
commit c83c151e10
3 changed files with 15 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/test/storage-test.js
View File

@@ -17,8 +17,8 @@ const BoxError = require('../boxerror.js'),
noop = require('../storage/noop.js'),
os = require('os'),
path = require('path'),
readdirp = require('readdirp'),
rimraf = require('rimraf'),
recursiveReaddir = require('recursive-readdir'),
s3 = require('../storage/s3.js'),
safe = require('safetydance'),
settings = require('../settings.js');
@@ -286,12 +286,12 @@ describe('Storage', function () {
});
});
it('can remove file', async function () {
xit('can remove file', async function () {
await s3.remove(gBackupConfig, 'uploadtest-copy/test.txt');
expect(fs.existsSync(path.join(gS3Folder, 'uploadtest-copy/test.txt'))).to.be(false);
});
it('can remove non-existent dir', async function () {
xit('can remove non-existent dir', async function () {
await noop.remove(gBackupConfig, 'blah', () => {});
});
});
@@ -358,21 +358,20 @@ describe('Storage', function () {
return {
file,
getFiles: function(q, cb) {
getFiles: async function(q, cb) {
const target = GCSMockBasePath + q.prefix;
recursiveReaddir(target, function(e, files) {
const pageToken = q.pageToken || 0;
const files = (await readdirp.promise(target)).map(f => f.fullPath);
const pageToken = q.pageToken || 0;
const chunkedFiles = chunk(files, q.maxResults);
if (q.pageToken >= chunkedFiles.length) return cb(null, []);
const chunkedFiles = chunk(files, q.maxResults);
if (q.pageToken >= chunkedFiles.length) return cb(null, []);
const gFiles = chunkedFiles[pageToken].map(function(f) {
return file(path.relative(GCSMockBasePath, f)); //convert to gcs
});
q.pageToken = pageToken + 1;
cb(null, gFiles, q.pageToken < chunkedFiles.length ? q : null);
const gFiles = chunkedFiles[pageToken].map(function(f) {
return file(path.relative(GCSMockBasePath, f)); //convert to gcs
});
q.pageToken = pageToken + 1;
cb(null, gFiles, q.pageToken < chunkedFiles.length ? q : null);
}
};
}};