view: fix format_ts, use existing utc timestamp_to_sec conversion for %s

Author: ikreymer

pywb/webapp/test/test_view_filters.py

@@ -1,9 +1,9 @@
 """
->>> format_ts('201412261010')
-'Fri, Dec 26 2014 10:10:59'
+>>> format_ts('20141226101000')
+'Fri, Dec 26 2014 10:10:00'
 
->>> format_ts('201412261010', '%s')
-1419617459000
+>>> format_ts('20141226101000', '%s')
+1419588600
 
 >>> is_wb_handler(DebugEchoHandler())
 False

pywb/webapp/views.py

@@ -1,10 +1,9 @@
-from pywb.utils.timeutils import timestamp_to_datetime
+from pywb.utils.timeutils import timestamp_to_datetime, timestamp_to_sec
 from pywb.framework.wbrequestresponse import WbResponse
 from pywb.framework.memento import make_timemap, LINK_FORMAT
 
 import urlparse
 import logging
-import time
 
 from os import path
 from itertools import imap
@@ -38,10 +37,10 @@ def __call__(self, func):
 # Filters
 @template_filter()
 def format_ts(value, format_='%a, %b %d %Y %H:%M:%S'):
-    value = timestamp_to_datetime(value)
     if format_ == '%s':
-        return int(time.mktime(value.timetuple()) * 1000)
+        return timestamp_to_sec(value)
     else:
+        value = timestamp_to_datetime(value)
         return value.strftime(format_)