0ct0pu5/ente
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make explicit

Browse source
This commit is contained in:
Manav Rathi 2024-04-13 20:29:17 +05:30
parent a6887e3037
commit 7838f7484d
No known key found for this signature in database
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
web/apps/photos/src/utils/native-fs.ts
View file

@ -1,5 +1,5 @@
import { ensureElectron } from "@/next/electron";
import sanitize from "sanitize-filename";
import exportService from "services/export";
import { splitFilenameAndExtension } from "utils/file";
export const ENTE_TRASH_FOLDER = "Trash";
@ -7,6 +7,8 @@ export const ENTE_TRASH_FOLDER = "Trash";
export const sanitizeName = (name: string) =>
sanitize(name, { replacement: "_" });
const exists = (path: string) => ensureElectron().fs.exists(path);
export const getUniqueCollectionExportName = async (
dir: string,
collectionName: string,
@ -14,7 +16,7 @@ export const getUniqueCollectionExportName = async (
let collectionExportName = sanitizeName(collectionName);
let count = 1;
while (
(await exportService.exists(`${dir}/${collectionExportName}`)) ||
(await exists(`${dir}/${collectionExportName}`)) ||
collectionExportName === ENTE_TRASH_FOLDER
) {
collectionExportName = `${sanitizeName(collectionName)}(${count})`;
@ -29,9 +31,7 @@ export const getUniqueFileExportName = async (
) => {
let fileExportName = sanitizeName(filename);
let count = 1;
while (
await exportService.exists(`${collectionExportPath}/${fileExportName}`)
) {
while (await exists(`${collectionExportPath}/${fileExportName}`)) {
const filenameParts = splitFilenameAndExtension(sanitizeName(filename));
if (filenameParts[1]) {
fileExportName = `${filenameParts[0]}(${count}).${filenameParts[1]}`;