Display queued job result size

diff --git a/bin/djais/models.py b/bin/djais/models.py
index c1f20f6bd7ffc79b14de18a6d04f684154c8d387..5d9ae8442b30fdd72103fc05be0d92a30bfd676a 100644 (file)
--- a/bin/djais/models.py
+++ b/bin/djais/models.py
@@ -241,6 +241,11 @@ class Job(models.Model):
         for i, key in enumerate(('pid', 'comm', 'state', 'ppid', 'pgrp', 'session', 'tty_nr', 'tpgid', 'flags', 'minflt', 'cminflt', 'majflt', 'cmajflt', 'utime', 'stime', 'cutime', 'cstime', 'priority', 'nice', 'num_threads', 'itrealvalue', 'starttime', 'vsize', 'rss', 'rsslim', 'startcode', 'endcode', 'startstack', 'kstkesp', 'kstkeip', 'signal', 'blocked', 'sigignore', 'sigcatch', 'wchan', 'nswap', 'cnswap', 'exit_signal', 'processor', 'rt_priority', 'policy', 'delayacct_blkio_ticks', 'guest_time', 'cguest_time')):
             result[key] = strstats[i]
         return result
         for i, key in enumerate(('pid', 'comm', 'state', 'ppid', 'pgrp', 'session', 'tty_nr', 'tpgid', 'flags', 'minflt', 'cminflt', 'majflt', 'cmajflt', 'utime', 'stime', 'cutime', 'cstime', 'priority', 'nice', 'num_threads', 'itrealvalue', 'starttime', 'vsize', 'rss', 'rsslim', 'startcode', 'endcode', 'startstack', 'kstkesp', 'kstkeip', 'signal', 'blocked', 'sigignore', 'sigcatch', 'wchan', 'nswap', 'cnswap', 'exit_signal', 'processor', 'rt_priority', 'policy', 'delayacct_blkio_ticks', 'guest_time', 'cguest_time')):
             result[key] = strstats[i]
         return result

+    
+    def get_sucess_size(self):
+        extension = os.path.splitext(self.friendly_filename)[-1]
+        filename = '/var/lib/ais/jobs/%s%s' % (self.id, extension)
+        return os.path.getsize(filename)

 
     class Meta:
         db_table = u'job'
 
     class Meta:
         db_table = u'job'

diff --git a/html_templates/job.html b/html_templates/job.html
index e806bb4de0c6c12225fec42747d48ec5dc3214f1..015a39398df475aab8ff61b97de67af1083e3a38 100644 (file)
--- a/html_templates/job.html
+++ b/html_templates/job.html
@@ -14,6 +14,7 @@
 {% if job.finish_time %}
 Status: <b>Completed</b> at {{ job.finish_time|date:"Y-m-d H:i:s" }} UTC in {{ job.process_time }}<br>
 Result: {% if job.result %}<b>Error {{ job.result }}</b>{% else %}<b>Success</b><br>
 {% if job.finish_time %}
 Status: <b>Completed</b> at {{ job.finish_time|date:"Y-m-d H:i:s" }} UTC in {{ job.process_time }}<br>
 Result: {% if job.result %}<b>Error {{ job.result }}</b>{% else %}<b>Success</b><br>

+Result size: {{ job.get_sucess_size }} bytes<br>

 <a href="/job/{{ job.id }}/download" class=button>download</a>{% endif %}<br>
 {% else %}
     {% if job.start_time %}
 <a href="/job/{{ job.id }}/download" class=button>download</a>{% endif %}<br>
 {% else %}
     {% if job.start_time %}