X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Faliasing.py;h=cd107abb742180dd284c8a74aebded3d6c933747;hb=6ef9231c94a33ecc288d5927d0c8e22917be7f0f;hp=4d6c3a338371cd61a79540388e468a28280543d9;hpb=7185ab0e9bc773f7c7051d414ae0af578060a583;p=theonering

diff --git a/src/aliasing.py b/src/aliasing.py
index 4d6c3a3..cd107ab 100644
--- a/src/aliasing.py
+++ b/src/aliasing.py
@@ -2,13 +2,42 @@ import logging
 
 import telepathy
 
+import tp
 import gtk_toolbox
+import util.misc as util_misc
 import handle
 
 
 _moduleLogger = logging.getLogger('aliasing')
 
 
+def _make_pretty_with_areacodde(phonenumber):
+	prettynumber = "(%s)" % (phonenumber[0:3], )
+	if 3 < len(phonenumber):
+		prettynumber += " %s" % (phonenumber[3:6], )
+		if 6 < len(phonenumber):
+			prettynumber += "-%s" % (phonenumber[6:], )
+	return prettynumber
+
+
+def _make_pretty_local(phonenumber):
+	prettynumber = "%s" % (phonenumber[0:3], )
+	if 3 < len(phonenumber):
+		prettynumber += "-%s" % (phonenumber[3:], )
+	return prettynumber
+
+
+def _make_pretty_international(phonenumber):
+	if phonenumber.startswith("0"):
+		prettynumber = "+%s " % (phonenumber[0:3], )
+		if 3 < len(phonenumber):
+			prettynumber += _make_pretty_with_areacodde(phonenumber[3:])
+	if phonenumber.startswith("1"):
+		prettynumber = "1 "
+		prettynumber += _make_pretty_with_areacodde(phonenumber[1:])
+	return prettynumber
+
+
 def make_pretty(phonenumber):
 	"""
 	Function to take a phone number and return the pretty version
@@ -26,43 +55,44 @@ def make_pretty(phonenumber):
 	>>> make_pretty("1234567")
 	'123-4567'
 	>>> make_pretty("2345678901")
-	'(234)-567-8901'
+	'+1 (234) 567-8901'
 	>>> make_pretty("12345678901")
-	'1 (234)-567-8901'
+	'+1 (234) 567-8901'
 	>>> make_pretty("01234567890")
-	'+012-(345)-678-90'
+	'+012 (345) 678-90'
+	>>> make_pretty("+01234567890")
+	'+012 (345) 678-90'
+	>>> make_pretty("+12")
+	'+1 (2)'
+	>>> make_pretty("+123")
+	'+1 (23)'
+	>>> make_pretty("+1234")
+	'+1 (234)'
 	"""
 	if phonenumber is None or phonenumber is "":
 		return ""
 
-	phonenumber = handle.strip_number(phonenumber)
+	phonenumber = util_misc.normalize_number(phonenumber)
 
-	if len(phonenumber) < 3:
-		return phonenumber
+	if phonenumber[0] == "+":
+		prettynumber = _make_pretty_international(phonenumber[1:])
+		if not prettynumber.startswith("+"):
+			prettynumber = "+"+prettynumber
+	elif 8 < len(phonenumber) and phonenumber[0] in ("0", "1"):
+		prettynumber = _make_pretty_international(phonenumber)
+	elif 7 < len(phonenumber):
+		prettynumber = _make_pretty_with_areacodde(phonenumber)
+	elif 3 < len(phonenumber):
+		prettynumber = _make_pretty_local(phonenumber)
+	else:
+		prettynumber = phonenumber
+	return prettynumber.strip()
 
-	if phonenumber[0] == "0":
-		prettynumber = ""
-		prettynumber += "+%s" % phonenumber[0:3]
-		if 3 < len(phonenumber):
-			prettynumber += "-(%s)" % phonenumber[3:6]
-			if 6 < len(phonenumber):
-				prettynumber += "-%s" % phonenumber[6:9]
-				if 9 < len(phonenumber):
-					prettynumber += "-%s" % phonenumber[9:]
-		return prettynumber
-	elif len(phonenumber) <= 7:
-		prettynumber = "%s-%s" % (phonenumber[0:3], phonenumber[3:])
-	elif len(phonenumber) > 8 and phonenumber[0] == "1":
-		prettynumber = "1 (%s)-%s-%s" % (phonenumber[1:4], phonenumber[4:7], phonenumber[7:])
-	elif len(phonenumber) > 7:
-		prettynumber = "(%s)-%s-%s" % (phonenumber[0:3], phonenumber[3:6], phonenumber[6:])
-	return prettynumber
 
-
-class AliasingMixin(telepathy.server.ConnectionInterfaceAliasing):
+class AliasingMixin(tp.ConnectionInterfaceAliasing):
 
 	def __init__(self):
-		telepathy.server.ConnectionInterfaceAliasing.__init__(self)
+		tp.ConnectionInterfaceAliasing.__init__(self)
 
 	@property
 	def session(self):
@@ -71,12 +101,11 @@ class AliasingMixin(telepathy.server.ConnectionInterfaceAliasing):
 		"""
 		raise NotImplementedError("Abstract property called")
 
-	@property
-	def handle(self):
+	def handle(self, handleType, handleId):
 		"""
 		@abstract
 		"""
-		raise NotImplementedError("Abstract property called")
+		raise NotImplementedError("Abstract function called")
 
 	@gtk_toolbox.log_exception(_moduleLogger)
 	def GetAliasFlags(self):
@@ -100,32 +129,39 @@ class AliasingMixin(telepathy.server.ConnectionInterfaceAliasing):
 	@gtk_toolbox.log_exception(_moduleLogger)
 	def SetAliases(self, aliases):
 		_moduleLogger.debug("Called SetAliases")
-
 		# first validate that no other handle types are included
-		userHandleAndAlias = None
 		for handleId, alias in aliases.iteritems():
-			h = self.handle(telepathy.HANDLE_TYPE_CONTACT, handleId)
-			if not isinstance(h, handle.ConnectionHandle):
-				raise telepathy.PermissionDenied("No user customizable aliases")
-			userHandleAndAlias = h, alias
-		if userHandleAndAlias is None:
-			_moduleLogger.debug("No user handle")
-			return
+			h = self.get_handle_by_id(telepathy.HANDLE_TYPE_CONTACT, handleId)
+			if isinstance(h, handle.ConnectionHandle):
+				break
+		else:
+			raise telepathy.errors.PermissionDenied("No user customizable aliases")
+
+		uglyNumber = util_misc.normalize_number(alias)
+		if len(uglyNumber) == 0:
+			# Reset to the original from login if one was provided
+			uglyNumber = self.callbackNumberParameter
+		if not util_misc.is_valid_number(uglyNumber):
+			raise telepathy.errors.InvalidArgument("Invalid phone number %r" % (uglyNumber, ))
 
 		# Update callback
-		uglyNumber = handle.strip_number(userHandleAndAlias[1])
 		self.session.backend.set_callback_number(uglyNumber)
 
 		# Inform of change
-		changedAliases = (userHandleAndAlias, )
+		userAlias = make_pretty(uglyNumber)
+		changedAliases = ((handleId, userAlias), )
 		self.AliasesChanged(changedAliases)
 
 	def _get_alias(self, handleId):
-		h = self.handle(telepathy.HANDLE_TYPE_CONTACT, handleId)
+		h = self.get_handle_by_id(telepathy.HANDLE_TYPE_CONTACT, handleId)
 		if isinstance(h, handle.ConnectionHandle):
-			callbackNumber = self.session.backend.get_callback_number()
-			userAlias = make_pretty(callbackNumber)
+			aliasNumber = self.session.backend.get_callback_number()
+			userAlias = make_pretty(aliasNumber)
 			return userAlias
 		else:
-			contactAlias = self.session.addressbook.get_contact_name(h.contactID)
+			number = h.phoneNumber
+			if number:
+				contactAlias = self.session.addressbook.get_contact_name(number)
+			else:
+				contactAlias = make_pretty(number)
 			return contactAlias