From 87230197328023e2d528de61ee8924dd6d56478c Mon Sep 17 00:00:00 2001 From: Thibaut Schmitt Date: Thu, 1 Sep 2022 15:59:16 +0200 Subject: [PATCH] Renable Colors generation + add print to each command to identify which configuration is used --- Sources/ResgenSwift/Colors/Colors.swift | 3 +-- Sources/ResgenSwift/Colors/Parser/ColorFileParser.swift | 2 +- Sources/ResgenSwift/Fonts/Fonts.swift | 1 + .../Runnable/ColorsConfiguration+ShellCommandable.swift | 5 ++--- .../Runnable/FontsConfiguration+ShellCommandable.swift | 2 +- Sources/ResgenSwift/Images/Images.swift | 1 + Sources/ResgenSwift/Strings/Stringium/Stringium.swift | 1 + Sources/ResgenSwift/Strings/Tag/Tags.swift | 3 ++- 8 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Sources/ResgenSwift/Colors/Colors.swift b/Sources/ResgenSwift/Colors/Colors.swift index 8c19054..1a26778 100644 --- a/Sources/ResgenSwift/Colors/Colors.swift +++ b/Sources/ResgenSwift/Colors/Colors.swift @@ -32,8 +32,7 @@ struct Colors: ParsableCommand { public func run() throws { print("[\(Self.toolName)] Starting colors generation") - print("[\(Self.toolName)] Will use inputFile \(options.inputFile) to generate \(options.colorStyle) colors in xcassets \(options.xcassetsPath)") - + // Check requirements guard checkRequirements() else { return } diff --git a/Sources/ResgenSwift/Colors/Parser/ColorFileParser.swift b/Sources/ResgenSwift/Colors/Parser/ColorFileParser.swift index 653006b..3f02bb1 100644 --- a/Sources/ResgenSwift/Colors/Parser/ColorFileParser.swift +++ b/Sources/ResgenSwift/Colors/Parser/ColorFileParser.swift @@ -23,7 +23,7 @@ class ColorFileParser { .replacingOccurrences(of: "=", with: "") // Keep compat with current file format guard colorLineCleanedUp.hasPrefix("#") == false, colorLineCleanedUp.isEmpty == false else { - print("[\(Colors.toolName)] ⚠️ BadFormat or empty line (line number: \(lineNumber + 1)). Skip this line") + debugPrint("[\(Colors.toolName)] ⚠️ BadFormat or empty line (line number: \(lineNumber + 1)). Skip this line") return nil } diff --git a/Sources/ResgenSwift/Fonts/Fonts.swift b/Sources/ResgenSwift/Fonts/Fonts.swift index 671b477..3fa963d 100644 --- a/Sources/ResgenSwift/Fonts/Fonts.swift +++ b/Sources/ResgenSwift/Fonts/Fonts.swift @@ -31,6 +31,7 @@ struct Fonts: ParsableCommand { public func run() throws { print("[\(Self.toolName)] Starting fonts generation") + print("[\(Self.toolName)] Will use inputFile \(options.inputFile) to generate fonts") // Check requirements guard checkRequirements() else { return } diff --git a/Sources/ResgenSwift/Generate/Runnable/ColorsConfiguration+ShellCommandable.swift b/Sources/ResgenSwift/Generate/Runnable/ColorsConfiguration+ShellCommandable.swift index 74850c3..49639b0 100644 --- a/Sources/ResgenSwift/Generate/Runnable/ColorsConfiguration+ShellCommandable.swift +++ b/Sources/ResgenSwift/Generate/Runnable/ColorsConfiguration+ShellCommandable.swift @@ -39,8 +39,7 @@ extension ColorsConfiguration: Runnable { extensionSuffix ] } - print("Colors args:") - dump(args) - //Colors.main(args) + + Colors.main(args) } } diff --git a/Sources/ResgenSwift/Generate/Runnable/FontsConfiguration+ShellCommandable.swift b/Sources/ResgenSwift/Generate/Runnable/FontsConfiguration+ShellCommandable.swift index 6b62239..4ef8aa2 100644 --- a/Sources/ResgenSwift/Generate/Runnable/FontsConfiguration+ShellCommandable.swift +++ b/Sources/ResgenSwift/Generate/Runnable/FontsConfiguration+ShellCommandable.swift @@ -16,7 +16,7 @@ extension FontsConfiguration: Runnable { } args += [ - inputFile, + inputFile.prependIfRelativePath(projectDirectory), "--extension-output-path", extensionOutputPath.prependIfRelativePath(projectDirectory), "--static-members", diff --git a/Sources/ResgenSwift/Images/Images.swift b/Sources/ResgenSwift/Images/Images.swift index 9f8d8d3..0d26779 100644 --- a/Sources/ResgenSwift/Images/Images.swift +++ b/Sources/ResgenSwift/Images/Images.swift @@ -31,6 +31,7 @@ struct Images: ParsableCommand { mutating func run() { print("[\(Self.toolName)] Starting images generation") + print("[\(Self.toolName)] Will use inputFile \(options.inputFile) to generate images in xcassets \(options.xcassetsPath)") // Check requirements guard checkRequirements() else { return } diff --git a/Sources/ResgenSwift/Strings/Stringium/Stringium.swift b/Sources/ResgenSwift/Strings/Stringium/Stringium.swift index 72d577e..ca750c8 100644 --- a/Sources/ResgenSwift/Strings/Stringium/Stringium.swift +++ b/Sources/ResgenSwift/Strings/Stringium/Stringium.swift @@ -32,6 +32,7 @@ struct Stringium: ParsableCommand { mutating func run() { print("[\(Self.toolName)] Starting strings generation") + print("[\(Self.toolName)] Will use inputFile \(options.inputFile) to generate strings for \(options.langs) (default lang: \(options.defaultLang)") // Check requirements guard checkRequirements() else { return } diff --git a/Sources/ResgenSwift/Strings/Tag/Tags.swift b/Sources/ResgenSwift/Strings/Tag/Tags.swift index d5fdccd..5e53208 100644 --- a/Sources/ResgenSwift/Strings/Tag/Tags.swift +++ b/Sources/ResgenSwift/Strings/Tag/Tags.swift @@ -32,7 +32,8 @@ struct Tags: ParsableCommand { // MARK: - Run mutating func run() { - print("[\(Self.toolName)] Starting tagss generation") + print("[\(Self.toolName)] Starting tags generation") + print("[\(Self.toolName)] Will use inputFile \(options.inputFile) to generate strings for lang: \(options.lang)") // Check requirements guard checkRequirements() else { return }