zedcode/bs-manager
1
0
Fork 0
mirror of https://github.com/Zagrios/bs-manager.git synced 2026-07-03 14:08:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

[bugfix] Linking a folder was not possible if the folder contained files (already in master)

Browse Source
This commit is contained in:
MathieuG-P
2024-11-04 16:38:27 +01:00
parent 8caea035ed
commit 2e6224825f
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/helpers/fs.helpers.ts
+5 -6
View File
@@ -78,7 +78,6 @@ export async function getFilesInFolder(folderPath: string): Promise<string[]> {
return dirEntries.filter(entry => entry.isFile()).map(file => path.join(folderPath, file.name));
}
export function moveFolderContent(src: string, dest: string, option?: MoveOptions): Observable<Progression> {
const progress: Progression = { current: 0, total: 0 };
return new Observable<Progression>(subscriber => {
@@ -92,17 +91,17 @@ export function moveFolderContent(src: string, dest: string, option?: MoveOption
await ensureFolderExist(dest);
const files = await readdir(src, { encoding: "utf-8" });
const files = await readdir(src, { encoding: "utf-8", withFileTypes: true });
progress.total = files.length;
for(const file of files){
const srcFullPath = path.join(src, file);
const destFullPath = path.join(dest, file);
const srcFullPath = path.join(src, file.name);
const destFullPath = path.join(dest, file.name);
const srcChilds = await readdir(srcFullPath, { encoding: "utf-8", recursive: true });
const srcChilds = file.isDirectory() ? await readdir(srcFullPath, { encoding: "utf-8", recursive: true }) : [];
const allChildsAlreadyExist = srcChilds.every(child => pathExistsSync(path.join(destFullPath, child)));
if(!allChildsAlreadyExist){
if(file.isFile() || !allChildsAlreadyExist){
await move(srcFullPath, destFullPath, option);
}