Exported default filename to local var

zotero · Jul 29, 2024 · f2226e7 · f2226e7
1 parent 8e7c957
commit f2226e7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/Zotero/Scenes/General/ViewModels/NoteEditorActionHandler.swift b/Zotero/Scenes/General/ViewModels/NoteEditorActionHandler.swift
@@ -75,6 +75,7 @@ struct NoteEditorActionHandler: ViewModelActionHandler, BackgroundDbProcessingAc
 
         DDLogInfo("NoteEditorActionHandler: Import \(rawImages.count) images")
 
+        let imageFilename = "image"
         let libraryId = viewModel.state.library.identifier
         var images: [(String, Attachment)] = []
 
@@ -88,7 +89,7 @@ struct NoteEditorActionHandler: ViewModelActionHandler, BackgroundDbProcessingAc
             else { continue }
 
             let key = KeyGenerator.newKey
-            let file = Files.attachmentFile(in: libraryId, key: key, filename: "image", contentType: mimeType)
+            let file = Files.attachmentFile(in: libraryId, key: key, filename: imageFilename, contentType: mimeType)
 
             do {
                 try self.fileStorage.write(image, to: file, options: .atomic)
@@ -98,8 +99,8 @@ struct NoteEditorActionHandler: ViewModelActionHandler, BackgroundDbProcessingAc
             }
 
             let attachment = Attachment(
-                type: .file(filename: "image", contentType: mimeType, location: .local, linkType: .embeddedImage, compressed: false),
-                title: "image",
+                type: .file(filename: imageFilename, contentType: mimeType, location: .local, linkType: .embeddedImage, compressed: false),
+                title: imageFilename,
                 key: key,
                 libraryId: libraryId
             )

diff --git a/ci_scripts/ci_post_clone.sh b/ci_scripts/ci_post_clone.sh
@@ -78,3 +78,6 @@ esac
 # Update Info.plist files
 echo "Setting version to $newVersionString"
 sed -i "" -e "s/MARKETING_VERSION \= [^\;]*\;/MARKETING_VERSION = $newVersionString;/" ../Zotero.xcodeproj/project.pbxproj
+
+# Install node
+which node || HOMEBREW_NO_AUTO_UPDATE=1 HOMEBREW_NO_INSTALL_CLEANUP=1 brew install node
diff --git a/ci_scripts/ci_pre_xcodebuild.sh b/ci_scripts/ci_pre_xcodebuild.sh
@@ -17,6 +17,4 @@ plist='<?xml version="1.0" encoding="UTF-8"?>
 </dict>
 </plist>'
 echo "$plist" > licenses/licenses.plist
-rm -rf pdf-keys
-
-brew install node
+rm -rf pdf-keys