1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
use crate::error::PuzError;
use byteorder::{ByteOrder, LittleEndian};
use std::io::{BufReader, Read};
pub(crate) fn validate_file_magic<R: Read>(reader: &mut BufReader<R>) -> Result<(), PuzError> {
// .puz file format starts with:
// See: https://github.com/mwln/puz.rs/blob/main/PUZ.md
//
// Offset | Size | Description
// -------|------|-------------
// 0x00 | 2 | Overall file checksum
// 0x02 | 12 | Magic string "ACROSS&DOWN\0"
// Skip the 2-byte overall file checksum
skip_bytes(reader, 2)?;
// Read and validate the 12-byte magic string
let mut magic = [0u8; 12];
reader.read_exact(&mut magic)?;
let expected_magic = b"ACROSS&DOWN\0";
if magic != *expected_magic {
return Err(PuzError::InvalidMagic {
found: magic.to_vec(),
});
}
Ok(())
}
pub(crate) fn skip_bytes<R: Read>(reader: &mut BufReader<R>, count: usize) -> Result<(), PuzError> {
let mut buffer = vec![0u8; count];
reader.read_exact(&mut buffer)?;
Ok(())
}
pub(crate) fn read_u8<R: Read>(reader: &mut BufReader<R>) -> Result<u8, PuzError> {
let mut buffer = [0u8; 1];
reader.read_exact(&mut buffer)?;
Ok(buffer[0])
}
pub(crate) fn read_u16<R: Read>(reader: &mut BufReader<R>) -> Result<u16, PuzError> {
let mut buffer = [0u8; 2];
reader.read_exact(&mut buffer)?;
Ok(LittleEndian::read_u16(&buffer))
}
pub(crate) fn read_bytes<R: Read>(
reader: &mut BufReader<R>,
count: usize,
) -> Result<Vec<u8>, PuzError> {
let mut buffer = vec![0u8; count];
reader.read_exact(&mut buffer)?;
Ok(buffer)
}
pub(crate) fn read_string_until_nul<R: Read>(
reader: &mut BufReader<R>,
) -> Result<String, PuzError> {
let mut bytes = Vec::new();
loop {
let mut byte = [0u8; 1];
reader.read_exact(&mut byte)?;
if byte[0] == 0 {
break;
}
bytes.push(byte[0]);
}
decode_puz_string(&bytes)
}
pub(crate) fn decode_puz_string(bytes: &[u8]) -> Result<String, PuzError> {
if let Ok(s) = std::str::from_utf8(bytes) {
return Ok(s.to_string());
}
Ok(bytes.iter().map(|&b| windows_1252_to_char(b)).collect())
}
fn windows_1252_to_char(byte: u8) -> char {
// Windows-1252 character mapping for bytes 128-159 that differ from ISO-8859-1
// Legacy .puz files often use Windows-1252 encoding for special characters
match byte {
// Standard ASCII range (0-127) maps directly
0..=127 => byte as char,
// Windows-1252 specific mappings for 128-159 range
128 => '€', // Euro sign
129 => '\u{0081}', // Unused
130 => '‚', // Single low-9 quotation mark
131 => 'ƒ', // Latin small letter f with hook
132 => '„', // Double low-9 quotation mark
133 => '…', // Horizontal ellipsis
134 => '†', // Dagger
135 => '‡', // Double dagger
136 => 'ˆ', // Modifier letter circumflex accent
137 => '‰', // Per mille sign
138 => 'Š', // Latin capital letter S with caron
139 => '‹', // Single left-pointing angle quotation mark
140 => 'Œ', // Latin capital ligature OE
141 => '\u{008D}', // Unused
142 => 'Ž', // Latin capital letter Z with caron
143 => '\u{008F}', // Unused
144 => '\u{0090}', // Unused
145 => '\u{2018}', // Left single quotation mark
146 => '\u{2019}', // Right single quotation mark
147 => '\u{201C}', // Left double quotation mark
148 => '\u{201D}', // Right double quotation mark
149 => '•', // Bullet
150 => '–', // En dash
151 => '—', // Em dash
152 => '˜', // Small tilde
153 => '™', // Trade mark sign
154 => 'š', // Latin small letter s with caron
155 => '›', // Single right-pointing angle quotation mark
156 => 'œ', // Latin small ligature oe
157 => '\u{009D}', // Unused
158 => 'ž', // Latin small letter z with caron
159 => 'Ÿ', // Latin capital letter Y with diaeresis
// ISO-8859-1 range (160-255) is identical to Windows-1252
160..=255 => byte as char,
}
}
pub(crate) fn read_remaining_data<R: Read>(reader: &mut BufReader<R>) -> Result<Vec<u8>, PuzError> {
let mut data = Vec::new();
reader.read_to_end(&mut data)?;
Ok(data)
}
pub(crate) fn find_section(data: &[u8], section_name: &str) -> Result<Option<Vec<u8>>, PuzError> {
// Extension sections format (after main puzzle data):
// See: https://github.com/mwln/puz.rs/blob/main/PUZ.md
//
// Each section has the structure:
// - Section name (4 bytes, e.g. "GRBS", "RTBL", "GEXT")
// - Data length (2 bytes, little-endian)
// - Checksum (2 bytes)
// - Section data (variable length)
if let Some(index) = data
.windows(section_name.len())
.position(|window| window == section_name.as_bytes())
{
let length_start = index + section_name.len();
if length_start + 2 <= data.len() {
let data_length =
LittleEndian::read_u16(&data[length_start..length_start + 2]) as usize;
let data_start = length_start + 4; // skip length (2) + checksum (2)
let data_end = data_start + data_length;
if data_end <= data.len() {
return Ok(Some(data[data_start..data_end].to_vec()));
}
}
}
Ok(None)
}
#[cfg(test)]
mod tests {
use super::*;
use std::io::Cursor;
/// Test that validate_file_magic correctly validates the ACROSS&DOWN magic string
/// This test ensures the parser can identify valid .puz files and reject invalid ones
#[test]
fn test_validate_file_magic_valid() {
// Create a valid .puz file header with checksum (2 bytes) + magic (12 bytes)
let mut data = vec![0xAB, 0xCD]; // Dummy checksum
data.extend_from_slice(b"ACROSS&DOWN\0");
let mut reader = BufReader::new(Cursor::new(data));
assert!(validate_file_magic(&mut reader).is_ok());
}
/// Test that validate_file_magic rejects files with invalid magic strings
/// This prevents parsing non-.puz files that might cause undefined behavior
#[test]
fn test_validate_file_magic_invalid() {
// Create invalid magic string (exactly 12 bytes)
let mut data = vec![0xAB, 0xCD]; // Dummy checksum
data.extend_from_slice(b"INVALID_MGIC"); // 12 bytes exactly
let mut reader = BufReader::new(Cursor::new(data));
let result = validate_file_magic(&mut reader);
assert!(result.is_err());
if let Err(PuzError::InvalidMagic { found }) = result {
assert_eq!(found, b"INVALID_MGIC".to_vec());
} else {
panic!("Expected InvalidMagic error");
}
}
/// Test that validate_file_magic handles incomplete data gracefully
/// This ensures we don't panic on truncated files
#[test]
fn test_validate_file_magic_truncated() {
// Too short - only 5 bytes instead of required 14
let data = vec![0xAB, 0xCD, 0x41, 0x43, 0x52];
let mut reader = BufReader::new(Cursor::new(data));
let result = validate_file_magic(&mut reader);
assert!(result.is_err());
// Should get an IO error due to incomplete read
matches!(result.unwrap_err(), PuzError::IoError { .. });
}
/// Test skip_bytes function with various byte counts
/// This utility is used throughout the parser to skip over reserved/unused fields
#[test]
fn test_skip_bytes() {
let data = vec![1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
let mut reader = BufReader::new(Cursor::new(data));
// Skip first 3 bytes
assert!(skip_bytes(&mut reader, 3).is_ok());
// Next byte should be 4
assert_eq!(read_u8(&mut reader).unwrap(), 4);
// Skip 2 more bytes
assert!(skip_bytes(&mut reader, 2).is_ok());
// Next byte should be 7
assert_eq!(read_u8(&mut reader).unwrap(), 7);
}
/// Test skip_bytes with insufficient data
/// Ensures we handle truncated files gracefully
#[test]
fn test_skip_bytes_insufficient_data() {
let data = vec![1, 2, 3];
let mut reader = BufReader::new(Cursor::new(data));
// Try to skip more bytes than available
let result = skip_bytes(&mut reader, 5);
assert!(result.is_err());
matches!(result.unwrap_err(), PuzError::IoError { .. });
}
/// Test reading single bytes
/// Basic building block for binary parsing
#[test]
fn test_read_u8() {
let data = vec![42, 255, 0, 128];
let mut reader = BufReader::new(Cursor::new(data));
assert_eq!(read_u8(&mut reader).unwrap(), 42);
assert_eq!(read_u8(&mut reader).unwrap(), 255);
assert_eq!(read_u8(&mut reader).unwrap(), 0);
assert_eq!(read_u8(&mut reader).unwrap(), 128);
}
/// Test reading 16-bit little-endian values
/// Critical for parsing .puz file dimensions, clue counts, etc.
#[test]
fn test_read_u16_little_endian() {
// Little-endian: 0x1234 is stored as 0x34, 0x12
let data = vec![0x34, 0x12, 0xFF, 0x00, 0x00, 0x80];
let mut reader = BufReader::new(Cursor::new(data));
assert_eq!(read_u16(&mut reader).unwrap(), 0x1234);
assert_eq!(read_u16(&mut reader).unwrap(), 0x00FF);
assert_eq!(read_u16(&mut reader).unwrap(), 0x8000);
}
/// Test reading byte arrays of specified lengths
/// Used for reading grid data, version strings, etc.
#[test]
fn test_read_bytes() {
let data = vec![1, 2, 3, 4, 5, 6, 7, 8];
let mut reader = BufReader::new(Cursor::new(data));
let result = read_bytes(&mut reader, 3).unwrap();
assert_eq!(result, vec![1, 2, 3]);
let result = read_bytes(&mut reader, 2).unwrap();
assert_eq!(result, vec![4, 5]);
let result = read_bytes(&mut reader, 3).unwrap();
assert_eq!(result, vec![6, 7, 8]);
}
/// Test reading null-terminated strings
/// Standard format for .puz file strings (title, author, clues, etc.)
#[test]
fn test_read_string_until_nul() {
// "Hello" followed by null terminator, then more data
let data = vec![72, 101, 108, 108, 111, 0, 87, 111, 114, 108, 100, 0];
let mut reader = BufReader::new(Cursor::new(data));
let result = read_string_until_nul(&mut reader).unwrap();
assert_eq!(result, "Hello");
let result = read_string_until_nul(&mut reader).unwrap();
assert_eq!(result, "World");
}
/// Test reading null-terminated string with no terminator
/// Should handle malformed files gracefully
#[test]
fn test_read_string_until_nul_no_terminator() {
let data = vec![72, 101, 108, 108, 111]; // "Hello" with no null terminator
let mut reader = BufReader::new(Cursor::new(data));
let result = read_string_until_nul(&mut reader);
assert!(result.is_err());
matches!(result.unwrap_err(), PuzError::IoError { .. });
}
/// Test UTF-8 string decoding
/// Modern .puz files should use UTF-8 encoding
#[test]
fn test_decode_puz_string_utf8() {
let utf8_bytes = "Hello, 世界!".as_bytes();
let result = decode_puz_string(utf8_bytes).unwrap();
assert_eq!(result, "Hello, 世界!");
}
/// Test Windows-1252 fallback decoding
/// Legacy .puz files often use Windows-1252 for special characters
#[test]
fn test_decode_puz_string_windows_1252() {
// Bytes that are invalid UTF-8 but valid Windows-1252
let win1252_bytes = vec![
0x93, 0x48, 0x65, 0x6C, 0x6C, 0x6F, 0x94, // "Hello" with smart quotes
0x97, // em dash
0x85, // ellipsis
];
let result = decode_puz_string(&win1252_bytes).unwrap();
// Should contain Unicode equivalents of Windows-1252 characters
assert!(result.contains('\u{201C}')); // left double quote
assert!(result.contains('\u{201D}')); // right double quote
assert!(result.contains('—')); // em dash
assert!(result.contains('…')); // ellipsis
}
/// Test Windows-1252 character mapping edge cases
/// Ensures all special characters in 128-159 range are handled correctly
#[test]
fn test_windows_1252_special_chars() {
// Test key Windows-1252 characters that differ from ISO-8859-1
let test_cases = vec![
(128, '€'), // Euro sign
(130, '‚'), // Single low-9 quotation mark
(133, '…'), // Horizontal ellipsis
(145, '\u{2018}'), // Left single quotation mark
(146, '\u{2019}'), // Right single quotation mark
(147, '\u{201C}'), // Left double quotation mark
(148, '\u{201D}'), // Right double quotation mark
(150, '–'), // En dash
(151, '—'), // Em dash
(153, '™'), // Trade mark sign
];
for (byte_val, expected_char) in test_cases {
let result = windows_1252_to_char(byte_val);
assert_eq!(result, expected_char, "Failed for byte {byte_val}");
}
}
/// Test ASCII character pass-through
/// Standard ASCII characters should map directly
#[test]
fn test_windows_1252_ascii_passthrough() {
for byte_val in 0..=127 {
let result = windows_1252_to_char(byte_val);
assert_eq!(result, byte_val as char);
}
}
/// Test ISO-8859-1 range pass-through
/// Characters 160-255 should map directly to Unicode
#[test]
fn test_windows_1252_iso_8859_1_passthrough() {
for byte_val in 160..=255 {
let result = windows_1252_to_char(byte_val);
assert_eq!(result, byte_val as char);
}
}
/// Test finding sections in extension data
/// .puz files use named sections for rebus, circles, etc.
#[test]
fn test_find_section_exists() {
// Create mock extension data with GRBS section
let mut data = Vec::new();
data.extend_from_slice(b"GRBS"); // Section name
data.extend_from_slice(&[0x04, 0x00]); // Length: 4 bytes (little-endian)
data.extend_from_slice(&[0xAB, 0xCD]); // Checksum (dummy)
data.extend_from_slice(&[0x01, 0x02, 0x03, 0x04]); // Section data
let result = find_section(&data, "GRBS").unwrap();
assert!(result.is_some());
assert_eq!(result.unwrap(), vec![0x01, 0x02, 0x03, 0x04]);
}
/// Test finding non-existent sections
/// Should return None without error
#[test]
fn test_find_section_not_found() {
let data = b"SOME_OTHER_DATA".to_vec();
let result = find_section(&data, "GRBS").unwrap();
assert!(result.is_none());
}
/// Test finding section with insufficient data
/// Should handle malformed extension sections gracefully
#[test]
fn test_find_section_insufficient_data() {
// Section name exists but not enough data for length field
let data = b"GRBS\x04".to_vec(); // Missing length byte and all data
let result = find_section(&data, "GRBS").unwrap();
assert!(result.is_none());
}
/// Test finding section with truncated data
/// Length field indicates more data than available
#[test]
fn test_find_section_truncated_data() {
let mut data = Vec::new();
data.extend_from_slice(b"GRBS"); // Section name
data.extend_from_slice(&[0x10, 0x00]); // Length: 16 bytes
data.extend_from_slice(&[0xAB, 0xCD]); // Checksum
data.extend_from_slice(&[0x01, 0x02]); // Only 2 bytes instead of 16
let result = find_section(&data, "GRBS").unwrap();
assert!(result.is_none());
}
/// Test reading all remaining data from reader
/// Used for reading extension sections at end of file
#[test]
fn test_read_remaining_data() {
let data = vec![1, 2, 3, 4, 5, 6, 7, 8];
let mut reader = BufReader::new(Cursor::new(data.clone()));
// Read some data first
let _ = read_u8(&mut reader).unwrap();
let _ = read_u16(&mut reader).unwrap();
// Read remaining
let remaining = read_remaining_data(&mut reader).unwrap();
assert_eq!(remaining, vec![4, 5, 6, 7, 8]);
}
/// Test reading remaining data from empty reader
/// Should return empty vector, not error
#[test]
fn test_read_remaining_data_empty() {
let data = Vec::new();
let mut reader = BufReader::new(Cursor::new(data));
let remaining = read_remaining_data(&mut reader).unwrap();
assert!(remaining.is_empty());
}
}