- show full time and date in HTML queue, drop filtering by requester

[tld-builder.git] / TLD_Builder / request.py

diff --git a/TLD_Builder/request.py b/TLD_Builder/request.py
index efedbb96fb23fc59f3c3f8b55a5b6aaa9f77b512..da02c693075cb41039debf233dc00a2f45eded2d 100644 (file)
--- a/TLD_Builder/request.py
+++ b/TLD_Builder/request.py
@@ -7,10 +7,11 @@ import time
 import xml.sax.saxutils
 import fnmatch
 import os
-import urllib
-import cgi
+import urllib.parse
+import html
 import pytz
 import tempfile
+import subprocess
 
 import util
 import log
@@ -110,7 +111,7 @@ class Group:
     def dump(self, f):
         f.write("group: %d (id=%s pri=%d)\n" % (self.no, self.id, self.priority))
         f.write("  from: %s\n" % self.requester)
-        f.write("  flags: %s\n" % self.flags.join())
+        f.write("  flags: %s\n" % ' '.join(self.flags))
         f.write("  time: %s\n" % time.asctime(time.localtime(self.time)))
         for b in self.batches:
             b.dump(f)
@@ -137,7 +138,7 @@ class Group:
         f.write(
             "<div id=\"%(no)d\" class=\"request %(flags)s\">\n"
             "<a href=\"#%(no)d\">%(no)d</a>. "
-            "<time class=\"timeago\" title=\"%(datetime)s\" datetime=\"%(datetime)s\">%(time)s</time> "
+            "<time title=\"%(datetime)s\" datetime=\"%(datetime)s\">%(time)s</time> "
             "from <b class=requester>%(requester)s</b> "
             "<small>%(id)s, prio=%(priority)d, jobs=%(max_jobs)d, %(flags)s</small>\n"
         % {
@@ -148,7 +149,7 @@ class Group:
             'requester': escape(self.requester),
             'priority': self.priority,
             'max_jobs': self.max_jobs,
-            'flags': self.flags.join()
+            'flags': ' '.join(self.flags)
         })
         f.write("<ol>\n")
         for b in self.batches:
@@ -162,7 +163,7 @@ class Group:
          <requester email='%s'>%s</requester>
          <time>%d</time>
          <priority>%d</priority>
-         <maxjobs>%d</maxjobs>\n""" % (self.id, self.no, self.flags.join(),
+         <maxjobs>%d</maxjobs>\n""" % (self.id, self.no, ' '.join(self.flags),
                     escape(self.requester_email), escape(self.requester),
                     self.time, self.priority, self.max_jobs))
         for b in self.batches:
@@ -294,7 +295,7 @@ class Batch:
         builders = []
         for b in self.builders:
             builders.append("%s:%s" % (b, self.builders_status[b]))
-        f.write("    builders: %s\n" % builders.join())
+        f.write("    builders: %s\n" % ' '.join(builders))
 
     def is_command(self):
         return self.command != ""
@@ -329,18 +330,18 @@ class Batch:
             desc = "SH: <pre>%s</pre> flags: [%s]" % (self.command, ' '.join(self.command_flags))
         else:
             cmd = "/usr/bin/git ls-remote --heads git://git.tld-linux.org/packages/%s 1>/dev/null 2>&1" % (self.spec[:-5])
-            r = call(cmd, shell=True)
+            r = subprocess.call(cmd, shell=True)
             if r == 0:
                 package_url = "http://git.tld-linux.org/?p=packages/%(package)s.git;a=blob;f=%(spec)s;hb=%(branch)s" % {
-                    'spec': urllib.quote(self.spec),
-                    'branch': urllib.quote(self.branch),
-                    'package': urllib.quote(self.spec[:-5]),
+                    'spec': urllib.parse.quote(self.spec),
+                    'branch': urllib.parse.quote(self.branch),
+                    'package': urllib.parse.quote(self.spec[:-5]),
                 }
             else:
                 package_url = "http://git.pld-linux.org/gitweb.cgi?p=packages/%(package)s.git;f=%(spec)s;h=%(branch)s;a=shortlog" % {
-                    'spec': urllib.quote(self.spec),
-                    'branch': urllib.quote(self.branch),
-                    'package': urllib.quote(self.spec[:-5]),
+                    'spec': urllib.parse.quote(self.spec),
+                    'branch': urllib.parse.quote(self.branch),
+                    'package': urllib.parse.quote(self.spec[:-5]),
                 }
             desc = "%(src_rpm)s (<a href=\"%(package_url)s\">%(spec)s -r %(branch)s</a>%(rpmopts)s)" % {
                 'src_rpm': self.src_rpm,
@@ -379,7 +380,7 @@ class Batch:
                 tree_name = '-'.join(bld[:-1])
                 tree_arch = '-'.join(bld[-1:])
                 link_pre = "<a href=\"http://buildlogs.tld-linux.org/index.php?dist=%s&arch=%s&name=%s&id=%s&action=download\">" \
-                    % (urllib.quote(tree_name), urllib.quote(tree_arch), urllib.quote(bl_name), urllib.quote(rid))
+                    % (urllib.parse.quote(tree_name), urllib.parse.quote(tree_arch), urllib.parse.quote(bl_name), urllib.parse.quote(rid))
                 link_post = "</a>"
 
             def ftime(s):
@@ -398,10 +399,10 @@ class Batch:
                     'color' : c,
                     'builder' : b,
                     'status' : s,
-                    'tooltip' : cgi.escape(tooltip, True),
+                    'tooltip' : html.escape(tooltip, True),
             }
             + link_post)
-        f.write("%s]</small></li>\n" % builders.join())
+        f.write("%s]</small></li>\n" % ' '.join(builders))
 
     def rpmbuild_opts(self):
         """
@@ -501,7 +502,7 @@ class Batch:
            <spec>%s</spec>
            <branch>%s</branch>
            <info>%s</info>\n""" % (self.b_id,
-                 list(map(lambda b: b.b_id, self.depends_on)).join(),
+                 ' '.join(list(map(lambda b: b.b_id, self.depends_on))),
                  escape(self.src_rpm),
                  escape(' '.join(self.command_flags)), escape(self.command),
                  escape(self.spec), escape(self.branch), escape(self.info)))