Merge lp:~renatofilho/demo-assets/fix-manage-address-books into lp:demo-assets

[Renato Araujo Oliveira Filho]

Fixed manage-address-books to work with new EDS 3.8.x API.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:41
http://jenkins.qa.ubuntu.com/job/demo-assets-ci/7/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/demo-assets-raring-armhf-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/demo-assets-raring-i386-ci/7

Click here to trigger a rebuild:
http://s-jenkins:8080/job/demo-assets-ci/7/rebuild

review: Approve (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Looks good and works as expected.

review: Approve

=== modified file 'usr/bin/manage-address-books'
--- usr/bin/manage-address-books	2013-05-23 20:29:13 +0000
+++ usr/bin/manage-address-books	2013-07-01 22:54:26 +0000
@@ -37,7 +37,7 @@
 import os.path
 import base64
 
-from gi.repository import EBook, EDataServer, Gio, GLib
+from gi.repository import EBook, EBookContacts, EDataServer, Gio, GLib
 
 address_book_name = "completed-contacts"
 source_uid = None
@@ -93,7 +93,7 @@
 		parts = os.path.splitext(filename)[0].split("_")
 		if int(parts[-1]) == int(facebook_id):
 			f = open("/usr/share/demo-assets/contacts-data/avatars/" + filename, 'rb')
-			p = EBook.ContactPhoto.new()
+			p = EBookContacts.ContactPhoto.new()
 			p.set_mime_type("image/jpeg")
 			p.set_inlined(f.read())
 			contact.set_property("photo", p)
@@ -113,7 +113,7 @@
 	client = EBook.BookClient.new(source_match)
 	client.open_sync(False, None)
 
-	query = EBook.book_query_any_field_contains('')
+	query = EBookContacts.BookQuery.any_field_contains('')
 	success, results = client.get_contacts_sync(query.to_string(), None)
 	if(success and len(results) > 0):
 		print ("Our target addressbook seems to be populated, please first delete contacts before repopulating")
@@ -122,27 +122,27 @@
 	print("just about to create contacts")
 
 	for c in contacts:
-		vcard = EBook.VCard.new_from_string("BEGIN:VCARD\r\nVERSION:2.1\r\nADR;HOME:{};{};{};{};{};{};{}\r\nEND:VCARD".format(c["poBox"], c["extended address"], c["street address"], c["locality"], c["region"], c["postal code"], c["country name"]))
+		vcard = EBookContacts.VCard.new_from_string("BEGIN:VCARD\r\nVERSION:2.1\r\nADR;HOME:{};{};{};{};{};{};{}\r\nEND:VCARD".format(c["poBox"], c["extended address"], c["street address"], c["locality"], c["region"], c["postal code"], c["country name"]))
 
 		# There will always be a name
 		# put it in the link field for the other contacts
-		vcard_attr = EBook.VCardAttribute.new('social-networking-attributes', 'X-FOLKS-WEB-SERVICES-IDS')
-		param = EBook.VCardAttributeParam.new('remote-full-name')
+		vcard_attr = EBookContacts.VCardAttribute.new('social-networking-attributes', 'X-FOLKS-WEB-SERVICES-IDS')
+		param = EBookContacts.VCardAttributeParam.new('remote-full-name')
 		name = c["Name"]
 		param.add_value(name)
 		vcard_attr.add_param(param);
 		if ("FacebookID" in list(c.keys())):
-			param = EBook.VCardAttributeParam.new('facebook-id')
+			param = EBookContacts.VCardAttributeParam.new('facebook-id')
 			param.add_value(c["FacebookID"])
 			vcard_attr.add_param(param)
 		vcard.add_attribute(vcard_attr)
 
 		if c["Favorite"] == "1":
-			vcard_attr = EBook.VCardAttribute.new('', 'X-FOLKS-FAVOURITE')
+			vcard_attr = EBookContacts.VCardAttribute.new('', 'X-FOLKS-FAVOURITE')
 			vcard_attr.add_value("true")
 			vcard.add_attribute(vcard_attr)
 
-		contact = EBook.Contact.new_from_vcard(vcard.to_string(EBook.VCardFormat(1)))
+		contact = EBookContacts.Contact.new_from_vcard(vcard.to_string(EBookContacts.VCardFormat(1)))
 
 		for key,value in list(c.items()):
 			if key == "Name":
@@ -169,25 +169,33 @@
 		client.add_contact_sync(contact, None)
 	ml.quit()
 
-def delete_contacts(source):
-	client = EBook.BookClient.new(source)
+def delete_contacts(source_uid):
+	print("Delete contacts")
+	source_match = source_registry.ref_source(source_uid)
+
+	if(source_match is None):
+		print(("No source match from reg %s", source_uid))
+		sys.exit()
+
+	client = EBook.BookClient.new(source_match)
 	client.open_sync(False, None)
-	if client is None:
-		print("cannot create bookclient!")
-		sys.exit()
-	query = EBook.book_query_any_field_contains('')
+
+	query = EBookContacts.BookQuery.any_field_contains('')
 	success, results = client.get_contacts_sync(query.to_string(), None)
 	if not success:
 		log.error('EDS search for delete all contacts failed')
 		sys.exit()
+
 	print(('Found {} contacts to delete'.format(len(results))))
 	for contact in results:
 		print(('Deleting contact {}'.format(
 		       contact.get_property('full-name'))))
 		client.remove_contact_sync(contact, None)
 
-def create(ml):
-	source_uid = get_source(address_book_name)
+def create(a_book_name, ml):
+	book = address_book_name if a_book_name is None else a_book_name
+	print("create contact on book {}".format(book))
+	source_uid = get_source(book)
 	prep_data()
 	GLib.timeout_add_seconds(2, create_contacts, source_uid, ml)
 
@@ -195,8 +203,7 @@
 	book = address_book_name if a_book_name is None else a_book_name
 	source_uid = get_source(book)
 	print("delete book {}".format(book))
-	source_match = source_registry.ref_source(source_uid)
-	delete_contacts(source_match)
+	delete_contacts(source_uid)
 	ml.quit()
 
 action = sys.argv[1]
@@ -215,7 +222,7 @@
 	GLib.idle_add(delete, book_name, ml)
 
 if action == "create":
-	GLib.idle_add(create, ml)
+	GLib.idle_add(create, book_name, ml)
 
 if action == "test":
 	find_and_set_image_path(None, None, "test")