extras-buildsys/www/template head.psp,1.9,1.10

[Daniel Williams (dcbw)]

Author: dcbw

Update of /cvs/fedora/extras-buildsys/www/template
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18236/www/template

Modified Files:
	head.psp 
Log Message:
2005-11-19  Dan Williams  <dcbw at redhat.com>

    * www/*
        - Add time columns to main, failed, and success pages
            showing relative times jobs started or finished




Index: head.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/template/head.psp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- head.psp	11 Aug 2005 21:32:17 -0000	1.9
+++ head.psp	19 Nov 2005 05:43:29 -0000	1.10
@@ -21,6 +21,76 @@
     server = server.replace('.', ' ')
     return user + ' ' + server
 
+def relative_date_helper(val, desc, text):
+    if val > 0:
+        if len(text) > 0:
+            text = text + ', '
+        if val == 1:
+            text = text + '1 %s' % desc
+        elif val > 1:
+            text = text + '%d %ss' % (val, desc)
+    return text
+
+def relative_date(tm):
+    """ Returns a relative date from a given
+        seconds since the epoch """
+    from datetime import datetime, timedelta
+    curdt = datetime.today()
+    convdt = datetime.fromtimestamp(tm)
+    delta = curdt - convdt
+
+    # Convert stuff to relative text
+    ret = relative_date_helper(delta.days, 'day', '')
+
+    seconds = delta.seconds
+    hours = seconds / 3600
+    seconds = seconds - (hours * 3600)
+    ret = relative_date_helper(hours, 'hour', ret)
+
+    minutes = seconds / 60
+    seconds = seconds - (minutes * 60)
+    if seconds >= 30:
+        minutes = minutes + 1
+    ret = relative_date_helper(minutes, 'minute', ret)
+
+    if len(ret) > 0:
+        ret = ret + ' ago'
+    return ret
+
+def relative_date_short_helper(val, desc, text):
+    if val > 0:
+        if len(text) > 0:
+            text = text + ' '
+        text = text + '%d%s' % (val, desc)
+    return text
+
+def relative_date_short(tm):
+    """ Returns a relative date from a given
+        seconds since the epoch """
+    from datetime import datetime, timedelta
+    curdt = datetime.today()
+    convdt = datetime.fromtimestamp(tm)
+    delta = curdt - convdt
+
+    # Convert stuff to relative text
+    ret = relative_date_short_helper(delta.days, 'd', '')
+
+    seconds = delta.seconds
+    hours = seconds / 3600
+    seconds = seconds - (hours * 3600)
+    ret = relative_date_short_helper(hours, 'h', ret)
+
+    if len(ret) <= 0:
+        minutes = seconds / 60
+        seconds = seconds - (minutes * 60)
+        if seconds >= 30:
+            minutes = minutes + 1
+        ret = relative_date_short_helper(minutes, 'm', ret)
+
+    if len(ret) > 0:
+        ret = ret + ' ago'
+    return ret
+
 main_active = ''
 if curpage == 'main':
     main_active = '-active'