From cd432b80328ea20597c3cdabc24305c2862594d6 Mon Sep 17 00:00:00 2001
From: Kris Markel <kris@Jos-iMac-SL.local>
Date: Mon, 1 Feb 2010 00:13:30 -0800
Subject: [PATCH] Add initial support for send and recieved dates.

---
 bin/imapPull.py                      |  78 ++++++++++++++-
 letterbox/source/LBMessage.h         |   2 +
 letterbox/source/LBMessage.m         |   4 +
 letterbox/source/LBServer.m          |   4 +
 resources/English.lproj/MailView.xib | 139 +++++++++++++++++++++------
 5 files changed, 194 insertions(+), 33 deletions(-)

diff --git a/bin/imapPull.py b/bin/imapPull.py
index 0fca3de..8198bee 100755
--- a/bin/imapPull.py
+++ b/bin/imapPull.py
@@ -9,6 +9,53 @@
 import email
 import uuid
 from sqlite3 import dbapi2 as sqlite
+from dateutil.parser import *
+
+# From the python docs for determining the local time zone. http://docs.python.org/library/datetime.html#datetime-objects
+
+# A class capturing the platform's idea of local time.
+from datetime import tzinfo, timedelta, datetime
+
+ZERO = timedelta(0)
+
+import time as _time
+
+STDOFFSET = timedelta(seconds = -_time.timezone)
+if _time.daylight:
+    DSTOFFSET = timedelta(seconds = -_time.altzone)
+else:
+    DSTOFFSET = STDOFFSET
+
+DSTDIFF = DSTOFFSET - STDOFFSET
+
+class LocalTimezone(tzinfo):
+
+    def utcoffset(self, dt):
+        if self._isdst(dt):
+            return DSTOFFSET
+        else:
+            return STDOFFSET
+
+    def dst(self, dt):
+        if self._isdst(dt):
+            return DSTDIFF
+        else:
+            return ZERO
+
+    def tzname(self, dt):
+        return _time.tzname[self._isdst(dt)]
+
+    def _isdst(self, dt):
+        tt = (dt.year, dt.month, dt.day,
+              dt.hour, dt.minute, dt.second,
+              dt.weekday(), 0, -1)
+        stamp = _time.mktime(tt)
+        tt = _time.localtime(stamp)
+        return tt.tm_isdst > 0
+
+Local = LocalTimezone()
+
+# End of python doc code.
 
 uname = sys.argv[1]
 server = sys.argv[3]
@@ -56,6 +103,7 @@
 mailboxes.sort(key=str.lower)
 
 for mbox in mailboxes:
+    msg = None
     try:
         dbcursor.execute("insert into folder (folder, subscribed) values (?,?)", (mbox, '1'))
         dbcursor.execute("delete from message where folder = ?", (mbox,))
@@ -82,15 +130,37 @@
             f.close()
             
             print(path)
+            send = parse(msg.get("date"), fuzzy=True)
+            send = send.astimezone(Local)
+            # Apparently this loses fractional seconds. I'm pretty sure we don't care.
+            sendsinceepoch = time.mktime(send.timetuple())
             
-            dbcursor.execute("insert into message (uuid, messageid, folder, subject, fromAddress, toAddress, receivedDate, sendDate) values (?,?,?,?,?,?,?,?)",
-                             (uid, msg.get("Message-Id"), mbox, msg.get("Subject"), msg.get("From"), msg.get("To"), 0, 0))
+            receivedsinceepoch = 0
+            if msg.has_key("Received"):
+                # Multiple received headers is crazy common.
+                receivedheaders = msg.get_all("Received")
+                for receivedheader in receivedheaders:
+                    # The bit after the ";" is the date-time stamp.
+                    datestring = receivedheader.partition(";")[2].strip()
+                    latestreceived = parse(datestring, fuzzy=True)
+                    # For whatever reason, sometimes we get a datetime without the timezone set.
+                    if None == latestreceived.tzinfo:
+                        latestreceived = latestreceived.replace(tzinfo=Local)
+                    latestreceived = latestreceived.astimezone(Local)
+                    latestreceivedsinceepoch = time.mktime(latestreceived.timetuple())
+                    if latestreceivedsinceepoch > receivedsinceepoch:
+                        receivedsinceepoch = latestreceivedsinceepoch
+            else:
+                # There's no guarantee of a received header. It would appear Apple Mail uses send in these cases.
+                receivedsinceepoch = sendsinceepoch
             
-            # Tue, 26 Jan 2010 16:28:43 -0800
+            dbcursor.execute("insert into message (uuid, messageid, folder, subject, fromAddress, toAddress, receivedDate, sendDate) values (?,?,?,?,?,?,?,?)",
+                             (uid, msg.get("Message-Id"), mbox, msg.get("Subject"), msg.get("From"), msg.get("To"), receivedsinceepoch, sendsinceepoch))
             
-        
     except Exception, e:
             print("Error in select: " + mbox)
+            if None != msg:
+                print("Last message: " + msg.as_string())
             print(e)
     
 sys.exit()
diff --git a/letterbox/source/LBMessage.h b/letterbox/source/LBMessage.h
index 2508ec8..73e0d73 100644
--- a/letterbox/source/LBMessage.h
+++ b/letterbox/source/LBMessage.h
@@ -23,6 +23,8 @@
 @property (retain) NSString *to;
 @property (retain) NSString *messageBody;
 @property (retain) NSURL *messageURL;
+@property (retain) NSDate *receivedDate;
+@property (retain) NSDate *sendDate;
 
 - (void) parseHeaders;
 
diff --git a/letterbox/source/LBMessage.m b/letterbox/source/LBMessage.m
index d5066eb..66b54c4 100644
--- a/letterbox/source/LBMessage.m
+++ b/letterbox/source/LBMessage.m
@@ -16,6 +16,8 @@ @implementation LBMessage
 @synthesize subject;
 @synthesize sender;
 @synthesize to;
+@synthesize receivedDate;
+@synthesize sendDate;
 
 - (id)initWithURL:(NSURL*)fileURL {
 	self = [super init];
@@ -35,6 +37,8 @@ - (void)dealloc {
     [subject release];
     [sender release];
     [to release];
+    [receivedDate release];
+    [sendDate release];
     
     [super dealloc];
 }
diff --git a/letterbox/source/LBServer.m b/letterbox/source/LBServer.m
index 50d97d0..2a3b7c8 100644
--- a/letterbox/source/LBServer.m
+++ b/letterbox/source/LBServer.m
@@ -550,6 +550,10 @@ - (NSArray*)cachedMessagesForFolder:(NSString *)folder {
         message.subject = [rs stringForColumnIndex:2];
         message.sender = [rs stringForColumnIndex:3];
         message.to = [rs stringForColumnIndex:4];
+        NSTimeInterval receivedDateInterval = [rs doubleForColumnIndex:5];
+        message.receivedDate = [NSDate dateWithTimeIntervalSince1970:receivedDateInterval];
+        NSTimeInterval sendDateInterval = [rs doubleForColumnIndex:6];
+        message.sendDate = [NSDate dateWithTimeIntervalSince1970:sendDateInterval];
         
         [messageArray addObject:message];
     }
diff --git a/resources/English.lproj/MailView.xib b/resources/English.lproj/MailView.xib
index bf55a77..0ac994e 100644
--- a/resources/English.lproj/MailView.xib
+++ b/resources/English.lproj/MailView.xib
@@ -3,16 +3,16 @@
 	<data>
 		<int key="IBDocument.SystemTarget">1060</int>
 		<string key="IBDocument.SystemVersion">10C540</string>
-		<string key="IBDocument.InterfaceBuilderVersion">759</string>
+		<string key="IBDocument.InterfaceBuilderVersion">740</string>
 		<string key="IBDocument.AppKitVersion">1038.25</string>
 		<string key="IBDocument.HIToolboxVersion">458.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">759</string>
+			<string key="NS.object.0">740</string>
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="23"/>
+			<integer value="18"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -521,7 +521,7 @@
 																			<object class="_NSCornerView" key="NSCornerView" id="476888251">
 																				<reference key="NSNextResponder" ref="55693222"/>
 																				<int key="NSvFlags">-2147483392</int>
-																				<string key="NSFrame">{{224, 0}, {16, 17}}</string>
+																				<string key="NSFrame">{{713, 0}, {16, 17}}</string>
 																				<reference key="NSSuperview" ref="55693222"/>
 																			</object>
 																			<object class="NSMutableArray" key="NSTableColumns">
@@ -558,7 +558,7 @@
 																				</object>
 																				<object class="NSTableColumn" id="552510824">
 																					<string key="NSIdentifier">subject</string>
-																					<double key="NSWidth">620</double>
+																					<double key="NSWidth">470</double>
 																					<double key="NSMinWidth">40</double>
 																					<double key="NSMaxWidth">1000</double>
 																					<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -583,6 +583,66 @@
 																					<bool key="NSIsEditable">YES</bool>
 																					<reference key="NSTableView" ref="936832817"/>
 																				</object>
+																				<object class="NSTableColumn" id="38853995">
+																					<string key="NSIdentifier">sendDate</string>
+																					<double key="NSWidth">70</double>
+																					<double key="NSMinWidth">40</double>
+																					<double key="NSMaxWidth">1000</double>
+																					<object class="NSTableHeaderCell" key="NSHeaderCell">
+																						<int key="NSCellFlags">75628096</int>
+																						<int key="NSCellFlags2">2048</int>
+																						<string key="NSContents">Date Sent</string>
+																						<reference key="NSSupport" ref="26"/>
+																						<object class="NSColor" key="NSBackgroundColor">
+																							<int key="NSColorSpace">3</int>
+																							<bytes key="NSWhite">MC4zMzMzMzI5ODU2AA</bytes>
+																						</object>
+																						<reference key="NSTextColor" ref="943067071"/>
+																					</object>
+																					<object class="NSTextFieldCell" key="NSDataCell" id="657474203">
+																						<int key="NSCellFlags">337772096</int>
+																						<int key="NSCellFlags2">2048</int>
+																						<string key="NSContents">Text Cell</string>
+																						<reference key="NSSupport" ref="632416043"/>
+																						<reference key="NSControlView" ref="936832817"/>
+																						<reference key="NSBackgroundColor" ref="755145669"/>
+																						<reference key="NSTextColor" ref="460115262"/>
+																					</object>
+																					<int key="NSResizingMask">3</int>
+																					<bool key="NSIsResizeable">YES</bool>
+																					<bool key="NSIsEditable">YES</bool>
+																					<reference key="NSTableView" ref="936832817"/>
+																				</object>
+																				<object class="NSTableColumn" id="371073865">
+																					<string key="NSIdentifier">receivedDate</string>
+																					<double key="NSWidth">74</double>
+																					<double key="NSMinWidth">40</double>
+																					<double key="NSMaxWidth">1000</double>
+																					<object class="NSTableHeaderCell" key="NSHeaderCell">
+																						<int key="NSCellFlags">75628096</int>
+																						<int key="NSCellFlags2">2048</int>
+																						<string key="NSContents">Date Received</string>
+																						<reference key="NSSupport" ref="26"/>
+																						<object class="NSColor" key="NSBackgroundColor">
+																							<int key="NSColorSpace">3</int>
+																							<bytes key="NSWhite">MC4zMzMzMzI5ODU2AA</bytes>
+																						</object>
+																						<reference key="NSTextColor" ref="943067071"/>
+																					</object>
+																					<object class="NSTextFieldCell" key="NSDataCell" id="556283154">
+																						<int key="NSCellFlags">337772096</int>
+																						<int key="NSCellFlags2">2048</int>
+																						<string key="NSContents">Text Cell</string>
+																						<reference key="NSSupport" ref="632416043"/>
+																						<reference key="NSControlView" ref="936832817"/>
+																						<reference key="NSBackgroundColor" ref="755145669"/>
+																						<reference key="NSTextColor" ref="460115262"/>
+																					</object>
+																					<int key="NSResizingMask">3</int>
+																					<bool key="NSIsResizeable">YES</bool>
+																					<bool key="NSIsEditable">YES</bool>
+																					<reference key="NSTableView" ref="936832817"/>
+																				</object>
 																			</object>
 																			<double key="NSIntercellSpacingWidth">3</double>
 																			<double key="NSIntercellSpacingHeight">2</double>
@@ -609,22 +669,21 @@
 																<object class="NSScroller" id="755470184">
 																	<reference key="NSNextResponder" ref="55693222"/>
 																	<int key="NSvFlags">-2147483392</int>
-																	<string key="NSFrame">{{224, 17}, {15, 102}}</string>
+																	<string key="NSFrame">{{713, 17}, {15, 223}}</string>
 																	<reference key="NSSuperview" ref="55693222"/>
 																	<reference key="NSTarget" ref="55693222"/>
 																	<string key="NSAction">_doScroller:</string>
-																	<double key="NSCurValue">37</double>
-																	<double key="NSPercent">0.1947367936372757</double>
+																	<double key="NSPercent">0.93697478991596639</double>
 																</object>
 																<object class="NSScroller" id="887255980">
 																	<reference key="NSNextResponder" ref="55693222"/>
 																	<int key="NSvFlags">-2147483392</int>
-																	<string key="NSFrame">{{1, 75}, {142, 15}}</string>
+																	<string key="NSFrame">{{1, 240}, {727, 15}}</string>
 																	<reference key="NSSuperview" ref="55693222"/>
 																	<int key="NSsFlags">1</int>
 																	<reference key="NSTarget" ref="55693222"/>
 																	<string key="NSAction">_doScroller:</string>
-																	<double key="NSPercent">0.96598639455782309</double>
+																	<double key="NSPercent">0.96291390728476822</double>
 																</object>
 																<object class="NSClipView" id="109889369">
 																	<reference key="NSNextResponder" ref="55693222"/>
@@ -1060,6 +1119,8 @@
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<reference ref="528538703"/>
 							<reference ref="552510824"/>
+							<reference ref="38853995"/>
+							<reference ref="371073865"/>
 						</object>
 						<reference key="parent" ref="55693222"/>
 					</object>
@@ -1237,6 +1298,34 @@
 						<reference key="object" ref="651659399"/>
 						<reference key="parent" ref="40460912"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">67</int>
+						<reference key="object" ref="38853995"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="657474203"/>
+						</object>
+						<reference key="parent" ref="936832817"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">68</int>
+						<reference key="object" ref="657474203"/>
+						<reference key="parent" ref="38853995"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">69</int>
+						<reference key="object" ref="371073865"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="556283154"/>
+						</object>
+						<reference key="parent" ref="936832817"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">70</int>
+						<reference key="object" ref="556283154"/>
+						<reference key="parent" ref="371073865"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -1289,15 +1378,19 @@
 					<string>58.IBPluginDependency</string>
 					<string>60.IBPluginDependency</string>
 					<string>62.IBPluginDependency</string>
+					<string>67.IBPluginDependency</string>
+					<string>68.IBPluginDependency</string>
+					<string>69.IBPluginDependency</string>
+					<string>70.IBPluginDependency</string>
 				</object>
 				<object class="NSMutableArray" key="dict.values">
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{57, 315}, {934, 586}}</string>
+					<string>{{457, 524}, {934, 586}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{57, 315}, {934, 586}}</string>
+					<string>{{457, 524}, {934, 586}}</string>
 					<boolean value="NO"/>
 					<string>{196, 240}</string>
 					<string>{{357, 418}, {480, 270}}</string>
@@ -1338,6 +1431,10 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="unlocalizedProperties">
@@ -1356,7 +1453,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">66</int>
+			<int key="maxID">70</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1950,7 +2047,6 @@
 			</object>
 		</object>
 		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
 			<integer value="1060" key="NS.object.0"/>
@@ -1962,20 +2058,5 @@
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<string key="IBDocument.LastKnownRelativeProjectPath">../../Letters.xcodeproj</string>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSArray" key="dict.sortedKeys">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>toolbar-getmail</string>
-				<string>toolbar-new</string>
-				<string>toolbar-reply</string>
-			</object>
-			<object class="NSMutableArray" key="dict.values">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>{32, 32}</string>
-				<string>{32, 32}</string>
-				<string>{25.6028, 25.6028}</string>
-			</object>
-		</object>
 	</data>
 </archive>