mirror of
https://github.com/signalapp/Signal-Desktop.git
synced 2025-12-20 02:08:57 +00:00
Improve getUnusedFilename parsing
This commit is contained in:
@@ -291,11 +291,12 @@ export const getUnusedFilename = ({
|
|||||||
filename: string;
|
filename: string;
|
||||||
baseDir?: string;
|
baseDir?: string;
|
||||||
}): string => {
|
}): string => {
|
||||||
if (baseDir == null || !existsSync(join(baseDir, filename))) {
|
const { ext, name: mainFilename, base } = pathParse(filename);
|
||||||
return filename;
|
|
||||||
|
if (baseDir == null || !existsSync(join(baseDir, base))) {
|
||||||
|
return base;
|
||||||
}
|
}
|
||||||
|
|
||||||
const { ext, name: mainFilename } = pathParse(filename);
|
|
||||||
for (let n = 1; n < GET_UNUSED_FILENAME_MAX_ATTEMPTS; n += 1) {
|
for (let n = 1; n < GET_UNUSED_FILENAME_MAX_ATTEMPTS; n += 1) {
|
||||||
const nextFilename = `${mainFilename}-${n}${ext}`;
|
const nextFilename = `${mainFilename}-${n}${ext}`;
|
||||||
if (!existsSync(join(baseDir, nextFilename))) {
|
if (!existsSync(join(baseDir, nextFilename))) {
|
||||||
|
|||||||
Reference in New Issue
Block a user