rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

chore: fix duplicate file name error when exporting notes and refactor file name utils (#2877) [skip e2e]

Browse Source
This commit is contained in:
Aman Harwara
2024-05-07 15:45:50 +05:30
committed by GitHub
parent 71d2dbca6c
commit c3265d7930
16 changed files with 61 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
packages/ui-services/src/Archive/ArchiveManager.ts
View File

@@ -1,4 +1,4 @@
import { parseFileName } from '@standardnotes/filepicker'
import { parseFileName, createZippableFileName, sanitizeFileName } from '@standardnotes/utils'
import {
BackupFile,
BackupFileDecryptedContextualPayload,
@@ -8,22 +8,6 @@ import {
import { ContentType } from '@standardnotes/domain-core'
import { ApplicationInterface } from '@standardnotes/services'
export function sanitizeFileName(name: string): string {
return name.trim().replace(/[.\\/:"?*|<>]/g, '_')
}
function zippableFileName(name: string, suffix = '', format = 'txt'): string {
const sanitizedName = sanitizeFileName(name)
const nameEnd = suffix + '.' + format
const maxFileNameLength = 100
return sanitizedName.slice(0, maxFileNameLength - nameEnd.length) + nameEnd
}
export function parseAndCreateZippableFileName(name: string, suffix = '') {
const { name: parsedName, ext } = parseFileName(name)
return zippableFileName(parsedName, suffix, ext)
}
type ZippableData = {
name: string
content: Blob
@@ -87,7 +71,7 @@ export class ArchiveManager {
type: 'text/plain',
})
const fileName = zippableFileName('Standard Notes Backup and Import File')
const fileName = createZippableFileName('Standard Notes Backup and Import File')
await zipWriter.add(fileName, new zip.BlobReader(blob))
for (let index = 0; index < items.length; index++) {
@@ -109,7 +93,7 @@ export class ArchiveManager {
const blob = new Blob([contents], { type: 'text/plain' })
const fileName =
`Items/${sanitizeFileName(item.content_type)}/` + zippableFileName(name, `-${item.uuid.split('-')[0]}`)
`Items/${sanitizeFileName(item.content_type)}/` + createZippableFileName(name, `-${item.uuid.split('-')[0]}`)
await zipWriter.add(fileName, new zip.BlobReader(blob))
}
@@ -137,7 +121,7 @@ export class ArchiveManager {
const currentFileNameIndex = filenameCounts[file.name]
await writer.add(
zippableFileName(name, currentFileNameIndex > 0 ? ` - ${currentFileNameIndex}` : '', ext),
createZippableFileName(name, currentFileNameIndex > 0 ? ` - ${currentFileNameIndex}` : '', ext),
new zip.BlobReader(file.content),
)
}

2
packages/ui-services/src/Import/HTMLConverter/HTMLConverter.ts
View File

@@ -1,4 +1,4 @@
import { parseFileName } from '@standardnotes/filepicker'
import { parseFileName } from '@standardnotes/utils'
import { Converter } from '../Converter'
export class HTMLConverter implements Converter {

2
packages/ui-services/src/Import/Importer.ts
View File

@@ -1,4 +1,4 @@
import { parseFileName } from '@standardnotes/filepicker'
import { parseFileName } from '@standardnotes/utils'
import {
FeatureStatus,
FeaturesClientInterface,

2
packages/ui-services/src/Import/PlaintextConverter/PlaintextConverter.ts
View File

@@ -1,4 +1,4 @@
import { parseFileName } from '@standardnotes/filepicker'
import { parseFileName } from '@standardnotes/utils'
import { Converter } from '../Converter'
export class PlaintextConverter implements Converter {

2
packages/ui-services/src/Import/SuperConverter/SuperConverter.ts
View File

@@ -1,5 +1,5 @@
import { SuperConverterServiceInterface } from '@standardnotes/files'
import { parseFileName } from '@standardnotes/filepicker'
import { parseFileName } from '@standardnotes/utils'
import { Converter } from '../Converter'
import { ConversionResult } from '../ConversionResult'