Improve code quality

Author: subdan

README.md

@@ -5,6 +5,7 @@
 [![SPM compatible](https://img.shields.io/badge/spm-compatible-brightgreen.svg?style=flat)](https://swift.org/package-manager)
 [![GitHub license](https://img.shields.io/badge/license-MIT-lightgrey.svg)](https://github.com/RedMadRobot/Catbird/blob/master/LICENSE)
 [![CocoaPods Compatible](https://img.shields.io/cocoapods/v/FigmaExport.svg)](https://cocoapods.org/pods/FigmaExport)
+[![codebeat badge](https://codebeat.co/badges/6c346142-a942-4c13-ae6b-5517b4c50b1d)](https://codebeat.co/projects/github-com-redmadrobot-figma-export-master)
 
 Command line utility to export colors, typography, icons and images from Figma to Xcode / Android Studio project.
 * color - Figma's color style

Sources/FigmaExport/Loaders/ColorsLoader.swift

@@ -36,9 +36,11 @@ final class ColorsLoader {
         return styles.compactMap { style -> Color? in
             guard let node = nodes[style.nodeId] else { return nil}
             guard let fill = node.document.fills.first else { return nil }
-            let a: Double = fill.opacity ?? fill.color.a
+            let alpha: Double = fill.opacity ?? fill.color.a
             let platform = Platform(rawValue: style.description)
-            return Color(name: style.name, platform: platform, r: fill.color.r, g: fill.color.g, b: fill.color.b, a: a)
+            
+            return Color(name: style.name, platform: platform,
+                         red: fill.color.r, green: fill.color.g, blue: fill.color.b, alpha: alpha)
         }
     }
 

Sources/FigmaExport/Output/FileDownloader.swift

@@ -27,7 +27,7 @@ final class FileDownloader {
             }
 
             group.enter()
-            let task = session.downloadTask(with: remoteURL) { localURL, urlResponse, error in
+            let task = session.downloadTask(with: remoteURL) { localURL, _, error in
                 defer { group.leave() }
 
                 guard let fileURL = localURL, error == nil else {

Sources/FigmaExport/Output/XcodeProjectWritter.swift

@@ -40,7 +40,7 @@ final class XcodeProjectWritter {
             .dropLast() as Array
 
         var currentGroup: PBXGroup? = project.mainGroup
-        var prevGroup: PBXGroup? = nil
+        var prevGroup: PBXGroup?    
 
         while currentGroup != nil {
             if groups.isEmpty { break }

Sources/FigmaExport/Subcommands/ExportColors.swift

@@ -69,7 +69,7 @@ extension FigmaExportCommand {
         }
 
         private func exportXcodeColors(colorPairs: [AssetPair<Color>], iosParams: Params.iOS, logger: Logger) throws {
-            var colorsURL: URL? = nil
+            var colorsURL: URL?
             if iosParams.colors.useColorAssets {
                 if let folder = iosParams.colors.assetsFolder {
                     colorsURL = iosParams.xcassetsPath.appendingPathComponent(folder)

Sources/FigmaExport/Subcommands/ExportIcons.swift

@@ -15,10 +15,15 @@ extension FigmaExportCommand {
             abstract: "Exports icons from Figma",
             discussion: "Exports icons from Figma to Xcode / Android Studio project")
 
-        @Option(name: .shortAndLong, default: "figma-export.yaml", help: "An input YAML file with figma and platform properties.")
+        @Option(name: .shortAndLong, default: "figma-export.yaml",
+                help: "An input YAML file with figma and platform properties.")
         var input: String
 
-        @Argument(help: "[Optional] Name of the icons to export. For example \"ic/24/edit\" to export single icon, \"ic/24/edit, ic/16/notification\" to export several icons and \"ic/16/*\" to export all icons of size 16 pt")
+        @Argument(help: """
+        [Optional] Name of the icons to export. For example \"ic/24/edit\" \
+        to export single icon, \"ic/24/edit, ic/16/notification\" to export several icons and \
+        \"ic/16/*\" to export all icons of size 16 pt
+        """)
         var filter: String?
 
         func run() throws {

Sources/FigmaExport/Subcommands/ExportImages.swift

@@ -15,10 +15,15 @@ extension FigmaExportCommand {
             abstract: "Exports images from Figma",
             discussion: "Exports images from Figma to Xcode / Android Studio project")
 
-        @Option(name: .shortAndLong, default: "figma-export.yaml", help: "An input YAML file with figma and platform properties.")
+        @Option(name: .shortAndLong, default: "figma-export.yaml",
+                help: "An input YAML file with figma and platform properties.")
         var input: String
 
-        @Argument(help: "[Optional] Name of the images to export. For example \"img/login\" to export single image, \"img/onboarding/1, img/onboarding/2\" to export several images and \"img/onboarding/*\" to export all images from onboarding group")
+        @Argument(help: """
+        [Optional] Name of the images to export. For example \"img/login\" to export \
+        single image, \"img/onboarding/1, img/onboarding/2\" to export several images \
+        and \"img/onboarding/*\" to export all images from onboarding group
+        """)
         var filter: String?
 
         func run() throws {

Sources/FigmaExportCore/Color.swift

@@ -11,13 +11,13 @@ public struct Color: Asset {
     /// Color components, Double value from 0 to 1
     public let red, green, blue, alpha: Double
 
-    public init(name: String, platform: Platform? = nil, r: Double, g: Double, b: Double, a: Double) {
+    public init(name: String, platform: Platform? = nil, red: Double, green: Double, blue: Double, alpha: Double) {
         self.name = name
         self.platform = platform
-        self.red = r
-        self.green = g
-        self.blue = b
-        self.alpha = a
+        self.red = red
+        self.green = green
+        self.blue = blue
+        self.alpha = alpha
     }
 
     // MARK: Hashable

Sources/XcodeExport/XcodeIconsExporter.swift

@@ -13,7 +13,7 @@ final public class XcodeIconsExporter: XcodeImagesExporterBase {
             data: contentsJson.data
         ))
 
-        assets.forEach { image in
+        try assets.forEach { image in
             // Create directory for imageset
             let dirURL = output.assetsFolderURL.appendingPathComponent("\(image.name).imageset")
 
@@ -34,7 +34,7 @@ final public class XcodeIconsExporter: XcodeImagesExporterBase {
             )
             let encoder = JSONEncoder()
             encoder.outputFormatting = .prettyPrinted
-            let data = try! encoder.encode(contents)
+            let data = try encoder.encode(contents)
             let fileURL = URL(string: "Contents.json")!
             files.append(FileContents(
                 destination: Destination(directory: dirURL, file: fileURL),

Sources/XcodeExport/XcodeImagesExporter.swift

@@ -10,7 +10,7 @@ final public class XcodeImagesExporter: XcodeImagesExporterBase {
         files.append(makeEmptyContentsJson())
 
         // For each pair...
-        assets.forEach { pair in
+        try assets.forEach { pair in
             let name = pair.light.name
 
             // Create imageset directory
@@ -25,7 +25,7 @@ final public class XcodeImagesExporter: XcodeImagesExporterBase {
 
             let encoder = JSONEncoder()
             encoder.outputFormatting = [.prettyPrinted, .sortedKeys]
-            let data = try! encoder.encode(contents)
+            let data = try encoder.encode(contents)
             let fileURL = URL(string: "Contents.json")!
             files.append(FileContents(
                 destination: Destination(directory: imageDirURL, file: fileURL),
@@ -124,7 +124,7 @@ final public class XcodeImagesExporter: XcodeImagesExporterBase {
 
     private func imageDataForImage(_ image: Image, scale: Double? = nil, dark: Bool) -> XcodeAssetContents.ImageData {
 
-        var appearance: [XcodeAssetContents.DarkAppeareance]? = nil
+        var appearance: [XcodeAssetContents.DarkAppeareance]?
         if dark {
             appearance = [XcodeAssetContents.DarkAppeareance()]
         }