Remove unwanted lang translation when generated xcStrings catalog

Fix Makefile INSTALL_DIR & man page
Update SwiftLint and fix some Swift 6 issues
2025-09-30 16:08:45 +02:00 · 2025-09-11 14:28:21 +02:00 · 2025-09-10 16:51:23 +02:00 · 2025-08-26 08:51:33 +02:00 · 2025-08-26 08:50:45 +02:00
18 changed files with 39 additions and 40 deletions
--- a/7
+++ b/7
@@ -1,7 +1,6 @@
 SHELL = /bin/zsh

-#INSTALL_DIR ?= /usr/local/bin
-INSTALL_DIR = /tmp/ResgenYolo
+INSTALL_DIR = /usr/local/bin

 MAN_DIR := /usr/local/share/man
 MAN_PAGE_NAME = resgen-swift.1
@@ -14,7 +13,7 @@ BUILD_DIR = $(REPO_DIR)/.build

 # create-man-files:
 # 	swift package plugin generate-manual
-# 	cp $(BUILDDIR)/plugins/GenerateManualPlugin/outputs/ResgenSwift/resgen-swift.1 $(REPODIR)/man/resgen-swift.1
+# 	cp $(BUILDDIR)/plugins/GenerateManual/outputs/ResgenSwift/resgen-swift.1 $(REPODIR)/man/resgen-swift.1

 # install-man-files:
 # 	mkdir -p ${DESTDIR}${mandir}/man1
@@ -23,7 +22,7 @@ BUILD_DIR = $(REPO_DIR)/.build
 create-and-install-man-files:
 	swift package plugin generate-manual
 	mkdir -p ${MAN_DIR}/man1
-	cp $(BUILD_DIR)/plugins/GenerateManualPlugin/outputs/ResgenSwift/${MAN_PAGE_NAME} ${MAN_DIR}/man1/${MAN_PAGE_NAME}
+	cp $(BUILD_DIR)/plugins/GenerateManual/outputs/ResgenSwift/${MAN_PAGE_NAME} ${MAN_DIR}/man1/${MAN_PAGE_NAME}

 #
 # Build and install
--- a/Package.resolved
+++ b/Package.resolved
@@ -1,4 +1,5 @@
 {
+  "originHash" : "fae67d9ce14b6664edc4151ad1a55b74d50d7281499f09eeca50b0376d0f837f",
  "pins" : [
    {
      "identity" : "swift-argument-parser",
@@ -14,8 +15,8 @@
      "kind" : "remoteSourceControl",
      "location" : "https://github.com/lukepistrol/SwiftLintPlugin",
      "state" : {
-        "revision" : "87454f5c9ff4d644086aec2a0df1ffba678e7f3c",
-        "version" : "0.57.1"
+        "revision" : "8e785a9801fc7961fef3d41ccb81acb3bd3d9735",
+        "version" : "0.60.0"
      }
    },
    {
@@ -28,5 +29,5 @@
      }
    }
  ],
-  "version" : 2
+  "version" : 3
 }
--- a/Package.swift
+++ b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.9
+// swift-tools-version:6.1
 // The swift-tools-version declares the minimum version of Swift required to build this package.

 import PackageDescription
@@ -18,7 +18,7 @@ let package = Package(
        ),
        .package(
            url: "https://github.com/lukepistrol/SwiftLintPlugin",
-            exact: "0.57.1"
+            exact: "0.60.0"
        ),
    ],
    targets: [
--- a/SampleFiles/Tags/Generated/Analytics+GenAllScript.swift
+++ b/SampleFiles/Tags/Generated/Analytics+GenAllScript.swift
@@ -133,7 +133,7 @@ class FirebaseAnalyticsManager: AnalyticsManagerProtocol {
        category: String,
        params: [String: Any]?
    ) {
-        var parameters: [String:NSObject] = [
+        var parameters: [String: NSObject] = [
            AnalyticsParameterItemName: name.replacingOccurrences(of: " ", with: "_") as NSObject
        ]

--- a/Sources/ResgenSwift/Analytics/Analytics.swift
+++ b/Sources/ResgenSwift/Analytics/Analytics.swift
@@ -13,7 +13,7 @@ struct Analytics: ParsableCommand {

    // MARK: - Command Configuration

-    static var configuration = CommandConfiguration(
+    static let configuration = CommandConfiguration(
        abstract: "Generate analytics extension file.",
        version: ResgenSwiftVersion
    )
--- a/Sources/ResgenSwift/Analytics/Generator/FirebaseGenerator.swift
+++ b/Sources/ResgenSwift/Analytics/Generator/FirebaseGenerator.swift
@@ -79,7 +79,7 @@ enum FirebaseGenerator {
                category: String,
                params: [String: Any]?
            ) {
-                var parameters: [String:NSObject] = [
+                var parameters: [String: NSObject] = [
                    AnalyticsParameterItemName: name.replacingOccurrences(of: " ", with: "_") as NSObject
                ]

--- a/Sources/ResgenSwift/Fonts/Fonts.swift
+++ b/Sources/ResgenSwift/Fonts/Fonts.swift
@@ -13,7 +13,7 @@ struct Fonts: ParsableCommand {

    // MARK: - CommandConfiguration

-    static var configuration = CommandConfiguration(
+    static let configuration = CommandConfiguration(
        abstract: "A utility to generate an helpful etension to access your custom font from code and also Info.plist UIAppsFont content.",
        version: ResgenSwiftVersion
    )
--- a/Sources/ResgenSwift/Generate/Generate.swift
+++ b/Sources/ResgenSwift/Generate/Generate.swift
@@ -13,7 +13,7 @@ struct Generate: ParsableCommand {

    // MARK: - CommandConfiguration

-    static var configuration = CommandConfiguration(
+    static let configuration = CommandConfiguration(
        abstract: "A utility to generate ressources based on a configuration file",
        version: ResgenSwiftVersion
    )
--- a/Sources/ResgenSwift/Generate/Runnable/StringsConfiguration+Runnable.swift
+++ b/Sources/ResgenSwift/Generate/Runnable/StringsConfiguration+Runnable.swift
@@ -38,8 +38,8 @@ extension StringsConfiguration: Runnable {
            ("--extension-suffix", extensionSuffix),
            ("--visibility", visibility),
            ("--asset-bundle", assetBundle),
-            ("--xc-strings", staticMembers?.description),
-            ("--static-members", xcStrings?.description)
+            ("--xc-strings", xcStrings?.description),
+            ("--static-members", staticMembers?.description)
        ].forEach { argumentName, argumentValue in
            if let argumentValue {
                args += [
--- a/Sources/ResgenSwift/Images/Generator/XcassetsGenerator.swift
+++ b/Sources/ResgenSwift/Images/Generator/XcassetsGenerator.swift
@@ -186,8 +186,6 @@ class XcassetsGenerator {
                atomically: false,
                encoding: .utf8
            )
-
-            print("\(parsedImage.name) -> Generated")
        }

        // Success info
--- a/Sources/ResgenSwift/Images/Images.swift
+++ b/Sources/ResgenSwift/Images/Images.swift
@@ -13,7 +13,7 @@ struct Images: ParsableCommand {

    // MARK: - CommandConfiguration

-    static var configuration = CommandConfiguration(
+    static let configuration = CommandConfiguration(
        abstract: "A utility for generate images and an extension to access them easily.",
        version: ResgenSwiftVersion
    )
--- a/Sources/ResgenSwift/Strings/Generator/StringsFileGenerator.swift
+++ b/Sources/ResgenSwift/Strings/Generator/StringsFileGenerator.swift
@@ -175,22 +175,23 @@ enum StringsFileGenerator {
            guard section.hasOneOrMoreMatchingTags(tags: inputTags) else {
                return // Go to next section
            }
+            print("DOUDOU")
+            section
+                .definitions
+                .forEach { definition in // swiftlint:disable:this closure_body_length
+                    var skipDefinition = false
+                    var isNoTranslation = false

-            section.definitions.forEach { definition in // swiftlint:disable:this closure_body_length
-                var skipDefinition = false
-                var isNoTranslation = false
+                    var localizationTab: [XCStringLocalization] = []

-                var localizationTab: [XCStringLocalization] = []
+                    guard definition.hasOneOrMoreMatchingTags(inputTags: inputTags) else {
+                        return
+                    }

-                if definition.hasOneOrMoreMatchingTags(inputTags: inputTags) == false {
-                    skipDefinition = true
-                }
+                    if definition.tags.contains(Stringium.noTranslationTag) {
+                        isNoTranslation = true
+                    }

-                if definition.tags.contains(Stringium.noTranslationTag) {
-                    isNoTranslation = true
-                }
-
-                if !skipDefinition {
                    if isNoTranslation {
                        // Search for langs in yaml
                        for lang in langs {
@@ -209,7 +210,9 @@ enum StringsFileGenerator {
                        }
                    } else {
                        // Search for langs in twine
-                        for (lang, value) in definition.translations where !value.isEmpty {
+                        for (lang, value) in definition.translations
+                        where langs.contains(lang) && !value.isEmpty {
+                            print("DOUDOU-> generate for \(lang)")
                            let localization = XCStringLocalization(
                                lang: lang,
                                content: XCStringLocalizationLangContent(
@@ -219,7 +222,6 @@ enum StringsFileGenerator {
                                    )
                                )
                            )
-                            print("VALUE: \(value)")
                            localizationTab.append(localization)
                        }
                    }
@@ -237,7 +239,6 @@ enum StringsFileGenerator {

                    xcStringDefinitionTab.append(xcStringDefinition)
                }
-            }
        }

        let xcStringContainer = XCStringDefinitionContainer(strings: xcStringDefinitionTab)
--- a/Sources/ResgenSwift/Strings/Stringium/Stringium.swift
+++ b/Sources/ResgenSwift/Strings/Stringium/Stringium.swift
@@ -13,7 +13,7 @@ struct Stringium: ParsableCommand {

    // MARK: - Command Configuration

-    static var configuration = CommandConfiguration(
+    static let configuration = CommandConfiguration(
        abstract: "Generate strings with custom scripts.",
        version: ResgenSwiftVersion
    )
--- a/Sources/ResgenSwift/Strings/Strings.swift
+++ b/Sources/ResgenSwift/Strings/Strings.swift
@@ -11,7 +11,7 @@ import ToolCore

 struct Strings: ParsableCommand {

-    static var configuration = CommandConfiguration(
+    static let configuration = CommandConfiguration(
        abstract: "A utility for generate strings.",
        version: ResgenSwiftVersion,

--- a/Sources/ResgenSwift/Strings/Tag/Tags.swift
+++ b/Sources/ResgenSwift/Strings/Tag/Tags.swift
@@ -13,7 +13,7 @@ struct Tags: ParsableCommand {

    // MARK: - Command Configuration

-    static var configuration = CommandConfiguration(
+    static let configuration = CommandConfiguration(
        abstract: "Generate tags extension file.",
        version: ResgenSwiftVersion
    )
--- a/Sources/ResgenSwift/Strings/Twine/Twine.swift
+++ b/Sources/ResgenSwift/Strings/Twine/Twine.swift
@@ -13,7 +13,7 @@ struct Twine: ParsableCommand {

    // MARK: - Command Configuration

-    static var configuration = CommandConfiguration(
+    static let configuration = CommandConfiguration(
        abstract: "Generate strings with twine.",
        version: ResgenSwiftVersion
    )
--- a/Sources/ResgenSwift/main.swift
+++ b/Sources/ResgenSwift/main.swift
@@ -11,7 +11,7 @@ import ToolCore

 struct ResgenSwift: ParsableCommand {

-    static var configuration = CommandConfiguration(
+    static let configuration = CommandConfiguration(
        abstract: "A utility for generate ressources.",
        version: ResgenSwiftVersion,

--- a/Tests/ResgenSwiftTests/Analytics/AnalyticsGeneratorTests.swift
+++ b/Tests/ResgenSwiftTests/Analytics/AnalyticsGeneratorTests.swift
@@ -101,7 +101,7 @@ final class AnalyticsGeneratorTests: XCTestCase {
                category: String,
                params: [String: Any]?
            ) {
-                var parameters: [String:NSObject] = [
+                var parameters: [String: NSObject] = [
                    AnalyticsParameterItemName: name.replacingOccurrences(of: " ", with: "_") as NSObject
                ]
Author	SHA1	Message	Date
Thibaut Schmitt	f1ca8e92b7	Remove unwanted lang translation when generated xcStrings catalog All checks were successful openium/resgen.swift/pipeline/head This commit looks good Details	2025-09-30 16:08:45 +02:00
Jean-Charles Neboit	436bc4b2af	Fix Makefile INSTALL_DIR & man page All checks were successful gitea-openium/resgen.swift/pipeline/pr-master This commit looks good Details gitea-openium/resgen.swift/pipeline/head This commit looks good Details	2025-09-11 14:28:21 +02:00
Thibaut Schmitt	e0e561ff7f	Update SwiftLint and fix some Swift 6 issues All checks were successful gitea-openium/resgen.swift/pipeline/head This commit looks good Details	2025-09-10 16:51:23 +02:00
Quentin Bandera	ed4e9849e7	fix(RES-71): Checkstyle resgen analytics (#20 ) All checks were successful gitea-openium/resgen.swift/pipeline/head This commit looks good Details Reviewed-on: #20 Reviewed-by: Thibaut Schmitt <t.schmitt@openium.fr> Co-authored-by: Quentin Bandera <q.bandera@openium.fr> Co-committed-by: Quentin Bandera <q.bandera@openium.fr>	2025-08-26 08:51:33 +02:00
Thibaut Schmitt	ddf1d2509f	Fix d'une inversion de property dans la génération des strings All checks were successful gitea-openium/resgen.swift/pipeline/head This commit looks good Details	2025-08-26 08:50:45 +02:00