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

feat: improve sync-dir performance #244

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: improve sync-dir performance #244

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
75 changes: 42 additions & 33 deletions src/sync-dir.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,41 +67,50 @@ export const copyDirSafe = async (

const dirsInDest: { [file: string]: boolean } = {}

for await (const file of commonFiles) {
srcCached[file] = srcCached[file] || {}
const srcFilePath = resolve(srcDir, file)
const destFilePath = resolve(destDir, file)
const srcFileStat = srcCached[file].stat || (await fs.stat(srcFilePath))
srcCached[file].stat = srcFileStat
const destFileStat = await fs.stat(destFilePath)

const areDirs = srcFileStat.isDirectory() && destFileStat.isDirectory()
dirsInDest[file] = destFileStat.isDirectory()

const replacedFileWithDir =
srcFileStat.isDirectory() && !destFileStat.isDirectory()
const dirReplacedWithFile =
!srcFileStat.isDirectory() && destFileStat.isDirectory()
if (dirReplacedWithFile || replacedFileWithDir) {
filesToRemove.push(file)
}
const commonFilesStats = await Promise.all(
commonFiles.map(async (file) => {
const srcFilePath = resolve(srcDir, file)
const destFilePath = resolve(destDir, file)
const srcFileStat = srcCached[file]?.stat || (await fs.stat(srcFilePath))
srcCached[file] = srcCached[file] || { stat: srcFileStat, hash: '' }
const destFileStat = await fs.stat(destFilePath)
return { file, srcFileStat, destFileStat, srcFilePath, destFilePath }
})
)

const compareByHash = async () => {
const srcHash =
srcCached[file].hash || (await getFileHash(srcFilePath, ''))
srcCached[file].hash = srcHash
const destHash = await getFileHash(destFilePath, '')
return srcHash === destHash
}
if (
dirReplacedWithFile ||
(!areDirs &&
!theSameStats(srcFileStat, destFileStat) &&
(!compareContent || !(await compareByHash())))
) {
filesToReplace.push(file)
const compareFilesPromises = commonFilesStats.map(
async ({ file, srcFileStat, destFileStat, srcFilePath, destFilePath }) => {
const areDirs = srcFileStat.isDirectory() && destFileStat.isDirectory()
dirsInDest[file] = destFileStat.isDirectory()

const replacedFileWithDir =
srcFileStat.isDirectory() && !destFileStat.isDirectory()
const dirReplacedWithFile =
!srcFileStat.isDirectory() && destFileStat.isDirectory()
if (dirReplacedWithFile || replacedFileWithDir) {
filesToRemove.push(file)
}

const compareByHash = async () => {
const srcHash =
srcCached[file].hash || (await getFileHash(srcFilePath, ''))
srcCached[file].hash = srcHash
const destHash = await getFileHash(destFilePath, '')
return srcHash === destHash
}

if (
dirReplacedWithFile ||
(!areDirs &&
!theSameStats(srcFileStat, destFileStat) &&
(!compareContent || !(await compareByHash())))
) {
filesToReplace.push(file)
}
}
}
)

await Promise.all(compareFilesPromises)

// console.log('newFiles', newFiles)
// console.log('filesToRemove', filesToRemove)
Expand Down