From: Magnus Hagander <magnus@hagander.net>
Date: Fri, 19 Oct 2018 15:50:58 +0000 (+0200)
Subject: When reparsing, show both header and body changes
X-Git-Url: http://git.postgresql.org/gitweb/edit?a=commitdiff_plain;h=b99c61419fc7cd7aa3a3dfce5d7f492136b9d9b2;p=pgarchives.git

When reparsing, show both header and body changes

Previously, only the body changes would show up in the diff, but we'd
actually make updates on the headers as well.
---

diff --git a/loader/lib/storage.py b/loader/lib/storage.py
index 4eaf33d..b2bc703 100644
--- a/loader/lib/storage.py
+++ b/loader/lib/storage.py
@@ -246,7 +246,7 @@ class ArchivesParserStorage(ArchivesParser):
 			'msgid': self.msgid,
 			})
 		try:
-			id, _from, _to, cc, subject, date, has_attachment, bodytxt = curs.fetchone()
+			id, _from, to, cc, subject, date, has_attachment, bodytxt = curs.fetchone()
 		except TypeError, e:
 			f.write("---- %s ----\n" % self.msgid)
 			f.write("Could not re-find in archives (old id was %s): %s\n" % (oldid, e))
@@ -254,8 +254,23 @@ class ArchivesParserStorage(ArchivesParser):
 			return
 
 
+		_from = _from.decode('utf8')
+		to = to.decode('utf8')
+		cc = cc.decode('utf8')
+		subject = subject.decode('utf8')
+		if (_from, to, cc, subject) != (self._from, self.to, self.cc, self.subject):
+			log.status("Message %s has header changes " % self.msgid)
+			f.write("==== %s ====\n" % self.msgid)
+			for fn in ['_from', 'to', 'cc', 'subject']:
+				if getattr(self, fn) != eval(fn):
+					d = u"- {0}: {1}\n".format(fn, eval(fn))
+					s = u"+ {0}: {1}\n".format(fn, getattr(self, fn))
+					f.write(s)
+					f.write(d)
+			f.write("\n\n")
+
 		if bodytxt.decode('utf8') != self.bodytxt:
-			log.status("Message %s has changes " % self.msgid)
+			log.status("Message %s has body changes " % self.msgid)
 			tempdiff = list(difflib.unified_diff(bodytxt.decode('utf8').splitlines(),
 												 self.bodytxt.splitlines(),
 												 fromfile='old',