openium/resgen.swift
1
0
Fork 0
Code Pull Requests Releases 12 Activity

feat/RES-73_Ajout_DebugMode_Analytics #22

Merged
q.bandera merged 5 commits from feat/RES-73_Ajout_DebugMode_Analytics into master 2025-10-21 15:03:05 +02:00
Conversation 8 Commits 5 Files Changed 4 +79 -105
4 changed files with 79 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f0aac3a91b - Show all commits

120
SampleFiles/Tags/Generated/Analytics+GenAllScript.swift
View File

@@ -1,12 +1,12 @@
// Generated by ResgenSwift.Analytics 2.2.0 // Generated by ResgenSwift.Analytics 2.2.0
import Foundation import Foundation
import MatomoTracker
import FirebaseAnalytics import FirebaseAnalytics
import os
// MARK: - Protocol // MARK: - Protocol
public protocol AnalyticsManagerProtocol { internal protocol AnalyticsManagerProtocol {
func logScreen( func logScreen(
name: String, name: String,
@@ -24,72 +24,6 @@ public protocol AnalyticsManagerProtocol {
func setEnable(_ enable: Bool) func setEnable(_ enable: Bool)
} }
// MARK: - Matomo
class MatomoAnalyticsManager: AnalyticsManagerProtocol {
// MARK: - Properties
private var tracker: MatomoTracker
// MARK: - Init
init(siteId: String, url: String) {
debugPrint("[Matomo service] Server URL: \(url)")
debugPrint("[Matomo service] Site ID: \(siteId)")
tracker = MatomoTracker(
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
func logScreen(
name: String,
path: String,
params: [String: Any]?
) {
guard let trackerUrl = tracker.contentBase?.absoluteString else { return }
let urlString = URL(string: "\(trackerUrl)" + "/" + "\(path)" + "iOS")
tracker.track(
view: [name],
url: urlString
)
}
func logEvent(
name: String,
action: String,
category: String,
params: [String: Any]?
) {
tracker.track(
eventWithCategory: category,
action: action,
name: name,
number: nil,
url: nil
)
}
func setEnable(_ enable: Bool) {
tracker.isOptedOut = !enable
}
}
// MARK: - Firebase // MARK: - Firebase
class FirebaseAnalyticsManager: AnalyticsManagerProtocol { class FirebaseAnalyticsManager: AnalyticsManagerProtocol {
@@ -170,17 +104,16 @@ class FirebaseAnalyticsManager: AnalyticsManagerProtocol {
// MARK: - Traker Type // MARK: - Traker Type
public enum TrackerType: CaseIterable { internal enum TrackerType: CaseIterable {
case matomo
case firebase case firebase
} }
// MARK: - Manager // MARK: - Manager
public class AnalyticsManager { internal class AnalyticsManager {
public static var shared = AnalyticsManager() internal static var shared = AnalyticsManager()
private init() {} private init() {}
@@ -188,6 +121,8 @@ public class AnalyticsManager {
var managers: [TrackerType: AnalyticsManagerProtocol] = [:] var managers: [TrackerType: AnalyticsManagerProtocol] = [:]
private var isDebugMode: Bool = false
private var isEnabled: Bool { private var isEnabled: Bool {
if ProcessInfo.processInfo.environment["XCODE_RUNNING_FOR_PREVIEWS"] == "1" { if ProcessInfo.processInfo.environment["XCODE_RUNNING_FOR_PREVIEWS"] == "1" {
false false
@@ -196,6 +131,8 @@ public class AnalyticsManager {
} }
} }
private let logger = Logger(subsystem: "resgen", category: "analytics")
// MARK: - Enable Methods // MARK: - Enable Methods
private func setAnalytics(enable: Bool, _ analytics: [TrackerType]) { private func setAnalytics(enable: Bool, _ analytics: [TrackerType]) {
@@ -208,19 +145,16 @@ public class AnalyticsManager {
} }
} }
public func enableAnalytics(_ analytics: [TrackerType] = TrackerType.allCases) { internal func enableAnalytics(_ analytics: [TrackerType] = TrackerType.allCases) {
setAnalytics(enable: true, analytics) setAnalytics(enable: true, analytics)
} }
public func disableAnalytics(_ analytics: [TrackerType] = TrackerType.allCases) { internal func disableAnalytics(_ analytics: [TrackerType] = TrackerType.allCases) {
setAnalytics(enable: false, analytics) setAnalytics(enable: false, analytics)
} }
public func configure(siteId: String, url: String) { internal func configure(isDebugMode: Bool = false) {
managers[TrackerType.matomo] = MatomoAnalyticsManager( isDebugMode = isDebugMode
siteId: siteId,
url: url
)
managers[TrackerType.firebase] = FirebaseAnalyticsManager() managers[TrackerType.firebase] = FirebaseAnalyticsManager()
} }
@@ -231,9 +165,17 @@ public class AnalyticsManager {
path: String, path: String,
params: [String: Any]? params: [String: Any]?
) { ) {
guard isEnabled else { return } guard isEnabled else {
logger.notice("Analytics disabled")
return
}
managers.values.forEach { manager in managers.values.forEach { manager in
if isDebugMode {
logger.info("🖥️ Screen: \(name, privacy: .public) | path: \(path, privacy: .public) | params: \(paramsString, privacy: .public)")
}
manager.logScreen( manager.logScreen(
name: name, name: name,
path: path, path: path,
@@ -248,9 +190,17 @@ public class AnalyticsManager {
category: String, category: String,
params: [String: Any]? params: [String: Any]?
) { ) {
guard isEnabled else { return } guard isEnabled else {
logger.notice("Analytics disabled")
return
}
managers.values.forEach { manager in managers.values.forEach { manager in
if isDebugMode {
logger.info("📊 Event: \(name, privacy: .public) | action: \(action ?? "-", privacy: .public) | category: \(category ?? "-", privacy: .public) | params: \(paramsString, privacy: .public)")
}
manager.logEvent( manager.logEvent(
name: name, name: name,
action: action, action: action,
@@ -262,7 +212,7 @@ public class AnalyticsManager {
// MARK: - section_one // MARK: - section_one
public func logScreenS1DefOne(title: String) { internal func logScreenS1DefOne(title: String) {
logScreen( logScreen(
name: "s1 def one \(title)", name: "s1 def one \(title)",
path: "s1_def_one/\(title)", path: "s1_def_one/\(title)",
@@ -270,10 +220,10 @@ public class AnalyticsManager {
) )
} }
public func logEventS1DefTwo( internal func logEventS1DefTwo(
title: String, title: String,
count: String, count: String,
test2: String = "test" test2: String = "tes"
) { ) {
logEvent( logEvent(
name: "s1 def two", name: "s1 def two",
@@ -290,7 +240,7 @@ public class AnalyticsManager {
// MARK: - section_two // MARK: - section_two
public func logScreenS2DefOne() { internal func logScreenS2DefOne() {
logScreen( logScreen(
name: "s2 def one", name: "s2 def one",
path: "s2_def_one/", path: "s2_def_one/",

23
SampleFiles/genAllRessources.sh
View File

@@ -33,13 +33,13 @@ FORCE_FLAG="$1"
#echo "\n-------------------------\n" #echo "\n-------------------------\n"
## Strings ## Strings
swift run -c release ResgenSwift strings stringium $FORCE_FLAG "./Strings/sampleStrings.txt" \ #swift run -c release ResgenSwift strings stringium $FORCE_FLAG "./Strings/sampleStrings.txt" \
--output-path "./Strings/Generated" \ # --output-path "./Strings/Generated" \
--langs "fr en en-us" \ # --langs "fr en en-us" \
--default-lang "en" \ # --default-lang "en" \
--extension-output-path "./Strings/Generated" \ # --extension-output-path "./Strings/Generated" \
--extension-name "String" \ # --extension-name "String" \
--extension-suffix "GenAllScript" # --extension-suffix "GenAllScript"
#echo "\n-------------------------\n" #echo "\n-------------------------\n"
# #
@@ -53,12 +53,9 @@ swift run -c release ResgenSwift strings stringium $FORCE_FLAG "./Strings/sample
#echo "\n-------------------------\n" #echo "\n-------------------------\n"
# #
## Analytics ## Analytics
#swift run -c release ResgenSwift analytics $FORCE_FLAG "./Tags/sampleTags.yml" \ swift run -c release ResgenSwift analytics -f "./Tags/sampleTags.yml" \
# --target "firebase" \ --target "firebase" \
# --extension-output-path "./Tags/Generated" \ --output-file "./Tags/Generated/Analytics+GenAllScript.swift"
# --extension-name "Analytics" \
# --extension-suffix "GenAllScript" \
# --static-members true
# #
#echo "\n-------------------------\n" #echo "\n-------------------------\n"
# #

36
Sources/ResgenSwift/Analytics/Generator/AnalyticsGenerator.swift
View File

@@ -143,6 +143,8 @@ enum AnalyticsGenerator {
visibility: ExtensionVisibility visibility: ExtensionVisibility
) -> String { ) -> String {
""" """
private var isDebugMode: Bool = false
t.schmitt commented 2025-10-20 16:37:47 +02:00
Review
Copy Link

Manque une identation

Manque une identation
q.bandera commented 2025-10-20 17:06:42 +02:00
Review
Copy Link

Capture d’écran 2025-10-20 à 17.06.14.png

![Capture d’écran 2025-10-20 à 17.06.14.png](/attachments/63672f15-a59d-4c39-8ba4-7763a1e7305d)
Capture d’écran 2025-10-20 à 17.06.14.png
106 KiB
q.bandera commented 2025-10-20 17:07:33 +02:00
Review
Copy Link

Si t'as une explication 🤷‍♂️

Si t'as une explication 🤷‍♂️
q.bandera commented 2025-10-20 17:09:51 +02:00
Review
Copy Link

Capture d’écran 2025-10-20 à 17.09.34.png

C'était comme ça de base

![Capture d’écran 2025-10-20 à 17.09.34.png](/attachments/387355b3-d12c-44ec-a410-131ec0a0b34f) C'était comme ça de base
Capture d’écran 2025-10-20 à 17.09.34.png
78 KiB
private var isEnabled: Bool { private var isEnabled: Bool {
if ProcessInfo.processInfo.environment["XCODE_RUNNING_FOR_PREVIEWS"] == "1" { if ProcessInfo.processInfo.environment["XCODE_RUNNING_FOR_PREVIEWS"] == "1" {
false false
@@ -151,6 +153,8 @@ enum AnalyticsGenerator {
} }
} }
private let logger = Logger(subsystem: "resgen", category: "analytics")
// MARK: - Enable Methods // MARK: - Enable Methods
private func setAnalytics(enable: Bool, _ analytics: [TrackerType]) { private func setAnalytics(enable: Bool, _ analytics: [TrackerType]) {
@@ -186,6 +190,8 @@ enum AnalyticsGenerator {
result.append("import FirebaseAnalytics") result.append("import FirebaseAnalytics")
} }
result.append("import os")
return result.joined(separator: "\n") return result.joined(separator: "\n")
} }
@@ -198,9 +204,19 @@ enum AnalyticsGenerator {
path: String, path: String,
params: [String: Any]? params: [String: Any]?
) { ) {
guard isEnabled else { return } guard isEnabled else {
if isDebugMode {
logger.log("Analytics disabled")
}
return
}
managers.values.forEach { manager in managers.values.forEach { manager in
if isDebugMode {
logger.debug("🖥️ Screen: \\(name, privacy: .public) | path: \\(path, privacy: .public) | params: \\(String(describing: params ?? [:]), privacy: .public)")
}
manager.logScreen( manager.logScreen(
name: name, name: name,
path: path, path: path,
@@ -215,9 +231,19 @@ enum AnalyticsGenerator {
category: String, category: String,
params: [String: Any]? params: [String: Any]?
) { ) {
guard isEnabled else { return } guard isEnabled else {
if isDebugMode {
logger.log("Analytics disabled")
}
return
}
managers.values.forEach { manager in managers.values.forEach { manager in
if isDebugMode {
logger.debug("📊 Event: \\(name, privacy: .public) | action: \\(action, privacy: .public) | category: \\(category, privacy: .public) | params: \\(String(describing: params ?? [:]), privacy: .public)")
}
manager.logEvent( manager.logEvent(
name: name, name: name,
action: action, action: action,
@@ -238,11 +264,13 @@ enum AnalyticsGenerator {
let footer = " }" let footer = " }"
if targets.contains(TrackerType.matomo) { if targets.contains(TrackerType.matomo) {
header = "\(visibility) func configure(siteId: String, url: String) {" header = "\(visibility) func configure(siteId: String, url: String, isDebugMode: Bool = false) {"
} else if targets.contains(TrackerType.firebase) { } else if targets.contains(TrackerType.firebase) {
header = "\(visibility) func configure() {" header = "\(visibility) func configure(isDebugMode: Bool = false) {"
} }
content.append(" self.isDebugMode = isDebugMode")
if targets.contains(TrackerType.matomo) { if targets.contains(TrackerType.matomo) {
content.append(""" content.append("""
managers[TrackerType.matomo] = MatomoAnalyticsManager( managers[TrackerType.matomo] = MatomoAnalyticsManager(

3
Sources/ResgenSwift/Strings/Generator/StringsFileGenerator.swift
View File

@@ -175,7 +175,7 @@ enum StringsFileGenerator {
guard section.hasOneOrMoreMatchingTags(tags: inputTags) else { guard section.hasOneOrMoreMatchingTags(tags: inputTags) else {
return // Go to next section return // Go to next section
} }
print("DOUDOU")
t.schmitt commented 2025-10-20 16:47:06 +02:00
Review
Copy Link

❤️

❤️
😆 1
section section
.definitions .definitions
.forEach { definition in // swiftlint:disable:this closure_body_length .forEach { definition in // swiftlint:disable:this closure_body_length
@@ -212,7 +212,6 @@ enum StringsFileGenerator {
// Search for langs in twine // Search for langs in twine
for (lang, value) in definition.translations for (lang, value) in definition.translations
where langs.contains(lang) && !value.isEmpty { where langs.contains(lang) && !value.isEmpty {
print("DOUDOU-> generate for \(lang)")
let localization = XCStringLocalization( let localization = XCStringLocalization(
lang: lang, lang: lang,
content: XCStringLocalizationLangContent( content: XCStringLocalizationLangContent(