fix: improve am/pm cleanup

gbassisp · May 21, 2024 · ca6c57e · ca6c57e
1 parent fa077a3
commit ca6c57e
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 2 deletions.
diff --git a/lib/src/param_cleanup_rules.dart b/lib/src/param_cleanup_rules.dart
@@ -160,9 +160,11 @@ final _exprs = [...idealTimePatterns]..removeLast();
 final _betterTimeComponent = CleanupRule((params) {
   String padLeft(String? original) => (original ?? '').padLeft(2, '0');
   String padRight(String? original) => (original ?? '').padRight(3, '0');
+  String cleanAmpm(String? original) =>
+      original?.replaceAll(RegExp(r'(\.|-)'), '').toLowerCase() ?? '';
 
   for (final e in _exprs) {
-    const ampm = r'\s*(?<ampm>(a|p)\.?m\.?\W)?';
+    const ampm = r'\s*(?<ampm>(a|p)(\.|-)?m(\.|-)?\W)?';
     final re = RegExp(e + ampm, caseSensitive: false);
     final s = '${params.formattedString} ';
     final matches = re.allMatches(s);
@@ -174,7 +176,7 @@ final _betterTimeComponent = CleanupRule((params) {
           '${padLeft(m.tryNamedGroup('second'))}'
           '${m.tryNamedGroup('microsecond') != null ? '.'
               '${padRight(m.tryNamedGroup('microsecond'))}' : ''} '
-          '${m.tryNamedGroup('ampm') ?? ''}';
+          '${cleanAmpm(m.tryNamedGroup('ampm'))}';
       final newString = s.replaceAllMapped(re, (_) => '') + newTime;
 
       params

diff --git a/test/nonsense_formats_test.dart b/test/nonsense_formats_test.dart
@@ -113,5 +113,45 @@ void main() {
 
       expect(parser.tryParse(formatted), equals(expected));
     });
+    for (final am in [
+      'am',
+      'AM',
+      'a.m.',
+      'a.m',
+      'A.M',
+      ' am',
+      ' AM',
+      ' a.m.',
+      ' a.m',
+      ' A.M',
+    ]) {
+      test('git default nonsense 3 - "$am"', () {
+        final formatted = 'Thu, May 16 10:18:07$am 2024 -0930';
+        final expected =
+            DateTime.utc(2024, 5, 16, 10, 18, 7).copyWithOffset('-0930');
+
+        expect(parser.tryParse(formatted), equals(expected));
+      });
+    }
+    for (final pm in [
+      'pm',
+      'PM',
+      'p.m.',
+      'p.m',
+      'P.M',
+      ' pm',
+      ' PM',
+      ' p.m.',
+      ' p.m',
+      ' P.M',
+    ]) {
+      test('git default nonsense 4 - "$pm"', () {
+        final formatted = 'Thu, May 16 10:18:07$pm 2024 -0930';
+        final expected =
+            DateTime.utc(2024, 5, 16, 22, 18, 7).copyWithOffset('-0930');
+
+        expect(parser.tryParse(formatted), equals(expected));
+      });
+    }
   });
 }