chiark / gitweb /
ownsource download names are internal names
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 5 Apr 2017 12:45:02 +0000 (13:45 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 5 Apr 2017 12:45:02 +0000 (13:45 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
.gitignore
hippotatd

index a4deb5d..fd96470 100644 (file)
@@ -1,5 +1,5 @@
 data.dump.dbg
 [tuv]
 tmp
-source
-srcpkgs
+srcbomb.tar.gz
+srcpkgsbomb.tar
index 399dfe7..aefa458 100755 (executable)
--- a/hippotatd
+++ b/hippotatd
@@ -234,17 +234,24 @@ class IphttpResource(NotStupidResource):
     log_debug(DBG.HTTP_CTRL, '...', idof=id(request))
     return NOT_DONE_YET
 
+  # instantiator should set
+  # self.hippotat_sources = (source_names[0], source_names[1])
+  def __init__(self):
+    self.hippotat_sources = [None, None]
+    super().__init__()
+
   def render_GET(self, request):
     log_debug(DBG.HTTP, 'GET request')
-    return b'''
+    return ('''
 <html><body>
 hippotat
 <p>
-<a href="source">source</a>
-(and that of dependency <a href="srcpkgs">packages</a>)
+<a href="%s">source</a>
+(and that of dependency <a href="%s">packages</a>)
 available
 </body></html>
 '''
+            % tuple(self.hippotat_sources)).encode('utf-8')
 
 def start_http():
   resource = IphttpResource()
@@ -268,8 +275,12 @@ def start_http():
   if DBG.OWNSOURCE in debug_set: ssp.stream_debug = sys.stdout
   ssp.generate()
 
-  resource.putChild(b'source',  twisted.web.static.File(ssp.output_paths[0]))
-  resource.putChild(b'srcpkgs', twisted.web.static.File(ssp.output_paths[1]))
+  for ix in (0,1):
+    bn = ssp.output_names[ix]
+    op = ssp.output_paths[ix]
+    resource.hippotat_sources[ix] = bn
+    subresource =twisted.web.static.File(op)
+    resource.putChild(bn.encode('utf-8'), subresource)
 
   reactor.callLater(0.1, (lambda: log.info('hippotatd started', dflag=False)))