[Nym3-commit] r224 - trunk/nym3/Client

[jr at conuropsis.org]

Author: jr
Date: 2005-05-03 12:10:20 +0200 (Tue, 03 May 2005)
New Revision: 224

Modified:
   trunk/nym3/Client/Main.py
Log:
factorize the getting of an account from a nickname


Modified: trunk/nym3/Client/Main.py
===================================================================
--- trunk/nym3/Client/Main.py	2005-05-03 09:49:55 UTC (rev 223)
+++ trunk/nym3/Client/Main.py	2005-05-03 10:10:20 UTC (rev 224)
@@ -108,6 +108,20 @@
 	    pass
     return clear
 
+def get_account_from_nickname(ui, config, nickname, fail_none):
+    """Test if the nickname is different from None. If not display fail_none
+    on the ui and exit. Then try to get an existing Account for this nickname.
+    If none can be found, display a message on the ui and exit,
+    else return it"""
+    if not nickname:
+	ui.display(fail_none)
+	sys.exit(1)
+    try:
+	return Account.Account(config, nickname)
+    except Account.NoSuchAccount:
+	ui.display("No account relative to the provided nickname, abort")
+	sys.exit(1)
+
 def processMessage(msg, config, ui, nickname):
     """process incoming control message"""
       
@@ -249,16 +263,8 @@
 	ui.display("Address format unknown")
 	#TODO add here the supported formats?
 	sys.exit(1)
-    if not nickname:
-	ui.display("No nickname given, abort")
-	ui.display("Use -n <nickname>")
-	sys.exit(1)
-    account = None
-    try:
-	account = Account.Account(config, nickname)
-    except Account.NoSuchAccount:
-	ui.display("No account relative to the provided nickname, abort")
-	sys.exit(42)
+    account = get_account_from_nickname(ui, config, nickname,
+	    "No nickname given, abort\nUse -n <nickname>")
     if input:
 	try:
 	    fd = open(input)
@@ -288,17 +294,8 @@
     if not max: max = config.max_syn
     if older: older = binascii.unhexlify(older)
     else: older = chr(0) * 20
-
-    if not nickname:
-	ui.display("No nickname given, abort")
-	ui.display("Use -n <nickname>")
-	sys.exit(1)
-    account = None
-    try:
-	account = Account.Account(config, nickname)
-    except Account.NoSuchAccount:
-	ui.display("No account relative to the provided nickname, abort")
-	sys.exit(1)
+    account = get_account_from_nickname(ui, config, nickname,
+	    "No nickname given, abort\nUse -n <nickname>")
     summ = Message.Summarize()
     summ.fromData(max, older)
     try:
@@ -310,16 +307,8 @@
     account.sendControl([summ], idKey)
 
 def Delete(ui, config, nickname = None, midlist = None):
-    if not nickname:
-	ui.display("No nickname given, abort")
-	ui.display("Use -n <nickname>")
-	sys.exit(1)
-    account = None
-    try:
-	account = Account.Account(config, nickname)
-    except Account.NoSuchAccount:
-	ui.display("No account relative to the provided nickname, abort")
-	sys.exit(1)
+    account = get_account_from_nickname(ui, config, nickname,
+	    "No nickname given, abort\nUse -n <nickname>")   
     delmsg = Message.Delete()
     midlist = map(binascii.unhexlify, midlist)
     delmsg.fromData(midlist)
@@ -337,16 +326,8 @@
     account.sendControl([delmsg], idKey)
 
 def Get(ui, config, nickname = None, midlist = None):
-    if not nickname:
-	ui.display("No nickname given, abort")
-	ui.display("Use -n <nickname>")
-	sys.exit(1)
-    account = None
-    try:
-	account = Account.Account(config, nickname)
-    except Account.NoSuchAccount:
-	ui.display("No account relative to the provided nickname, abort")
-	sys.exit(1)
+    account = get_account_from_nickname(ui, config, nickname,
+	    "No nickname given, abort\nUse -n <nickname>")
     getmsg = Message.Get()
     midlist = map(binascii.unhexlify, midlist)
     getmsg.fromData(midlist)
@@ -364,8 +345,10 @@
     account.sendControl([getmsg], idKey)
 
 def list_syn(ui, config, nickname = None)
-    pass
+    account = get_account_from_nickname(ui, config, nickname,
+	    "No nickname given, abort\nUse -n <nickname>")
 
+
 def main(args):
     if len(args) < 2:
 	print "Usage: WRITEME"