🐛 Fix bug in mail log parsing

froide/foirequest/migrations/0061_foimessage_foirequest__email_m_304d80_idx.py

@@ -0,0 +1,19 @@
+# Generated by Django 4.0.8 on 2022-12-19 13:40
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("foirequest", "0060_foirequest_banner"),
+    ]
+
+    operations = [
+        migrations.AddIndex(
+            model_name="foimessage",
+            index=models.Index(
+                fields=["email_message_id"], name="foirequest__email_m_304d80_idx"
+            ),
+        ),
+    ]

froide/foirequest/models/message.py

@@ -168,6 +168,8 @@ class Meta:
         verbose_name = _("Freedom of Information Message")
         verbose_name_plural = _("Freedom of Information Messages")
 
+        indexes = [models.Index(fields=["email_message_id"])]
+
     def __str__(self):
         return _("Message in '%(request)s' at %(time)s") % {
             "request": self.request,

froide/helper/email_log_parsing.py

@@ -166,11 +166,11 @@ def iteration_done(self):
         if not self._msg_log:
             self.logfile_reader.update_offset_file()
         else:
-            first_logoffset = sorted(x["offset"] for x in self._msg_log.values())[0]
+            first_logoffset = min(x["offset"] for x in self._msg_log.values())
             self.logfile_reader.write_offset_to_file(first_logoffset)
 
     def __next__(self):
-        for line, offset in self.logfile_reader.with_offsets():
+        for line, offset in self.logfile_reader.with_offsets(offset_position="pre"):
             parsed_line = self._parse_line(line)
             if parsed_line is None:
                 continue

froide/helper/management/commands/parse_mail_log.py

@@ -9,8 +9,9 @@ class Command(BaseCommand):
     help = "Processes mail logs for deliveries"
 
     def add_arguments(self, parser):
-        parser.add_argument("log_path", default=None)
+        parser.add_argument("log_path")
+        parser.add_argument("offset_path")
 
     def handle(self, *args, **options):
         translation.activate(settings.LANGUAGE_CODE)
-        check_delivery_from_log(options["log_path"])
+        check_delivery_from_log(str(options["log_path"]), str(options["offset_path"]))