feat(RES-34): Fix plist font filename (#14)

Reviewed-on: #14

Sources/ResgenSwift/Analytics/Generator/AnalyticsGenerator.swift

@@ -5,112 +5,147 @@
 //  Created by Loris Perret on 08/12/2023.
 //
 
+import CoreVideo
 import Foundation
 import ToolCore
-import CoreVideo
 
-class AnalyticsGenerator {
-    static var targets: [TrackerType] = []
+// Disabled cause it's a pain to handle in generated string
 
-    static func writeExtensionFiles(sections: [AnalyticsCategory], target: String, tags: [String], staticVar: Bool, extensionName: String, extensionFilePath: String) {
+enum AnalyticsGenerator {
+
+    // MARK: - Write content
+
+    static func writeExtensionFiles(
+        sections: [AnalyticsCategory],
+        target: String,
+        tags: [String],
+        staticVar: Bool,
+        extensionName: String,
+        extensionFilePath: String
+    ) {
         // Get target type from enum
         let targetsString: [String] = target.components(separatedBy: " ")
-                
-        TrackerType.allCases.forEach { enumTarget in
-            if targetsString.contains(enumTarget.value) {
-                targets.append(enumTarget)
+        let targets = {
+            var targets = [TrackerType]()
+            TrackerType.allCases.forEach { enumTarget in
+                if targetsString.contains(enumTarget.value) {
+                    targets.append(enumTarget)
+                }
             }
-        }
-        
+            return targets
+        }()
+
         // Get extension content
-        let extensionFileContent = Self.getExtensionContent(sections: sections,
-                                                            tags: tags,
-                                                            staticVar: staticVar,
-                                                            extensionName: extensionName)
-        
+        let extensionFileContent = getExtensionContent(
+            targets: targets,
+            sections: sections,
+            tags: tags,
+            staticVar: staticVar,
+            extensionName: extensionName
+        )
+
         // Write content
         let extensionFilePathURL = URL(fileURLWithPath: extensionFilePath)
         do {
             try extensionFileContent.write(to: extensionFilePathURL, atomically: false, encoding: .utf8)
-        } catch let error {
+        } catch {
             let error = AnalyticsError.writeFile(extensionFilePath, error.localizedDescription)
             print(error.description)
             Analytics.exit(withError: error)
         }
     }
-    
+
     // MARK: - Extension content
-    
-    static func getExtensionContent(sections: [AnalyticsCategory], tags: [String], staticVar: Bool, extensionName: String) -> String {
+
+    static func getExtensionContent(
+        targets: [TrackerType],
+        sections: [AnalyticsCategory],
+        tags: [String],
+        staticVar: Bool,
+        extensionName: String
+    ) -> String {
         [
-            Self.getHeader(extensionClassname: extensionName, staticVar: staticVar),
-            Self.getProperties(sections: sections, tags: tags, staticVar: staticVar),
-            Self.getFooter()
+            getHeader(
+                targets: targets,
+                extensionClassname: extensionName,
+                staticVar: staticVar
+            ),
+            getProperties(
+                sections: sections,
+                tags: tags,
+                staticVar: staticVar
+            ),
+            getFooter()
         ]
             .joined(separator: "\n")
     }
-    
+
     // MARK: - Extension part
-    
-    private static func getHeader(extensionClassname: String, staticVar: Bool) -> String {
+
+    private static func getHeader(
+        targets: [TrackerType],
+        extensionClassname: String,
+        staticVar: Bool
+    ) -> String {
         """
         // Generated by ResgenSwift.\(Analytics.toolName) \(ResgenSwiftVersion)
-        
-        \(Self.getImport())
-        
-        \(Self.getAnalyticsProtocol())
+
+        \(getImport(targets: targets))
+
+        \(getAnalyticsProtocol(targets: targets))
         // MARK: - Manager
-        
+
         class AnalyticsManager {
+
             static var shared = AnalyticsManager()
-            
+
             // MARK: - Properties
-        
+
             var managers: [AnalyticsManagerProtocol] = []
-        
-            \(Self.getEnabledContent())
-        
-            \(Self.getAnalyticsProperties())
-                
-            \(Self.getPrivateLogFunction())
+
+            \(getEnabledContent())
+
+            \(getAnalyticsProperties(targets: targets))
+
+            \(getPrivateLogFunction())
         """
     }
-    
+
     private static func getEnabledContent() -> String {
         """
         private var isEnabled: Bool = true
-        
+
             // MARK: - Methods
-        
+
             func setAnalyticsEnabled(_ enable: Bool) {
                 isEnabled = enable
             }
         """
     }
-    
-    private static func getImport() -> String {
+
+    private static func getImport(targets: [TrackerType]) -> String {
         var result: [String] = []
-        
+
         if targets.contains(TrackerType.matomo) {
             result.append("import MatomoTracker")
         }
         if targets.contains(TrackerType.firebase) {
             result.append("import FirebaseAnalytics")
         }
-        
+
         return result.joined(separator: "\n")
     }
-    
+
     private static func getPrivateLogFunction() -> String {
         """
         private func logScreen(name: String, path: String) {
                 guard isEnabled else { return }
-        
+
                 managers.forEach { manager in
                     manager.logScreen(name: name, path: path)
                 }
             }
-            
+
             private func logEvent(
                 name: String,
                 action: String,
@@ -118,7 +153,7 @@ class AnalyticsGenerator {
                 params: [String: Any]?
             ) {
                 guard isEnabled else { return }
-        
+
                 managers.forEach { manager in
                     manager.logEvent(
                         name: name,
@@ -130,18 +165,18 @@ class AnalyticsGenerator {
             }
         """
     }
-    
-    private static func getAnalyticsProperties() -> String {
+
+    private static func getAnalyticsProperties(targets: [TrackerType]) -> String {
         var header = ""
         var content: [String] = []
         let footer = "    }"
-        
+
         if targets.contains(TrackerType.matomo) {
             header = "func configure(siteId: String, url: String) {"
         } else if targets.contains(TrackerType.firebase) {
             header = "func configure() {"
         }
-        
+
         if targets.contains(TrackerType.matomo) {
             content.append("""
                     managers.append(
@@ -155,7 +190,7 @@ class AnalyticsGenerator {
         if targets.contains(TrackerType.firebase) {
             content.append("        managers.append(FirebaseAnalyticsManager())")
         }
-        
+
         return [
             header,
             content.joined(separator: "\n"),
@@ -163,12 +198,13 @@ class AnalyticsGenerator {
         ]
             .joined(separator: "\n")
     }
-    
-    private static func getAnalyticsProtocol() -> String {
+
+    private static func getAnalyticsProtocol(targets: [TrackerType]) -> String {
         let proto = """
         // MARK: - Protocol
-        
+
         protocol AnalyticsManagerProtocol {
+
             func logScreen(name: String, path: String)
             func logEvent(
                 name: String,
@@ -177,36 +213,40 @@ class AnalyticsGenerator {
                 params: [String: Any]?
             )
         }
-        
+
         """
-        
+
         var result: [String] = [proto]
-        
+
         if targets.contains(TrackerType.matomo) {
             result.append(MatomoGenerator.service)
         }
-        
+
         if targets.contains(TrackerType.firebase) {
             result.append(FirebaseGenerator.service)
         }
-        
+
         return result.joined(separator: "\n")
     }
-    
-    private static func getProperties(sections: [AnalyticsCategory], tags: [String], staticVar: Bool) -> String {
+
+    private static func getProperties(
+        sections: [AnalyticsCategory],
+        tags: [String],
+        staticVar: Bool
+    ) -> String {
         sections
             .compactMap { section in
                 // Check that at least one string will be generated
                 guard section.hasOneOrMoreMatchingTags(tags: tags) else {
                     return nil// Go to next section
                 }
-                
+
                 var res = "\n    // MARK: - \(section.id)"
                 section.definitions.forEach { definition in
                     guard definition.hasOneOrMoreMatchingTags(inputTags: tags) == true else {
                         return // Go to next definition
                     }
-                    
+
                     if staticVar {
                         res += "\n\n\(definition.getStaticProperty())"
                     } else {
@@ -217,11 +257,11 @@ class AnalyticsGenerator {
             }
             .joined(separator: "\n")
     }
-    
+
     private static func getFooter() -> String {
         """
         }
-        
+
         """
     }
 }

Sources/ResgenSwift/Analytics/Generator/FirebaseGenerator.swift

@@ -5,20 +5,22 @@
 //  Created by Loris Perret on 05/12/2023.
 //
 
+// CPD-OFF
+
 import Foundation
 
 enum FirebaseGenerator {
 
     static var service: String {
         [
-            FirebaseGenerator.header,
-            FirebaseGenerator.logScreen,
-            FirebaseGenerator.logEvent,
-            FirebaseGenerator.footer
+            Self.header,
+            Self.logScreen,
+            Self.logEvent,
+            Self.footer
         ]
             .joined(separator: "\n")
     }
-    
+
     // MARK: - Private vars
 
     private static var header: String {
@@ -28,23 +30,23 @@ enum FirebaseGenerator {
         class FirebaseAnalyticsManager: AnalyticsManagerProtocol {
         """
     }
-    
+
     private static var logScreen: String {
         """
             func logScreen(name: String, path: String) {
                 var parameters = [
                     AnalyticsParameterScreenName: name as NSObject
                 ]
-        
+
                 Analytics.logEvent(
                     AnalyticsEventScreenView,
                     parameters: parameters
                 )
             }
-        
+
         """
     }
-    
+
     private static var logEvent: String {
         """
             func logEvent(
@@ -57,7 +59,7 @@ enum FirebaseGenerator {
                     "action": action as NSObject,
                     "category": category as NSObject,
                 ]
-                
+
                 if let supplementaryParameters = params {
                     for (newKey, newValue) in supplementaryParameters {
                         if parameters.contains(where: { (key: String, value: NSObject) in
@@ -65,11 +67,11 @@ enum FirebaseGenerator {
                         }) {
                             continue
                         }
-                        
+
                         parameters[newKey] = newValue as? NSObject
                     }
                 }
-                
+
                 Analytics.logEvent(
                     name.replacingOccurrences(of: [" "], with: "_"),
                     parameters: parameters
@@ -77,11 +79,13 @@ enum FirebaseGenerator {
             }
         """
     }
-    
+
     private static var footer: String {
         """
         }
-        
+
         """
     }
 }
+
+// CPD-ON

Sources/ResgenSwift/Analytics/Generator/MatomoGenerator.swift

@@ -1,6 +1,6 @@
 //
 //  MatomoGenerator.swift
-//  
+//
 //
 //  Created by Loris Perret on 05/12/2023.
 //
@@ -11,15 +11,15 @@ enum MatomoGenerator {
 
     static var service: String {
         [
-            MatomoGenerator.header,
-            MatomoGenerator.setup,
-            MatomoGenerator.logScreen,
-            MatomoGenerator.logEvent,
-            MatomoGenerator.footer
+            Self.header,
+            Self.setup,
+            Self.logScreen,
+            Self.logEvent,
+            Self.footer
         ]
             .joined(separator: "\n")
     }
-    
+
     // MARK: - Private vars
 
     private static var header: String {
@@ -27,18 +27,18 @@ enum MatomoGenerator {
         // MARK: - Matomo
 
         class MatomoAnalyticsManager: AnalyticsManagerProtocol {
-            
+
             // MARK: - Properties
-        
+
             private var tracker: MatomoTracker
-        
+
         """
     }
-    
+
     private static var setup: String {
         """
             // MARK: - Init
-        
+
             init(siteId: String, url: String) {
                 debugPrint("[Matomo service] Server URL: \\(url)")
                 debugPrint("[Matomo service] Site ID: \\(siteId)")
@@ -46,40 +46,40 @@ enum MatomoGenerator {
                     siteId: siteId,
                     baseURL: URL(string: url)!
                 )
-                
+
                 #if DEBUG
                     tracker.dispatchInterval = 5
                 #endif
-                
+
                 #if DEBUG
                     tracker.logger = DefaultLogger(minLevel: .verbose)
                 #endif
-        
+
                 debugPrint("[Matomo service] Configured with content base: \\(tracker.contentBase?.absoluteString ?? "-")")
                 debugPrint("[Matomo service] Opt out: \\(tracker.isOptedOut)")
             }
-            
+
             // MARK: - Methods
-        
+
         """
     }
-    
+
     private static var logScreen: String {
         """
             func logScreen(name: String, path: String) {
                 guard !tracker.isOptedOut else { return }
                 guard let trackerUrl = tracker.contentBase?.absoluteString else { return }
-        
+
                 let urlString = URL(string: "\\(trackerUrl)" + "/" + "\\(path)" + "iOS")
                 tracker.track(
                     view: [name],
                     url: urlString
                 )
             }
-        
+
         """
     }
-    
+
     private static var logEvent: String {
         """
             func logEvent(
@@ -89,7 +89,7 @@ enum MatomoGenerator {
                 params: [String: Any]?
             ) {
                 guard !tracker.isOptedOut else { return }
-        
+
                 tracker.track(
                     eventWithCategory: category,
                     action: action,
@@ -100,11 +100,11 @@ enum MatomoGenerator {
             }
         """
     }
-    
+
     private static var footer: String {
         """
         }
-        
+
         """
     }
 }