refactor: cleanup uploaded files if parsing fails

standardnotes · Dec 9, 2023 · 98d6e2f · 98d6e2f
1 parent c5d0cdf
commit 98d6e2f
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 3 deletions.
diff --git a/packages/ui-services/src/Import/Converter.ts b/packages/ui-services/src/Import/Converter.ts
@@ -24,6 +24,7 @@ export interface Converter {
         item: DecryptedItemInterface<ItemContent>,
         itemToLink: DecryptedItemInterface<ItemContent>,
       ): Promise<void>
+      cleanupItems(items: DecryptedItemInterface<ItemContent>[]): Promise<void>
     },
   ): Promise<void>
 }
@@ -54,3 +55,5 @@ export type LinkItemsFn = (
   item: DecryptedItemInterface<ItemContent>,
   itemToLink: DecryptedItemInterface<ItemContent>,
 ) => Promise<void>
+
+export type CleanupItemsFn = (items: DecryptedItemInterface<ItemContent>[]) => Promise<void>
diff --git a/packages/ui-services/src/Import/EvernoteConverter/EvernoteConverter.ts b/packages/ui-services/src/Import/EvernoteConverter/EvernoteConverter.ts
@@ -35,7 +35,17 @@ export class EvernoteConverter implements Converter {
 
   convert: Converter['convert'] = async (
     file,
-    { insertNote, insertTag, linkItems, canUploadFiles, canUseSuper, convertHTMLToSuper, readFileAsText, uploadFile },
+    {
+      insertNote,
+      insertTag,
+      linkItems,
+      canUploadFiles,
+      canUseSuper,
+      convertHTMLToSuper,
+      readFileAsText,
+      uploadFile,
+      cleanupItems,
+    },
   ) => {
     const content = await readFileAsText(file)
 
@@ -50,6 +60,7 @@ export class EvernoteConverter implements Converter {
     }
 
     for (const [index, xmlNote] of Array.from(xmlNotes).entries()) {
+      const filesToPotentiallyCleanup: FileItem[] = []
       try {
         const title = xmlNote.getElementsByTagName('title')[0].textContent
         const created = xmlNote.getElementsByTagName('created')[0]?.textContent
@@ -86,6 +97,7 @@ export class EvernoteConverter implements Converter {
           canUploadFiles,
           uploadFile,
         )
+        filesToPotentiallyCleanup.push(...uploadedFiles)
 
         // Some notes have <font> tags that contain separate <span> tags with text
         // which causes broken paragraphs in the note.
@@ -140,6 +152,7 @@ export class EvernoteConverter implements Converter {
         }
       } catch (error) {
         console.error(error)
+        cleanupItems(filesToPotentiallyCleanup).catch(console.error)
         continue
       }
     }

diff --git a/packages/ui-services/src/Import/Importer.ts b/packages/ui-services/src/Import/Importer.ts
@@ -23,12 +23,13 @@ import {
   SNNote,
   SNTag,
   TagContent,
+  isFile,
   isNote,
 } from '@standardnotes/models'
 import { HTMLConverter } from './HTMLConverter/HTMLConverter'
 import { SuperConverter } from './SuperConverter/SuperConverter'
-import { Converter, InsertNoteFn, InsertTagFn, LinkItemsFn, UploadFileFn } from './Converter'
-import { SuperConverterServiceInterface } from '@standardnotes/files'
+import { CleanupItemsFn, Converter, InsertNoteFn, InsertTagFn, LinkItemsFn, UploadFileFn } from './Converter'
+import { FilesClientInterface, SuperConverterServiceInterface } from '@standardnotes/files'
 import { ContentType } from '@standardnotes/domain-core'
 
 export const BYTES_IN_ONE_MEGABYTE = 1_000_000
@@ -59,6 +60,7 @@ export class Importer {
       ): Promise<void>
     },
     private _generateUuid: GenerateUuid,
+    private files: FilesClientInterface,
   ) {
     this.registerNativeConverters()
   }
@@ -190,6 +192,15 @@ export class Importer {
     await this.linkingController.linkItems(item, itemToLink, false)
   }
 
+  cleanupItems: CleanupItemsFn = async (items) => {
+    for (const item of items) {
+      if (isFile(item)) {
+        await this.files.deleteFile(item)
+      }
+      await this.mutator.deleteItems([item])
+    }
+  }
+
   canUseSuper = (): boolean => {
     return (
       this.features.getFeatureStatus(
@@ -244,6 +255,7 @@ export class Importer {
         convertMarkdownToSuper: this.convertMarkdownToSuper,
         readFileAsText,
         linkItems: this.linkItems,
+        cleanupItems: this.cleanupItems,
       })
     }
 

diff --git a/packages/web/src/javascripts/Application/Dependencies/WebDependencies.ts b/packages/web/src/javascripts/Application/Dependencies/WebDependencies.ts
@@ -68,6 +68,7 @@ export class WebDependencies extends DependencyContainer {
         this.get<FilesController>(Web_TYPES.FilesController),
         this.get<LinkingController>(Web_TYPES.LinkingController),
         application.generateUuid,
+        application.files,
       )
     })