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

Add --project-directory option to generate command to easily use relative path
Some checks failed
gitea-openium/resgen.swift/pipeline/head There was a failure building this commit
Details

Browse Source
This commit is contained in:
Thibaut Schmitt
2022-08-31 16:42:22 +02:00
parent 3d60513c08
commit e9bc779da6
22 changed files with 136 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Sources/ResgenSwift/Generate/Extensions/StringExtensions.swift Normal file
View File

@ -0,0 +1,18 @@
//
// StringExtensions.swift
//
//
// Created by Thibaut Schmitt on 31/08/2022.
//
import Foundation
extension String {
func prependIfRelativePath(_ prependPath: String) -> String {
if self.hasPrefix("/") {
return self
}
return prependPath + self
}
}

8
Sources/ResgenSwift/Generate/Generate.swift
View File

@ -40,13 +40,17 @@ struct Generate: ParsableCommand {
print(" - \(configuration.strings.count) strings configuration")
print(" - \(configuration.tags.count) tags configuration")
print()
print("Input file: \(configuration.colors.first?.inputFile ?? "no input file")")
// Execute commands
configuration.runnableConfigurations
.forEach {
$0.run(force: options.forceGeneration)
$0.run(projectDirectory: options.projectDirectory,
force: options.forceGeneration)
print("\n")
}
print("[\(Self.toolName)] Resgen ended")
}
}

9
Sources/ResgenSwift/Generate/GenerateOptions.swift
View File

@ -16,4 +16,13 @@ struct GenerateOptions: ParsableArguments {
@Argument(help: "Configuration file.", transform: { $0.replaceTiltWithHomeDirectoryPath() })
var configurationFile: String
@Option(help: "Project directory. It will be added to every relative path (path that does not start with `/`",
transform: {
if $0.last == "/" {
return $0
}
return $0 + "/"
})
var projectDirectory: String
}

15
Sources/ResgenSwift/Generate/Runnable/ColorsConfiguration+ShellCommandable.swift
View File

@ -1,5 +1,5 @@
//
// ColorsConfiguration+ShellCommandable.swift
// ColorsConfiguration+Runnable.swift
//
//
// Created by Thibaut Schmitt on 30/08/2022.
@ -8,7 +8,7 @@
import Foundation
extension ColorsConfiguration: Runnable {
func run(force: Bool) {
func run(projectDirectory: String, force: Bool) {
var args = [String]()
if force {
@ -16,13 +16,13 @@ extension ColorsConfiguration: Runnable {
}
args += [
inputFile,
inputFile.prependIfRelativePath(projectDirectory),
"--style",
style,
"--xcassets-path",
xcassetsPath,
xcassetsPath.prependIfRelativePath(projectDirectory),
"--extension-output-path",
extensionOutputPath,
extensionOutputPath.prependIfRelativePath(projectDirectory),
"--static-members",
"\(staticMembersOptions)"
]
@ -39,7 +39,8 @@ extension ColorsConfiguration: Runnable {
extensionSuffix
]
}
Colors.main(args)
print("Colors args:")
dump(args)
//Colors.main(args)
}
}

6
Sources/ResgenSwift/Generate/Runnable/FontsConfiguration+ShellCommandable.swift
View File

@ -1,5 +1,5 @@
//
// FontsConfiguration+ShellCommandable.swift
// FontsConfiguration+Runnable.swift
//
//
// Created by Thibaut Schmitt on 30/08/2022.
@ -8,7 +8,7 @@
import Foundation
extension FontsConfiguration: Runnable {
func run(force: Bool) {
func run(projectDirectory: String, force: Bool) {
var args = [String]()
if force {
@ -18,7 +18,7 @@ extension FontsConfiguration: Runnable {
args += [
inputFile,
"--extension-output-path",
extensionOutputPath,
extensionOutputPath.prependIfRelativePath(projectDirectory),
"--static-members",
"\(staticMembersOptions)"
]

10
Sources/ResgenSwift/Generate/Runnable/ImagesConfiguration+ShellCommandable.swift
View File

@ -1,5 +1,5 @@
//
// ImagesConfiguration+ShellCommandable.swift
// ImagesConfiguration+Runnable.swift
//
//
// Created by Thibaut Schmitt on 30/08/2022.
@ -8,7 +8,7 @@
import Foundation
extension ImagesConfiguration: Runnable {
func run(force: Bool) {
func run(projectDirectory: String, force: Bool) {
var args = [String]()
if force {
@ -16,11 +16,11 @@ extension ImagesConfiguration: Runnable {
}
args += [
inputFile,
inputFile.prependIfRelativePath(projectDirectory),
"--xcassets-path",
xcassetsPath,
xcassetsPath.prependIfRelativePath(projectDirectory),
"--extension-output-path",
extensionOutputPath,
extensionOutputPath.prependIfRelativePath(projectDirectory),
"--static-members",
"\(staticMembersOptions)"
]

2
Sources/ResgenSwift/Generate/Runnable/Runnable.swift
View File

@ -8,6 +8,6 @@
import Foundation
protocol Runnable {
func run(force: Bool)
func run(projectDirectory: String, force: Bool)
}

10
Sources/ResgenSwift/Generate/Runnable/StringsConfiguration+ShellCommandable.swift
View File

@ -1,5 +1,5 @@
//
// StringsConfiguration+ShellCommandable.swift
// StringsConfiguration+Runnable.swift
//
//
// Created by Thibaut Schmitt on 30/08/2022.
@ -8,7 +8,7 @@
import Foundation
extension StringsConfiguration: Runnable {
func run(force: Bool) {
func run(projectDirectory: String, force: Bool) {
var args = [String]()
if force {
@ -16,15 +16,15 @@ extension StringsConfiguration: Runnable {
}
args += [
inputFile,
inputFile.prependIfRelativePath(projectDirectory),
"--output-path",
outputPath,
outputPath.prependIfRelativePath(projectDirectory),
"--langs",
langs,
"--default-lang",
defaultLang,
"--extension-output-path",
extensionOutputPath,
extensionOutputPath.prependIfRelativePath(projectDirectory),
"--static-members",
"\(staticMembersOptions)"
]

8
Sources/ResgenSwift/Generate/Runnable/TagsConfiguration+ShellCommandable.swift
View File

@ -1,5 +1,5 @@
//
// TagsConfiguration+ShellCommandable.swift
// TagsConfiguration+Runnable.swift
//
//
// Created by Thibaut Schmitt on 30/08/2022.
@ -8,7 +8,7 @@
import Foundation
extension TagsConfiguration: Runnable {
func run(force: Bool) {
func run(projectDirectory: String, force: Bool) {
var args = [String]()
if force {
@ -16,11 +16,11 @@ extension TagsConfiguration: Runnable {
}
args += [
inputFile,
inputFile.prependIfRelativePath(projectDirectory),
"--lang",
lang,
"--extension-output-path",
extensionOutputPath,
extensionOutputPath.prependIfRelativePath(projectDirectory),
"--static-members",
"\(staticMembersOptions)"
]