BlueGit

timfa posprint

Fix raster Code128 for mixed-case barcode data.

barcoders requires a charset prefix; Start A rejects lowercase so values
like Testcode failed. Auto-pick Start B when the payload has lowercase.

Co-authored-by: Cursor <cursoragent@cursor.com>

timfa Tim Falken · pushed by timfa

Authored 2026-07-15 · 4 months ago

Hash
7b9b44e01da365ece57e9ea1d07ea903a9e5164b
Parent
704324ca
2 files changed +44 −4
src/pipeline.rs +9 −0
@@ -90,6 +90,15 @@ mod tests {
90 90 assert_eq!(missing_parameters(&doc, &params), vec!["B".to_string()]);
91 91 }
92 92
93 #[test]
94 fn encodes_raster_code128_with_substituted_data() {
95 let file = PosFile::new("Testing\n@barcode RASTER CODE128 ${Data}\n\nLast line\n");
96 let mut params = HashMap::new();
97 params.insert("Data".into(), "Testcode".into());
98 let bytes = encode_pos_file(&file, None, &params).unwrap();
99 assert!(bytes.windows(4).any(|w| w == [0x1D, b'v', 0, 0]));
100 }
101
93 102 #[test]
94 103 fn encodes_when_all_params_present() {
95 104 let file = PosFile::new("Hi ${Name}");
@@ -90,6 +90,15 @@ mod tests {
90 assert_eq!(missing_parameters(&doc, &params), vec!["B".to_string()]);
90 assert_eq!(missing_parameters(&doc, &params), vec!["B".to_string()]);
91 }
91 }
92
92
93 #[test]
94 fn encodes_raster_code128_with_substituted_data() {
95 let file = PosFile::new("Testing\n@barcode RASTER CODE128 ${Data}\n\nLast line\n");
96 let mut params = HashMap::new();
97 params.insert("Data".into(), "Testcode".into());
98 let bytes = encode_pos_file(&file, None, &params).unwrap();
99 assert!(bytes.windows(4).any(|w| w == [0x1D, b'v', 0, 0]));
100 }
101
93 #[test]
102 #[test]
94 fn encodes_when_all_params_present() {
103 fn encodes_when_all_params_present() {
95 let file = PosFile::new("Hi ${Name}");
104 let file = PosFile::new("Hi ${Name}");
src/raster.rs +35 −4
@@ -34,9 +34,14 @@ pub fn render_barcode(
34 34 use barcoders::sym::ean8::EAN8;
35 35 use barcoders::sym::tf::TF;
36 36
37 let data = data.trim();
38 if data.is_empty() {
39 return Err(RasterError::Encode("Barcode data is empty".into()));
40 }
41
37 42 let encoded = match symbology {
38 43 BarcodeSymbology::Code128 => {
39 Code128::new(format!("\u{00C0}{data}"))
44 Code128::new(code128_barcoders_input(data))
40 45 .map_err(|e| RasterError::Encode(e.to_string()))?
41 46 .encode()
42 47 }
@@ -79,6 +84,19 @@ pub fn render_barcode(
79 84 Ok(img.to_luma8())
80 85 }
81 86
87 /// Prefix payload for `barcoders` Code128.
88 ///
89 /// The crate requires a leading charset marker. Set A (`\u{00C0}`) only supports
90 /// uppercase letters; mixed-case and typical URLs need set B (`\u{0181}`).
91 fn code128_barcoders_input(data: &str) -> String {
92 let start = if data.chars().any(|c| c.is_ascii_lowercase()) {
93 '\u{0181}' // Start B — upper + lower case
94 } else {
95 '\u{00C0}' // Start A — uppercase, digits, symbols
96 };
97 format!("{start}{data}")
98 }
99
82 100 pub fn render_qr(
83 101 data: &str,
84 102 version: Option<u8>,
@@ -135,9 +153,22 @@ mod tests {
135 153 }
136 154
137 155 #[test]
138 fn code128_rejects_url_like_data() {
139 let err = render_barcode(BarcodeSymbology::Code128, "https://example.com", 60).unwrap_err();
140 assert!(err.to_string().contains("invalid"));
156 fn renders_code128_mixed_case() {
157 let img = render_barcode(BarcodeSymbology::Code128, "Testcode", 60).unwrap();
158 assert!(img.width() > 10);
159 assert_eq!(img.height(), 60);
160 }
161
162 #[test]
163 fn code128_accepts_url_like_data() {
164 let img = render_barcode(BarcodeSymbology::Code128, "https://example.com", 60).unwrap();
165 assert!(img.width() > 10);
166 }
167
168 #[test]
169 fn code128_rejects_empty_data() {
170 let err = render_barcode(BarcodeSymbology::Code128, " ", 60).unwrap_err();
171 assert!(err.to_string().contains("empty"));
141 172 }
142 173
143 174 #[test]
@@ -34,9 +34,14 @@ pub fn render_barcode(
34 use barcoders::sym::ean8::EAN8;
34 use barcoders::sym::ean8::EAN8;
35 use barcoders::sym::tf::TF;
35 use barcoders::sym::tf::TF;
36
36
37 let data = data.trim();
38 if data.is_empty() {
39 return Err(RasterError::Encode("Barcode data is empty".into()));
40 }
41
37 let encoded = match symbology {
42 let encoded = match symbology {
38 BarcodeSymbology::Code128 => {
43 BarcodeSymbology::Code128 => {
39 Code128::new(format!("\u{00C0}{data}"))
44 Code128::new(code128_barcoders_input(data))
40 .map_err(|e| RasterError::Encode(e.to_string()))?
45 .map_err(|e| RasterError::Encode(e.to_string()))?
41 .encode()
46 .encode()
42 }
47 }
@@ -79,6 +84,19 @@ pub fn render_barcode(
79 Ok(img.to_luma8())
84 Ok(img.to_luma8())
80}
85}
81
86
87/// Prefix payload for `barcoders` Code128.
88///
89/// The crate requires a leading charset marker. Set A (`\u{00C0}`) only supports
90/// uppercase letters; mixed-case and typical URLs need set B (`\u{0181}`).
91fn code128_barcoders_input(data: &str) -> String {
92 let start = if data.chars().any(|c| c.is_ascii_lowercase()) {
93 '\u{0181}' // Start B — upper + lower case
94 } else {
95 '\u{00C0}' // Start A — uppercase, digits, symbols
96 };
97 format!("{start}{data}")
98}
99
82pub fn render_qr(
100pub fn render_qr(
83 data: &str,
101 data: &str,
84 version: Option<u8>,
102 version: Option<u8>,
@@ -135,9 +153,22 @@ mod tests {
135 }
153 }
136
154
137 #[test]
155 #[test]
138 fn code128_rejects_url_like_data() {
156 fn renders_code128_mixed_case() {
139 let err = render_barcode(BarcodeSymbology::Code128, "https://example.com", 60).unwrap_err();
157 let img = render_barcode(BarcodeSymbology::Code128, "Testcode", 60).unwrap();
140 assert!(err.to_string().contains("invalid"));
158 assert!(img.width() > 10);
159 assert_eq!(img.height(), 60);
160 }
161
162 #[test]
163 fn code128_accepts_url_like_data() {
164 let img = render_barcode(BarcodeSymbology::Code128, "https://example.com", 60).unwrap();
165 assert!(img.width() > 10);
166 }
167
168 #[test]
169 fn code128_rejects_empty_data() {
170 let err = render_barcode(BarcodeSymbology::Code128, " ", 60).unwrap_err();
171 assert!(err.to_string().contains("empty"));
141 }
172 }
142
173
143 #[test]
174 #[test]