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

Make R2String string Key enum unique by adding extnesion suffix (+ make extension suffix required)
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 2023-05-12 11:59:46 +02:00
parent 1e073af5df
commit d6c4702390
5 changed files with 43 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,7 +12,12 @@ class StringsFileGenerator {
// MARK: - Strings Files // MARK: - Strings Files
static func writeStringsFiles(sections: [Section], langs: [String], defaultLang: String, tags: [String], outputPath: String, inputFilenameWithoutExt: String) { static func writeStringsFiles(sections: [Section],
langs: [String],
defaultLang: String,
tags: [String],
outputPath: String,
inputFilenameWithoutExt: String) {
var stringsFilesContent = [String: String]() var stringsFilesContent = [String: String]()
for lang in langs { for lang in langs {
stringsFilesContent[lang] = Self.generateStringsFileContent(lang: lang, stringsFilesContent[lang] = Self.generateStringsFileContent(lang: lang,
@ -37,7 +42,10 @@ class StringsFileGenerator {
} }
} }
static func generateStringsFileContent(lang: String, defaultLang: String, tags inputTags: [String], sections: [Section]) -> String { static func generateStringsFileContent(lang: String,
defaultLang: String,
tags inputTags: [String],
sections: [Section]) -> String {
var stringsFileContent = """ var stringsFileContent = """
/** /**
* Apple Strings File * Apple Strings File
@ -86,14 +94,22 @@ class StringsFileGenerator {
// MARK: - Extension file // MARK: - Extension file
static func writeExtensionFiles(sections: [Section], defaultLang lang: String, tags: [String], staticVar: Bool, inputFilename: String, extensionName: String, extensionFilePath: String) { static func writeExtensionFiles(sections: [Section],
defaultLang lang: String,
tags: [String],
staticVar: Bool,
inputFilename: String,
extensionName: String,
extensionFilePath: String,
extensionSuffix: String) {
// Get extension content // Get extension content
let extensionFileContent = Self.getExtensionContent(sections: sections, let extensionFileContent = Self.getExtensionContent(sections: sections,
defaultLang: lang, defaultLang: lang,
tags: tags, tags: tags,
staticVar: staticVar, staticVar: staticVar,
inputFilename: inputFilename, inputFilename: inputFilename,
extensionName: extensionName) extensionName: extensionName,
extensionSuffix: extensionSuffix)
// Write content // Write content
let extensionFilePathURL = URL(fileURLWithPath: extensionFilePath) let extensionFilePathURL = URL(fileURLWithPath: extensionFilePath)
@ -108,10 +124,16 @@ class StringsFileGenerator {
// MARK: - Extension content // MARK: - Extension content
static func getExtensionContent(sections: [Section], defaultLang lang: String, tags: [String], staticVar: Bool, inputFilename: String, extensionName: String) -> String { static func getExtensionContent(sections: [Section],
defaultLang lang: String,
tags: [String],
staticVar: Bool,
inputFilename: String,
extensionName: String,
extensionSuffix: String) -> String {
[ [
Self.getHeader(stringsFilename: inputFilename, extensionClassname: extensionName), Self.getHeader(stringsFilename: inputFilename, extensionClassname: extensionName),
Self.getEnumKey(sections: sections, tags: tags), Self.getEnumKey(sections: sections, tags: tags, extensionSuffix: extensionSuffix),
Self.getProperties(sections: sections, defaultLang: lang, tags: tags, staticVar: staticVar), Self.getProperties(sections: sections, defaultLang: lang, tags: tags, staticVar: staticVar),
Self.getFooter() Self.getFooter()
] ]
@ -132,8 +154,8 @@ class StringsFileGenerator {
""" """
} }
private static func getEnumKey(sections: [Section], tags: [String]) -> String { private static func getEnumKey(sections: [Section], tags: [String], extensionSuffix: String) -> String {
var enumDefinition = "\n enum Key: String {\n" var enumDefinition = "\n enum Key\(extensionSuffix.uppercasedFirst()): String {\n"
sections.forEach { section in sections.forEach { section in
// Check that at least one string will be generated // Check that at least one string will be generated

3
Sources/ResgenSwift/Strings/Stringium/Stringium.swift
View File

@ -57,7 +57,8 @@ struct Stringium: ParsableCommand {
staticVar: options.staticMembers, staticVar: options.staticMembers,
inputFilename: options.inputFilenameWithoutExt, inputFilename: options.inputFilenameWithoutExt,
extensionName: options.extensionName, extensionName: options.extensionName,
extensionFilePath: options.extensionFilePath) extensionFilePath: options.extensionFilePath,
extensionSuffix: options.extensionSuffix)
print("[\(Self.toolName)] Strings generated") print("[\(Self.toolName)] Strings generated")
} }

9
Sources/ResgenSwift/Strings/Stringium/StringiumOptions.swift
View File

@ -36,8 +36,8 @@ struct StringiumOptions: ParsableArguments {
@Option(help: "Extension name. If not specified, it will generate an String extension.") @Option(help: "Extension name. If not specified, it will generate an String extension.")
var extensionName: String = Stringium.defaultExtensionName var extensionName: String = Stringium.defaultExtensionName
@Option(help: "Extension suffix. Ex: MyApp, it will generate {extensionName}+{extensionSuffix}.swift") @Option(help: "Extension suffix: {extensionName}+{extensionSuffix}.swift")
var extensionSuffix: String? var extensionSuffix: String
} }
// MARK: - Private var getter // MARK: - Private var getter
@ -68,10 +68,7 @@ extension StringiumOptions {
extension StringiumOptions { extension StringiumOptions {
var extensionFileName: String { var extensionFileName: String {
if let extensionSuffix = extensionSuffix { "\(extensionName)+\(extensionSuffix).swift"
return "\(extensionName)+\(extensionSuffix).swift"
}
return "\(extensionName).swift"
} }
var extensionFilePath: String { var extensionFilePath: String {

4
Sources/ToolCore/StringExtensions.swift
View File

@ -85,4 +85,8 @@ public extension String {
blue = String(colorClean.prefix(2)) blue = String(colorClean.prefix(2))
return (alpha: alpha, red: red, green: green, blue: blue) return (alpha: alpha, red: red, green: green, blue: blue)
} }
func uppercasedFirst() -> String {
prefix(1).uppercased() + dropFirst()
}
} }

6
Tests/ResgenSwiftTests/Strings/StringsFileGeneratorTests.swift
View File

@ -131,7 +131,8 @@ final class StringsFileGeneratorTests: XCTestCase {
tags: ["ios", "iosonly", "notranslation"], tags: ["ios", "iosonly", "notranslation"],
staticVar: false, staticVar: false,
inputFilename: "myInputFilename", inputFilename: "myInputFilename",
extensionName: "GenStrings") extensionName: "GenStrings",
extensionSuffix: "strings")
// Expect // Expect
let expect = """ let expect = """
@ -207,7 +208,8 @@ final class StringsFileGeneratorTests: XCTestCase {
tags: ["ios", "iosonly", "notranslation"], tags: ["ios", "iosonly", "notranslation"],
staticVar: true, staticVar: true,
inputFilename: "myInputFilename", inputFilename: "myInputFilename",
extensionName: "GenStrings") extensionName: "GenStrings",
extensionSuffix: "strings")
// Expect // Expect
let expect = """ let expect = """