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

confwiz: add nickname determination

Browse Source 
the confwiz now uses socket.gethostname() if a 'nickname' file doesn't already
exist, and passes that nickname into the 'record_install' method on the backend,
so that the moniker can be recorded in the system table.
This commit is contained in:
robk-tahoe 2008-03-05 16:34:18 -07:00
parent 456b437608
commit 2c81988ed3
1 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/allmydata/gui/confwiz.py
View File

@ -9,6 +9,7 @@ WINFUSESVC_NAME = 'Allmydata SMB'
import os import os
import re import re
import socket
import sys import sys
#import time #import time
import traceback import traceback
@ -63,12 +64,13 @@ def create_account(url, user, passwd, subscribe):
result_code = post(url, args) result_code = post(url, args)
return result_code return result_code
def record_install(url, user, passwd, nodeid): def record_install(url, user, passwd, nodeid, nickname):
args = { args = {
'action': 'record_install', 'action': 'record_install',
'email': unicode_to_utf8(user), 'email': unicode_to_utf8(user),
'passwd': unicode_to_utf8(passwd), 'passwd': unicode_to_utf8(passwd),
'nodeid': nodeid, 'nodeid': nodeid,
'moniker': nickname,
} }
result_code = post(url, args) result_code = post(url, args)
return result_code return result_code
@ -116,6 +118,31 @@ def get_nodeid():
tub = foolscap.Tub(certFile=certfile) tub = foolscap.Tub(certFile=certfile)
return tub.getTubID() return tub.getTubID()
def get_nickname():
nick = None
nnfile = os.path.join(get_basedir(), 'nickname')
if os.path.exists(nnfile):
try:
fh = file(nnfile, 'rb')
nick = fh.read().strip()
fh.close()
except:
DisplayTraceback('Failed to read existing nickname file %s' % (nnfile,))
if not nick:
nick = socket.gethostname()
return nick
def maybe_write_nickname(nickname):
nnfile = os.path.join(get_basedir(), 'nickname')
try:
if not os.path.exists(nnfile):
fh = file(nnfile, 'wb')
fh.write(nickname)
fh.write('\n')
fh.close()
except:
DisplayTraceback('Failed to write nickname file %s' % (nnfile,))
def configure(backend, user, passwd): def configure(backend, user, passwd):
_config_re = re.compile('^([^:]*): (.*)$') _config_re = re.compile('^([^:]*): (.*)$')
config = get_config(backend, user, passwd) config = get_config(backend, user, passwd)
@ -314,12 +341,14 @@ class LoginPanel(wx.Panel):
return return
nodeid = get_nodeid() nodeid = get_nodeid()
ret = record_install(backend, user, passwd, nodeid) nickname = get_nickname()
ret = record_install(backend, user, passwd, nodeid, nickname)
if ret != 'ok': if ret != 'ok':
wx.MessageBox('Error "%s" recording this system (%s)' % (ret, nodeid), 'Error') wx.MessageBox('Error "%s" recording this system (%s)' % (ret, nodeid), 'Error')
configure(backend, user, passwd) configure(backend, user, passwd)
maybe_start_services() maybe_start_services()
maybe_write_nickname(nickname)
self.app.open_welcome_page() self.app.open_welcome_page()
@ -459,12 +488,14 @@ class RegisterPanel(wx.Panel):
return return
nodeid = get_nodeid() nodeid = get_nodeid()
ret = record_install(backend, user, passwd, nodeid) nickname = get_nickname()
ret = record_install(backend, user, passwd, nodeid, nickname)
if ret != 'ok': if ret != 'ok':
wx.MessageBox('Error "%s" recording this system (%s)' % (ret, nodeid), 'Error') wx.MessageBox('Error "%s" recording this system (%s)' % (ret, nodeid), 'Error')
configure(backend, user, passwd) configure(backend, user, passwd)
maybe_start_services() maybe_start_services()
maybe_write_nickname(nickname)
self.app.open_welcome_page() self.app.open_welcome_page()