Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: Sort files to push by size #2301

Merged
merged 1 commit into from
Jan 18, 2024
Merged

chore: Sort files to push by size #2301

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 20 additions & 14 deletions lib/ios-fs-helpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,15 +198,25 @@ async function pushFolder(afcService, srcRootPath, dstRootPath, opts = {}) {
const {timeoutMs = IO_TIMEOUT_MS, enableParallelPush = false} = opts;

const timer = new timing.Timer().start();
const itemsToPush = await fs.glob('**', {
cwd: srcRootPath,
mark: true,
});
const allItems = /** @type {import('path-scurry').Path[]} */ (/** @type {unknown} */ (
await fs.glob('**', {
cwd: srcRootPath,
withFileTypes: true,
}))
);
log.debug(`Successfully scanned the tree structure of '${srcRootPath}'`);
const [foldersToPush, filesToPush] = itemsToPush.reduce((acc, x) => {
acc[_.endsWith(x, path.sep) ? 0 : 1].push(x);
return acc;
}, /** @type {[string[], string[]]} */ ([[], []]));
// top-level folders go first
/** @type {string[]} */
const foldersToPush = allItems
.filter((x) => x.isDirectory())
.map((x) => x.relative())
.sort((a, b) => a.split(path.sep).length - b.split(path.sep).length);
// larger files go first
/** @type {string[]} */
const filesToPush = allItems
.filter((x) => !x.isDirectory())
.sort((a, b) => (b.size ?? 0) - (a.size ?? 0))
.map((x) => x.relative());
log.debug(
`Got ${util.pluralize('folder', foldersToPush.length, true)} and ` +
`${util.pluralize('file', filesToPush.length, true)} to push`,
Expand All @@ -216,11 +226,7 @@ async function pushFolder(afcService, srcRootPath, dstRootPath, opts = {}) {
await afcService.deleteDirectory(dstRootPath);
} catch (ign) {}
await afcService.createDirectory(dstRootPath);
// top-level folders must go first
const foldersToPushByHierarchy = foldersToPush.sort(
(a, b) => a.split(path.sep).length - b.split(path.sep).length,
);
for (const relativeFolderPath of foldersToPushByHierarchy) {
for (const relativeFolderPath of foldersToPush) {
// createDirectory does not accept folder names ending with a path separator
const absoluteFolderPath = _.trimEnd(path.join(dstRootPath, relativeFolderPath), path.sep);
if (absoluteFolderPath) {
Expand Down Expand Up @@ -265,7 +271,7 @@ async function pushFolder(afcService, srcRootPath, dstRootPath, opts = {}) {
if (enableParallelPush) {
log.debug(`Proceeding to parallel files push (max ${MAX_IO_CHUNK_SIZE} writers)`);
const pushPromises = [];
for (const relativeFilePath of _.shuffle(filesToPush)) {
for (const relativeFilePath of filesToPush) {
pushPromises.push(B.resolve(pushFile(relativeFilePath)));
// keep the push queue filled
if (pushPromises.length >= MAX_IO_CHUNK_SIZE) {
Expand Down
Loading