chiark / gitweb /
~ian / hippotat.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 06e61e3)
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 patch | blob | history
hippotatd patch | blob | history

diff --git a/.gitignore b/.gitignore
index a4deb5d2d7fca0fb09e7d0a4377e08c4462eda98..fd964701c3dc09acbd55a8e0ee8d4c9bd90dab2d 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 data.dump.dbg
 [tuv]
 tmp
 data.dump.dbg
 [tuv]
 tmp
-source
-srcpkgs
+srcbomb.tar.gz
+srcpkgsbomb.tar
diff --git a/hippotatd b/hippotatd
index 399dfe710f0c1b333b59afa82bf1cc5d5f1a494b..aefa45890a9676b64fa59d2df0b3b229c35dd99a 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
 
     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')
   def render_GET(self, request):
     log_debug(DBG.HTTP, 'GET request')
-    return b'''
+    return ('''
 <html><body>
 hippotat
 <p>
 <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>
 '''
 available
 </body></html>
 '''
+            % tuple(self.hippotat_sources)).encode('utf-8')
 
 def start_http():
   resource = IphttpResource()
 
 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()
 
   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)))
 
 
   reactor.callLater(0.1, (lambda: log.info('hippotatd started', dflag=False)))
 
Unnamed repository; edit this file 'description' to name the repository.