parsers: lines: display "ignoring (...)" for all unrecognized lines

src/invoice2data/extract/parsers/lines.py

@@ -63,45 +63,43 @@ def parse_block(template, field, settings, content):
                 # This will allow last_line and line to be matched on below
                 first_line_found = True
                 continue
-        # If the first_line has not yet been found, do not look for line or last_line
-        # Just continue to the next line
-        if first_line_found is False:
-            continue
-        # If last_line was provided, check that
-        if "last_line" in settings:
-            # last_line pattern provided, so check if the current line is that line
-            match = parse_line(settings["last_line"], line)
+        # Look for line or last_line only if the first has has been found
+        if first_line_found is True:
+            # If last_line was provided, check that
+            if "last_line" in settings:
+                # last_line pattern provided, so check if the current line is that line
+                match = parse_line(settings["last_line"], line)
+                if match:
+                    # This is the last_line, so parse all lines thus far,
+                    # append to output,
+                    # and reset current_row
+                    current_row = parse_current_row(match, current_row)
+                    if current_row:
+                        lines.append(current_row)
+                    current_row = {}
+                    # Flip first_line_found boolean to look for first_line again on next loop
+                    first_line_found = False
+                    continue
+            # Next we see if this is a line that should be skipped
+            if "skip_line" in settings:
+                # If skip_line was provided, check for a match now
+                if isinstance(settings["skip_line"], list):
+                    # Accepts a list
+                    skip_line_results = [re.search(x, line) for x in settings["skip_line"]]
+                else:
+                    # Or a simple string
+                    skip_line_results = [re.search(settings["skip_line"], line)]
+                if any(skip_line_results):
+                    # There was at least one match to a skip_line
+                    logger.debug("skip_line match on *%s*", line)
+                    continue
+            # If none of those have continued the loop, check if this is just a normal line
+            match = parse_line(settings["line"], line)
             if match:
-                # This is the last_line, so parse all lines thus far,
-                # append to output,
-                # and reset current_row
+                # This is one of the lines between first_line and last_line
+                # Parse the data and add it to the current_row
                 current_row = parse_current_row(match, current_row)
-                if current_row:
-                    lines.append(current_row)
-                current_row = {}
-                # Flip first_line_found boolean to look for first_line again on next loop
-                first_line_found = False
                 continue
-        # Next we see if this is a line that should be skipped
-        if "skip_line" in settings:
-            # If skip_line was provided, check for a match now
-            if isinstance(settings["skip_line"], list):
-                # Accepts a list
-                skip_line_results = [re.search(x, line) for x in settings["skip_line"]]
-            else:
-                # Or a simple string
-                skip_line_results = [re.search(settings["skip_line"], line)]
-            if any(skip_line_results):
-                # There was at least one match to a skip_line
-                logger.debug("skip_line match on *%s*", line)
-                continue
-        # If none of those have continued the loop, check if this is just a normal line
-        match = parse_line(settings["line"], line)
-        if match:
-            # This is one of the lines between first_line and last_line
-            # Parse the data and add it to the current_row
-            current_row = parse_current_row(match, current_row)
-            continue
         # If the line doesn't match anything, log and continue to next line
         logger.debug("ignoring *%s* because it doesn't match anything", line)
     if current_row: