Changed the base module file to be more user friendly by providing the data as method arguments instead of less discoverable attributes.

starfields_logparser/base_parsers.py

@@ -9,34 +9,32 @@ class BaseOrderedLogParser:
     """
 
     def execute(self):
-        self.retrieve_status()
-        self.parser_init()
+        status = self.retrieve_status()
 
         context_manager = self.get_context_manager()
 
         with context_manager(*self.context_manager_args) as file:
-            self.aggregators_init(file)
+            aggregates = self.aggregators_init(file, status)
             line = file.readline()
             new_flag = False
 
             while (line):
                 # Only check for a new line if we're not at new entries yet
                 if not new_flag:
-                    new_flag = self.new_flag_condition(line)
+                    new_flag = self.new_flag_condition(line, status)
 
                 # Ignore old entries and only consider new ones
                 if new_flag:
-                    break_condition = self.parse_line(line)
+                    break_condition = self.parse_line(line, aggregates, status)
 
                     if not break_condition:
                         break
 
                 line = file.readline()
 
-            self.aggregators_deinit(file)
+            self.aggregators_deinit(file, aggregates, status)
 
-        self.update_status()
-        self.parser_deinit()
+        self.update_status(aggregates, status)
 
     def get_context_manager(self):
         """
@@ -46,27 +44,16 @@ class BaseOrderedLogParser:
         """
         return open
 
-    def parser_init(self):
+    def aggregators_deinit(self, file, aggregates, status):
         """
-        Extra hook that runs after the status has been retrieved but before
-        the parser starts going through the file
+        Hook that runs right before the context manager closes the file. It
+        comes with the aggregates and the status date so sometimes closing the
+        status of the parser here makes more sense.
         """
         pass
 
-    def aggregators_deinit(self, file):
+    def update_status(self, aggregates, status):
         """
-        Hook that runs right before the context manager closes the file.
-        """
-        pass
-
-    def update_status(self):
-        """
-        Updates the saved status of the parser
-        """
-        pass
-
-    def parser_deinit(self):
-        """
-        Extra hook that runs after the parser updated the saved status
+        Updates the saved status of the parser.
         """
         pass