You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ponymail.apache.org by hu...@apache.org on 2020/09/10 13:02:12 UTC

[incubator-ponymail-foal] 01/04: set in notes whether an email was live-archived or imported

This is an automated email from the ASF dual-hosted git repository.

humbedooh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git

commit 140eb562af9021b3ca9d2e49d0a6223ccf2412db
Author: Daniel Gruno <hu...@apache.org>
AuthorDate: Thu Sep 10 14:53:31 2020 +0200

    set in notes whether an email was live-archived or imported
---
 tools/archiver.py    | 1 +
 tools/import-mbox.py | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/tools/archiver.py b/tools/archiver.py
index b7328dd..93531eb 100755
--- a/tools/archiver.py
+++ b/tools/archiver.py
@@ -489,6 +489,7 @@ class Archiver(object):  # N.B. Also used by import-mbox.py
                 "body": body.unflow() if body else "",
                 "html_source_only": body and body.html_as_source or False,
                 "attachments": attachments,
+                "notes": ["ARCHIVE: Email archived at %u" % int(time.time())]
             }
 
         return output_json, contents, msg_metadata, irt
diff --git a/tools/import-mbox.py b/tools/import-mbox.py
index 7c22ba9..177ce00 100755
--- a/tools/import-mbox.py
+++ b/tools/import-mbox.py
@@ -310,6 +310,8 @@ class SlurpThread(Thread):
                                 json["message-id"] + " in " + filename
                             ]
 
+                    # Mark that we imported this email
+                    json["notes"] = ["IMPORT: Email imported at %u" % int(time.time())]
                     try:  # temporary hack to try and find an encoding issue
                         # needs to be replaced by proper exception handling
                         json_source = {