python iso8601 date formatting

max-mapper · Aug 1, 2011 · b64ee70 · b64ee70
1 parent c19158f
commit b64ee70
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 12 deletions.
diff --git a/attachments/index.html b/attachments/index.html
@@ -43,6 +43,7 @@
 <body>
   <div id="background"></div>
   <div id="wrapper">
+    <div class="splash" style="margin: 0 auto; width: 537px"><img class="couch" src="images/couch.png"></div>
     <div id="header">
       <div class="autocompleter">
         <input id="search" data-route="irc_search" placeholder="Search" />
@@ -155,15 +156,10 @@
   </div>
 </script>
 
-<script id="mail_searchTemplate" type="text/mustache">
+<script id="searchResultsTemplate" type="text/mustache">
   {{#results}}
-  <li data-icon="false"><a data-id="{{_id}}"class="menuOption">{{subject}}</a></li>
-  {{/results}}
-</script>
-
-<script id="irc_searchTemplate" type="text/mustache">
-  {{#results}}
-  <li data-icon="false"><a data-id="{{_id}}"class="menuOption">{{message}}</a></li>
+    {{#mail}}<li data-icon="false"><a data-id="{{_id}}"class="mailResult menuOption">{{subject}}</a></li>{{/mail}}
+    {{#irc}}<li data-icon="false"><a data-id="{{_id}}"class="ircResult menuOption">{{message}}</a></li>{{/irc}}
   {{/results}}
 </script>
 

diff --git a/attachments/script/site.js b/attachments/script/site.js
@@ -20,6 +20,7 @@ app.handler = function(route) {
 app.after = {
   home: function() { 
     util.bindAutocomplete($('#search'))   
+
     // msg.latest().then(function(conversations) {
     //   console.log(conversations)
     //   var firsts = conversations.children.map(function(child) {

diff --git a/attachments/script/util.js b/attachments/script/util.js
@@ -133,18 +133,29 @@ var util = function() {
 
   function bindAutocomplete(input) {
     input.keyup(function() {
+      var currentResults = [];
       input.siblings('.loading').show();
       util.delay(function() {
         var searchRoute = input.attr('data-route')
           , term = input.val()
           ;
-        function showResults(results, template) {
-          util.render(template, template + "_container", {results: results});
+        function showResults(results, type) {
+          results = _.map(results, function(result) {
+            var o = {};
+            o[type] = [result];
+            return o;
+          })
+          currentResults.push(results);
+          currentResults = _.sortBy(currentResults, function(result) {
+            return result;
+          })
+          util.render('searchResults', 'search-list', {results: currentResults});          
         }
         var requests = _.map(_.keys(searchRoutes), function(route) {
           var req = util.search(term, route, searchRoutes[route])
           req.then(function(results) {
-            showResults(results, route);
+            var type = route.split('_')[0];
+            showResults(results, type);
           })
           return req;
         })

diff --git a/mbox2couch/jsonify_mbox.py b/mbox2couch/jsonify_mbox.py
@@ -5,6 +5,7 @@
 import email
 import quopri
 from BeautifulSoup import BeautifulSoup
+import dateutil.parser as parser # pip install python-dateutil==1.5 for python2.6
 
 try:
     import jsonlib2 as json  # much faster then Python 2.6.x's stdlib
@@ -28,7 +29,12 @@ def cleanContent(msg):
 def jsonifyMessage(msg):
     headers = {}
     for (k, v) in msg.items():
-        headers[k.lower()] = [v.decode('utf-8', 'ignore')]
+      	k = k.lower()
+        v = v.decode('utf-8', 'ignore')
+        headers[k] = [v]
+        if k == "date":
+      	    date = parser.parse(v)
+            headers['date'] = [date.isoformat()]
 
     json_msg = {'parts': [], 'headers': headers}