Version 0.5.12

resources/lib/timeconv.py

@@ -5,27 +5,31 @@
 
 from __future__ import unicode_literals, absolute_import, division
 
-from datetime import datetime, timedelta
+from datetime import datetime
+import pytz
+from dateutil import parser
 
-def timestamp2str(timestamp):
+weekdays = ['Dom', 'Lun', 'Mar', 'Mie', 'Jue', 'Vie', 'Sab']
+
+def timestamp2str(timestamp, format='%H:%M'):
   time = datetime.fromtimestamp(timestamp / 1000)
-  return time.strftime("%H:%M")
+  if '%a' in format:
+    w = int(time.strftime('%w'))
+    format = format.replace('%a', weekdays[w])
+  return time.strftime(format).capitalize()
 
-def isodate2str(iso_str):
-  iso_str = iso_str[0:19]
+def isodate2date(date_string):
+  date_object = parser.parse(date_string)
+  if date_object.tzinfo is None:
+    madrid_tz = pytz.timezone("Europe/Madrid")
+    madrid_time = madrid_tz.localize(date_object)
+  else:
+    madrid_time = date_object.astimezone(pytz.timezone("Europe/Madrid"))
+  return madrid_time
+
+def isodate2str(date_string):
   try:
-    dt = datetime.strptime(iso_str, "%Y-%m-%dT%H:%M:%S")
+    date_object = isodate2date(date_string)
+    return date_object.strftime("%d/%m/%Y %H:%M:%S")
   except:
-    return iso_str
-
-  try:
-    import pytz
-    utc_tz = pytz.timezone('UTC')
-    dt = utc_tz.localize(dt)
-    dt = dt.astimezone(pytz.timezone('Europe/Madrid'))
-  except:
-    pass
-
-  dt = dt.strftime('%d/%m/%Y %H:%M:%S')
-  return dt
-
+    return date_string