Fix crash when image contains cyrillic characters in name

Closes #44
RedMadRobot · Nov 27, 2020 · 1985e7d · 1985e7d
1 parent f7c5740
commit 1985e7d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/Sources/FigmaExport/Subcommands/ExportImages.swift b/Sources/FigmaExport/Subcommands/ExportImages.swift
@@ -221,14 +221,14 @@ extension FigmaExportCommand {
 
             // Download files to user's temp directory
             logger.info("Downloading remote files...")
-            let remoteFiles = images.flatMap { asset -> [FileContents] in
-                let lightFiles = makeRemoteFiles(
+            let remoteFiles = try images.flatMap { asset -> [FileContents] in
+                let lightFiles = try makeRemoteFiles(
                     images: asset.light.images,
                     dark: false,
                     outputDirectory: tempDirectoryURL
                 )
-                let darkFiles = asset.dark.flatMap { darkImagePack -> [FileContents] in
-                    makeRemoteFiles(images: darkImagePack.images, dark: true, outputDirectory: tempDirectoryURL)
+                let darkFiles = try asset.dark.flatMap { darkImagePack -> [FileContents] in
+                    try makeRemoteFiles(images: darkImagePack.images, dark: true, outputDirectory: tempDirectoryURL)
                 } ?? []
                 return lightFiles + darkFiles
             }
@@ -284,9 +284,12 @@ extension FigmaExportCommand {
         ///   - images: Dictionary of images. Key = scale, value = image info
         ///   - dark: Dark mode?
         ///   - outputDirectory: URL of the output directory
-        private func makeRemoteFiles(images: [Image], dark: Bool, outputDirectory: URL) -> [FileContents] {
-            images.map { image -> FileContents in
-                let fileURL = URL(string: "\(image.name).\(image.format)")!
+        private func makeRemoteFiles(images: [Image], dark: Bool, outputDirectory: URL) throws -> [FileContents] {
+            try images.map { image -> FileContents in
+                guard let name = image.name.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed),
+                   let fileURL = URL(string: "\(name).\(image.format)") else {
+                    throw FigmaExportError.invalidFileName(image.name)
+                }
                 let scale = image.scale.value
                 let dest = Destination(
                     directory: outputDirectory

diff --git a/Sources/FigmaExport/main.swift b/Sources/FigmaExport/main.swift
@@ -3,13 +3,16 @@ import Foundation
 
 enum FigmaExportError: LocalizedError {
 
+    case invalidFileName(String)
     case stylesNotFound
     case componentsNotFound
     case accessTokenNotFound
     case colorsAssetsFolderNotSpecified
 
     var errorDescription: String? {
         switch self {
+        case .invalidFileName(let name):
+            return "File name is invalid: \(name)"
         case .stylesNotFound:
             return "Color/Text styles not found in the Figma file. Have you published Styles to the Library?"
         case .componentsNotFound: