Merge lp:~laney/unity-lens-photos/handle-libaccounts-failure into lp:unity-lens-photos

[Iain Lane]

We need to handle failure to open the accounts database otherwise the lens crashes. This code seems to be mostly duplicated between scopes already.

Perhaps some refactoring to attempt the DB opening sooner could make us return earlier, freeing up resources in the case where it fails.

(I also noticed quite a few unused imports that you may want to clean up).

[David Callé (davidc3)]

Looking good. Thanks Iain.

I will push some cleaning in another branch.

review: Approve

=== modified file 'src/facebook_scope.py'
--- src/facebook_scope.py	2012-09-27 09:21:29 +0000
+++ src/facebook_scope.py	2012-10-11 16:57:43 +0000
@@ -93,7 +93,11 @@
     def _get_accounts_for_service (self, service):
         """Get online accounts matching the scope service"""
         self._accounts = []
-        self._account_manager = Accounts.Manager.new_for_service_type("sharing")
+        try:
+            self._account_manager = Accounts.Manager.new_for_service_type("sharing")
+        except TypeError as e:
+            print ("Error (facebook): Unable to initialise accounts manager: %s" % e)
+            return
         self._account_manager.connect("enabled-event", self._on_enabled_event)
         self._account_manager.connect("account-deleted", self._on_deleted_event)
         for account_service in self._account_manager.get_enabled_account_services():
 
=== modified file 'src/flickr_scope.py'
--- src/flickr_scope.py	2012-09-27 08:45:38 +0000
+++ src/flickr_scope.py	2012-10-11 16:57:43 +0000
@@ -94,7 +94,11 @@
     def _get_accounts_for_service (self, service):
         """Get online accounts matching the scope service"""
         self._accounts = []
-        self._account_manager = Accounts.Manager.new_for_service_type("sharing")
+        try:
+            self._account_manager = Accounts.Manager.new_for_service_type("sharing")
+        except TypeError as e:
+            print ("Error (flickr): Unable to initialise accounts manager: %s" % e)
+            return
         self._account_manager.connect("enabled-event", self._on_enabled_event)
         self._account_manager.connect("account-deleted", self._on_deleted_event)
         for account_service in self._account_manager.get_enabled_account_services():
 
=== modified file 'src/picasa_scope.py'
--- src/picasa_scope.py	2012-09-27 08:47:07 +0000
+++ src/picasa_scope.py	2012-10-11 16:57:43 +0000
@@ -76,7 +76,11 @@
     def _get_accounts_for_service (self, service):
         """Get online accounts matching the scope service"""
         self._accounts = []
-        self._account_manager = Accounts.Manager.new_for_service_type("sharing")
+        try:
+            self._account_manager = Accounts.Manager.new_for_service_type("sharing")
+        except TypeError as e:
+            print ("Error (google): Unable to initialise accounts manager: %s" % e)
+            return
         self._account_manager.connect("enabled-event", self._on_enabled_event)
         self._account_manager.connect("account-deleted", self._on_deleted_event)
         for account_service in self._account_manager.get_enabled_account_services():