Refactor match_patterns function in main.py

hitblast · Dec 29, 2023 · 5946d32 · 5946d32
1 parent e117b74
commit 5946d32
Showing 1 changed file with 17 additions and 22 deletions.
diff --git a/avro/main.py b/avro/main.py
@@ -175,28 +175,23 @@ def match_patterns(
     rule_type = NON_RULE_PATTERNS if not rule else RULE_PATTERNS
     pattern = exact_find_in_pattern(fixed_text, reversed, cur, rule_type)
 
-    if len(pattern) > 0:
-        if not rule:
-            return {
-                'matched': True,
-                'found': pattern[0].get('find', None),
-                'replaced': pattern[0].get('replace', None),
-                'reversed': reverse_with_rules(cur, fixed_text, pattern[0].get('reverse', None)),
-            }
-        else:
-            return {
-                'matched': True,
-                'found': pattern[0]['find'],
-                'replaced': pattern[0]['replace'],
-                'rules': pattern[0]['rules'],
-            }
-    else:
-        result = {'matched': False, 'found': None, 'replaced': fixed_text[cur]}
-
-        if rule:
-            result['rules'] = None
-
-        return result
+    if pattern:
+        p = pattern[0]
+
+        return {
+            'matched': True,
+            'found': p.get('find'),
+            'replaced': p.get('replace'),
+            'reversed': reverse_with_rules(cur, fixed_text, p.get('reverse')) if not rule else None,
+            'rules': p.get('rules') if rule else None,
+        }
+
+    return {
+        'matched': False,
+        'found': None,
+        'replaced': fixed_text[cur],
+        'rules': None if rule else None,
+    }
 
 
 def exact_find_in_pattern(