Skip to content

fix: exporting multiple notes with same title #1119

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

Merged
amanharwara merged 5 commits into from
Jun 18, 2022
Merged

fix: exporting multiple notes with same title #1119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c558ac3
fix: exporting multiple notes with same title
amanharwara Jun 18, 2022
144d05b
refactor: move name index logic to archive service
amanharwara Jun 18, 2022
0c84bdc
Merge branch 'develop' of github.com:standardnotes/app into fix/note-…
moughxyz Jun 18, 2022
85c8e80
refactor: use simpler name count implementation
amanharwara Jun 18, 2022
54bc86e
Merge branch 'fix/note-export' of github.com:standardnotes/app into f…
amanharwara Jun 18, 2022
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
4 changes: 2 additions & 2 deletions packages/web/src/javascripts/Components/NotesOptions/NotesOptions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ const NotesOptions = ({
const format = editor?.package_info?.file_type || 'txt'
return `${note.title}.${format}`
},
[application],
[application.componentManager],
)

const downloadSelectedItems = useCallback(async () => {
Expand All @@ -239,7 +239,7 @@ const NotesOptions = ({
await application.getArchiveService().downloadDataAsZip(
notes.map((note) => {
return {
filename: getNoteFileName(note),
name: getNoteFileName(note),
content: new Blob([note.text]),
}
}),
Expand Down
18 changes: 15 additions & 3 deletions packages/web/src/javascripts/Services/ArchiveManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ function zippableFileName(name: string, suffix = '', format = 'txt'): string {
}

type ZippableData = {
filename: string
name: string
content: Blob
}[]

Expand Down Expand Up @@ -119,9 +119,21 @@ export class ArchiveManager {
const zip = await import('@zip.js/zip.js')
const writer = new zip.ZipWriter(new zip.BlobWriter('application/zip'))

const filenameCounts: Record<string, number> = {}

for (let i = 0; i < data.length; i++) {
const { name, ext } = parseFileName(data[i].filename)
await writer.add(zippableFileName(name, '', ext), new zip.BlobReader(data[i].content))
const file = data[i]

const { name, ext } = parseFileName(file.name)

filenameCounts[file.name] = filenameCounts[file.name] == undefined ? 0 : filenameCounts[file.name] + 1

const currentFileNameIndex = filenameCounts[file.name]

await writer.add(
zippableFileName(name, currentFileNameIndex > 0 ? ` - ${currentFileNameIndex}` : '', ext),
new zip.BlobReader(file.content),
)
}

const zipFileAsBlob = await writer.close()
Expand Down