ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-01-03 03:36:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

webish: add mesh stats, peer list. improve distribution of client services within rend_* methods

Browse Source
This commit is contained in:
Brian Warner 2006-12-04 19:54:35 -07:00
parent 6f21b4248a
commit a312dd10e8
2 changed files with 62 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
allmydata/web/welcome.xhtml
View File

@ -7,9 +7,29 @@
</head> </head>
<body> <body>
<h1>Welcome To AllMyData!</h1> <h1>Welcome To AllMyData! (tahoe2)</h1>
<p>To view the global shared filestore, <a href="vdrive">Click Here!</a></p> <p>To view the global shared filestore, <a href="vdrive">Click Here!</a></p>
<h2>Mesh Status</h2>
<div>Known Peers: <span n:render="string" n:data="num_peers" /></div>
<div>Connected Peers: <span n:render="string" n:data="num_connected_peers" /></div>
<div>
<table n:render="sequence" n:data="peers" border="1">
<tr n:pattern="header">
<td>PeerID</td>
<td>Connected?</td>
</tr>
<tr n:pattern="item" n:render="row">
<td><tt><n:slot name="peerid"/></tt></td>
<td><n:slot name="connected"/></td>
</tr>
<tr n:pattern="empty"><td>no peers!</td></tr>
</table>
</div>
</body> </body>
</html> </html>

50
allmydata/webish.py
View File

@ -6,13 +6,16 @@ from nevow import inevow, rend, loaders, appserver, url, tags as T
from allmydata.util import idlib from allmydata.util import idlib
from allmydata.download import IDownloadTarget#, IDownloader from allmydata.download import IDownloadTarget#, IDownloader
from allmydata import upload from allmydata import upload
from zope.interface import implements from zope.interface import implements, Interface
import urllib import urllib
from formless import annotate, webform from formless import annotate, webform
def getxmlfile(name): def getxmlfile(name):
return loaders.xmlfile(util.sibpath(__file__, "web/%s" % name)) return loaders.xmlfile(util.sibpath(__file__, "web/%s" % name))
class IClient(Interface):
pass
class WebishServer(service.MultiService): class WebishServer(service.MultiService):
name = "webish" name = "webish"
WEBPORTFILE = "webport" WEBPORTFILE = "webport"
@ -27,8 +30,20 @@ class WebishServer(service.MultiService):
self.site = site = appserver.NevowSite(root) self.site = site = appserver.NevowSite(root)
internet.TCPServer(webport, site).setServiceParent(self) internet.TCPServer(webport, site).setServiceParent(self)
def startService(self):
service.MultiService.startService(self)
# to make various services available to render_* methods, we stash a
# reference to the client on the NevowSite. This will be available by
# adapting the 'context' argument to a special marker interface named
# IClient.
self.site.remember(self.parent, IClient)
# I thought you could do the same with an existing interface, but
# apparently 'ISite' does not exist
#self.site._client = self.parent
def set_root_dirnode(self, dirnode): def set_root_dirnode(self, dirnode):
self.root.putChild("vdrive", Directory(dirnode, "/", self.parent)) self.root.putChild("vdrive", Directory(dirnode, "/"))
# I tried doing it this way and for some reason it didn't seem to work
#print "REMEMBERING", self.site, dl, IDownloader #print "REMEMBERING", self.site, dl, IDownloader
#self.site.remember(dl, IDownloader) #self.site.remember(dl, IDownloader)
@ -37,15 +52,33 @@ class Welcome(rend.Page):
addSlash = True addSlash = True
docFactory = getxmlfile("welcome.xhtml") docFactory = getxmlfile("welcome.xhtml")
def data_num_peers(self, ctx, data):
#client = inevow.ISite(ctx)._client
client = IClient(ctx)
return len(client.all_peers)
def data_num_connected_peers(self, ctx, data):
return len(IClient(ctx).connections)
def data_peers(self, ctx, data):
return sorted(IClient(ctx).all_peers)
def render_row(self, ctx, data):
if data in IClient(ctx).connections:
connected = "yes"
else:
connected = "no"
ctx.fillSlots("peerid", idlib.b2a(data))
ctx.fillSlots("connected", connected)
return ctx.tag
class Directory(rend.Page): class Directory(rend.Page):
addSlash = True addSlash = True
docFactory = getxmlfile("directory.xhtml") docFactory = getxmlfile("directory.xhtml")
def __init__(self, dirnode, dirname, client): def __init__(self, dirnode, dirname):
self._dirnode = dirnode self._dirnode = dirnode
self._dirname = dirname self._dirname = dirname
self._client = client
def get_service(self, ctx, name):
return IClient(ctx).getServiceNamed(name)
def childFactory(self, ctx, name): def childFactory(self, ctx, name):
if name.startswith("freeform"): # ick if name.startswith("freeform"): # ick
@ -54,15 +87,14 @@ class Directory(rend.Page):
args = inevow.IRequest(ctx).args args = inevow.IRequest(ctx).args
filename = args["filename"][0] filename = args["filename"][0]
verifierid = args["verifierid"][0] verifierid = args["verifierid"][0]
return Downloader(self._client.getServiceNamed("downloader"), return Downloader(self.get_service(ctx, "downloader"),
self._dirname, filename, idlib.a2b(verifierid)) self._dirname, filename, idlib.a2b(verifierid))
if self._dirname == "/": if self._dirname == "/":
dirname = "/" + name dirname = "/" + name
else: else:
dirname = self._dirname + "/" + name dirname = self._dirname + "/" + name
d = self._dirnode.callRemote("get", name) d = self._dirnode.callRemote("get", name)
d.addCallback(lambda newnode: d.addCallback(lambda newnode: Directory(newnode, dirname))
Directory(newnode, dirname, self._client))
return d return d
def render_title(self, ctx, data): def render_title(self, ctx, data):
@ -135,7 +167,7 @@ class Directory(rend.Page):
# contents is a cgi.FieldStorage instance # contents is a cgi.FieldStorage instance
log.msg("starting webish upload") log.msg("starting webish upload")
uploader = self._client.getServiceNamed("uploader") uploader = self.get_service(ctx, "uploader")
d = uploader.upload(upload.Data(contents.value)) d = uploader.upload(upload.Data(contents.value))
name = contents.filename name = contents.filename
d.addCallback(lambda vid: d.addCallback(lambda vid:
@ -168,7 +200,7 @@ class Directory(rend.Page):
def child__delete(self, ctx): def child__delete(self, ctx):
# perform the delete, then redirect back to the directory page # perform the delete, then redirect back to the directory page
args = inevow.IRequest(ctx).args args = inevow.IRequest(ctx).args
vdrive = self._client.getServiceNamed("vdrive") vdrive = self.get_service(ctx, "vdrive")
d = vdrive.remove(self._dirnode, args["name"][0]) d = vdrive.remove(self._dirnode, args["name"][0])
def _deleted(res): def _deleted(res):
return url.here.up() return url.here.up()