ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-02-20 17:52:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

IServer.get_name(): remove v0- prefix from displayed server names

Browse Source 
Don't remove the prefix if it isn't there: that avoids the need to fix tests
which use a bogus key (usually all-zeros).
This commit is contained in:
Brian Warner 2012-03-14 16:36:40 -07:00
parent cef646c4a7
commit 890449801e
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/allmydata/storage_client.py
View File

@ -190,9 +190,16 @@ class NativeStorageServer:
ps = base32.a2b(str(ann["permutation-seed-base32"]))
self._permutation_seed = ps
name = key_s or tubid_s
self._long_description = name
self._short_description = name[:8] # TODO: decide who adds []
if key_s:
self._long_description = key_s
if key_s.startswith("v0-"):
# remove v0- prefix from abbreviated name
self._short_description = key_s[3:3+8]
else:
self._short_description = key_s[:8]
else:
self._long_description = tubid_s
self._short_description = tubid_s[:8]
self.announcement_time = time.time()
self.last_connect_time = None
@ -213,6 +220,8 @@ class NativeStorageServer:
return self.rref.version
return None
def get_name(self): # keep methodname short
# TODO: decide who adds [] in the short description. It should
# probably be the output side, not here.
return self._short_description
def get_longname(self):
return self._long_description