Add Android plurals CLI test and improve output

Added a test for Android plurals handling in the CLI. Improved the 'view' command output to explicitly print the translation type (Singular or Plural). Also updated dependencies to langcodec 0.4.1 and performed minor code style cleanups.

Author: WendellXY

langcodec-cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "langcodec-cli"
-version = "0.4.0"
+version = "0.4.1"
 edition = "2024"
 description = "A universal CLI tool for converting and inspecting localization files (Apple, Android, CSV, etc.)"
 license = "MIT"
@@ -12,7 +12,7 @@ categories = ["command-line-utilities", "internationalization", "localization"]
 documentation = "https://docs.rs/langcodec-cli"
 
 [dependencies]
-langcodec = "0.4.0"
+langcodec = "0.4.1"
 clap = { version = "4", features = ["derive"] }
 clap_complete = "4"
 unicode-width = "0.2.1"

langcodec-cli/src/convert.rs

@@ -2,7 +2,7 @@ use crate::formats::{self, parse_custom_format};
 use crate::transformers::custom_format_to_resource;
 use crate::validation::{self, validate_custom_format_file};
 
-use langcodec::{convert_auto, formats::FormatType, Codec};
+use langcodec::{Codec, convert_auto, formats::FormatType};
 use std::fs::File;
 use std::io::BufWriter;
 
@@ -125,8 +125,7 @@ pub fn run_unified_convert_command(input: String, output: String, options: Conve
                         }
 
                         // If exclude_lang is specified, exclude those languages
-                        if !options.exclude_lang.is_empty() && options.exclude_lang.contains(lang)
-                        {
+                        if !options.exclude_lang.is_empty() && options.exclude_lang.contains(lang) {
                             return false;
                         }
 
@@ -138,18 +137,19 @@ pub fn run_unified_convert_command(input: String, output: String, options: Conve
             },
         ) {
             Ok(()) => {
-                let filter_msg = if !options.include_lang.is_empty() || !options.exclude_lang.is_empty() {
-                    let mut parts = Vec::new();
-                    if !options.include_lang.is_empty() {
-                        parts.push(format!("including: {}", options.include_lang.join(", ")));
-                    }
-                    if !options.exclude_lang.is_empty() {
-                        parts.push(format!("excluding: {}", options.exclude_lang.join(", ")));
-                    }
-                    format!(" with language filtering ({})", parts.join(", "))
-                } else {
-                    String::new()
-                };
+                let filter_msg =
+                    if !options.include_lang.is_empty() || !options.exclude_lang.is_empty() {
+                        let mut parts = Vec::new();
+                        if !options.include_lang.is_empty() {
+                            parts.push(format!("including: {}", options.include_lang.join(", ")));
+                        }
+                        if !options.exclude_lang.is_empty() {
+                            parts.push(format!("excluding: {}", options.exclude_lang.join(", ")));
+                        }
+                        format!(" with language filtering ({})", parts.join(", "))
+                    } else {
+                        String::new()
+                    };
 
                 println!(
                     "✅ Successfully converted to .langcodec (Resource JSON array){}",
@@ -158,18 +158,19 @@ pub fn run_unified_convert_command(input: String, output: String, options: Conve
                 return;
             }
             Err(e) => {
-                let filter_msg = if !options.include_lang.is_empty() || !options.exclude_lang.is_empty() {
-                    let mut parts = Vec::new();
-                    if !options.include_lang.is_empty() {
-                        parts.push(format!("including: {}", options.include_lang.join(", ")));
-                    }
-                    if !options.exclude_lang.is_empty() {
-                        parts.push(format!("excluding: {}", options.exclude_lang.join(", ")));
-                    }
-                    format!(" with language filtering ({})", parts.join(", "))
-                } else {
-                    String::new()
-                };
+                let filter_msg =
+                    if !options.include_lang.is_empty() || !options.exclude_lang.is_empty() {
+                        let mut parts = Vec::new();
+                        if !options.include_lang.is_empty() {
+                            parts.push(format!("including: {}", options.include_lang.join(", ")));
+                        }
+                        if !options.exclude_lang.is_empty() {
+                            parts.push(format!("excluding: {}", options.exclude_lang.join(", ")));
+                        }
+                        format!(" with language filtering ({})", parts.join(", "))
+                    } else {
+                        String::new()
+                    };
 
                 println!("❌ Conversion to .langcodec failed{}", filter_msg);
                 eprintln!("Error: {}", e);
@@ -186,7 +187,10 @@ pub fn run_unified_convert_command(input: String, output: String, options: Conve
     }
 
     // Strategy 2: Try custom formats for JSON/YAML/langcodec files
-    if input.ends_with(".json") || input.ends_with(".yaml") || input.ends_with(".yml") || input.ends_with(".langcodec")
+    if input.ends_with(".json")
+        || input.ends_with(".yaml")
+        || input.ends_with(".yml")
+        || input.ends_with(".langcodec")
     {
         // For JSON files without explicit format, try standard format detection first
         if input.ends_with(".json") && options.input_format.is_none() {
@@ -557,4 +561,3 @@ pub fn read_resources_from_any_input(
         input
     ))
 }
-

langcodec-cli/src/merge.rs

@@ -98,10 +98,10 @@ pub fn run_merge_command(
             // Set version field in the resources to make sure xcstrings format would not throw an error
             let version = version_override.unwrap_or_else(|| {
                 codec
-                .resources
-                .first()
-                .and_then(|r| r.metadata.custom.get("version").cloned())
-                .unwrap_or_else(|| "1.0".to_string())
+                    .resources
+                    .first()
+                    .and_then(|r| r.metadata.custom.get("version").cloned())
+                    .unwrap_or_else(|| "1.0".to_string())
             });
 
             println!("Setting metadata.version to: {}", version);

langcodec-cli/src/view.rs

@@ -56,6 +56,7 @@ pub fn print_view(codec: &Codec, lang_filter: &Option<String>, full: bool) {
 
             match &entry.value {
                 langcodec::types::Translation::Singular(value) => {
+                    println!("    Type: Singular");
                     if full {
                         println!("    Value: {}", value);
                     } else {
@@ -68,6 +69,7 @@ pub fn print_view(codec: &Codec, lang_filter: &Option<String>, full: bool) {
                     }
                 }
                 langcodec::types::Translation::Plural(plural) => {
+                    println!("    Type: Plural");
                     println!("    Plural ID: {}", plural.id);
                     for (category, value) in &plural.forms {
                         if full {

langcodec-cli/tests/android_plurals_cli_tests.rs

@@ -0,0 +1,45 @@
+use std::fs;
+use std::process::Command;
+use tempfile::TempDir;
+
+#[test]
+fn test_cli_view_android_plurals() {
+    let temp_dir = TempDir::new().unwrap();
+    let input_file = temp_dir.path().join("strings.xml");
+
+    let xml = r#"
+        <resources>
+            <plurals name="apples" translatable="true">
+                <item quantity="one">One apple</item>
+                <item quantity="other">%d apples</item>
+            </plurals>
+        </resources>
+    "#;
+    fs::write(&input_file, xml).unwrap();
+
+    let output = Command::new("cargo")
+        .args([
+            "run",
+            "--quiet",
+            "--",
+            "view",
+            "-i",
+            input_file.to_str().unwrap(),
+            "--full",
+        ])
+        .output()
+        .unwrap();
+
+    assert!(
+        output.status.success(),
+        "CLI failed: {}",
+        String::from_utf8_lossy(&output.stderr)
+    );
+
+    let stdout = String::from_utf8_lossy(&output.stdout);
+    // Check plural structure is printed
+    assert!(stdout.contains("Type: Plural"));
+    assert!(stdout.contains("Plural ID: apples"));
+    assert!(stdout.contains("One apple") || stdout.contains("one"));
+    assert!(stdout.contains("%d apples") || stdout.contains("other"));
+}