From 43f32e8c9b8a77466af047c11a98b6bffd4bdb89 Mon Sep 17 00:00:00 2001 From: Brian Warner Date: Tue, 16 Jan 2007 19:43:13 -0700 Subject: [PATCH] vdrive/webish: finish verifierid/uri transition --- src/allmydata/vdrive.py | 22 +++++++++++----------- src/allmydata/webish.py | 8 ++++---- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/allmydata/vdrive.py b/src/allmydata/vdrive.py index bbb3eda5..fb275699 100644 --- a/src/allmydata/vdrive.py +++ b/src/allmydata/vdrive.py @@ -41,7 +41,7 @@ class VDrive(service.MultiService): d.addCallback(_check) return d - def get_verifierid_from_parent(self, parent, filename): + def get_uri_from_parent(self, parent, filename): assert not isinstance(parent, str), "'%s' isn't a directory node" % (parent,) d = parent.callRemote("list") def _find(table): @@ -110,12 +110,12 @@ class VDrive(service.MultiService): def remove(self, parent, name): assert not isinstance(parent, str) log.msg("vdrive removing %s" % name) - # first find the verifierid - d = self.get_verifierid_from_parent(parent, name) - def _got_verifierid(vid): + # first find the uri + d = self.get_uri_from_parent(parent, name) + def _got_uri(vid): # TODO: delete the file's shares using this pass - d.addCallback(_got_verifierid) + d.addCallback(_got_uri) def _delete_from_parent(res): return parent.callRemote("remove", name) d.addCallback(_delete_from_parent) @@ -143,7 +143,7 @@ class VDrive(service.MultiService): dir_or_path, name = dir_and_name_or_path d = self.dirpath(dir_or_path) def _got_dir(dirnode): - return self.get_verifierid_from_parent(dirnode, name) + return self.get_uri_from_parent(dirnode, name) d.addCallback(_got_dir) else: rslash = dir_and_name_or_path.rfind("/") @@ -151,17 +151,17 @@ class VDrive(service.MultiService): # we're looking for a file in the root directory dir = self.gvd_root name = dir_and_name_or_path - d = self.get_verifierid_from_parent(dir, name) + d = self.get_uri_from_parent(dir, name) else: dirpath = dir_and_name_or_path[:rslash] name = dir_and_name_or_path[rslash+1:] d = self.dirpath(dirpath) d.addCallback(lambda dir: - self.get_verifierid_from_parent(dir, name)) + self.get_uri_from_parent(dir, name)) - def _got_verifierid(verifierid): - return dl.download(verifierid, download_target) - d.addCallback(_got_verifierid) + def _got_uri(uri): + return dl.download(uri, download_target) + d.addCallback(_got_uri) def _done(res): log.msg("finished getting file") return res diff --git a/src/allmydata/webish.py b/src/allmydata/webish.py index 5b9448e4..70c1c737 100644 --- a/src/allmydata/webish.py +++ b/src/allmydata/webish.py @@ -127,7 +127,7 @@ class Directory(rend.Page): # to be invoked, which deletes the file and then redirects the # browser back to this directory del_url = url.here.child("_delete") - #del_url = del_url.add("verifierid", idlib.b2a(target)) + #del_url = del_url.add("uri", idlib.b2a(target)) del_url = del_url.add("name", name) delete = T.form(action=del_url, method="post")[ T.input(type='submit', value='del', name="del"), @@ -243,10 +243,10 @@ class TypedFile(static.File): self.defaultType) class Downloader(resource.Resource): - def __init__(self, downloader, name, verifierid): + def __init__(self, downloader, name, uri): self._downloader = downloader self._name = name - self._verifierid = verifierid + self._uri = uri def render(self, ctx): req = inevow.IRequest(ctx) @@ -262,7 +262,7 @@ class Downloader(resource.Resource): t = WebDownloadTarget(req) #dl = IDownloader(ctx) dl = self._downloader - dl.download(self._verifierid, t) + dl.download(self._uri, t) return server.NOT_DONE_YET -- 2.45.2