Fix use of undefined original_from

feedbackloop/parse.py

@@ -117,7 +117,13 @@ class MailScanner():
     def scan(self, unseen, limit=None):
         for uid, raw_msg in self._scan_mailbox(unseen, limit):
             try:
+                entry = self._parse_message(raw_msg)
+                self._to_delete.append(uid)
+                yield entry
+            except Exception as e:
+                print(f'error: {e}')
 
+    def _parse_message(self, raw_msg):
         # Parse the ARF message body.
         msg = ARFMessage(raw_msg)
         report_sender, _ = _normalize_addr(
@@ -137,6 +143,7 @@ class MailScanner():
         hdrs = msg.get_original_message_headers()
         is_list = False
         timestamp = datetime.now()
+        original_from = None
 
         if hdrs:
             original_from = _hdr(hdrs, 'From')
@@ -167,28 +174,20 @@ class MailScanner():
                     is_list = True
 
         if not original_from:
-                    print('unable to extract original sender')
-                    continue
+            raise Exception('unable to extract original sender')
 
         original_from, maybe_list = _normalize_addr(original_from)
         if maybe_list and not is_list:
             is_list = maybe_list
 
-                entry = FeedbackEntry(
+        print(f'original from: {original_from}, list={is_list}')
+        return FeedbackEntry(
             sender=original_from,
             reporter=report_sender,
             is_list=is_list,
             timestamp=timestamp,
+            message=raw_msg,
         )
-                if not is_list:
-                    entry.message = raw_msg
-                print(f'original from: {original_from}, list={is_list}')
-                yield entry
-                self._to_delete.append(uid)
-
-            except Exception as e:
-                print(f'error: {e}')
-                #print(raw_msg)
 
     
 def main():