Merge pull request #409 from vtexier/dev

fix some crashes
duniter · Apr 21, 2016 · 8d82882 · 8d82882
2 parents 26173b1 + c6ddd5f
commit 8d82882
Show file tree

Hide file tree

Showing 9 changed files with 5,056 additions and 2,015 deletions.
diff --git a/res/i18n/ts/de_DE.ts b/res/i18n/ts/de_DE.ts
diff --git a/res/i18n/ts/es_ES.ts b/res/i18n/ts/es_ES.ts
diff --git a/res/i18n/ts/fr_FR.ts b/res/i18n/ts/fr_FR.ts
diff --git a/res/i18n/ts/it_IT.ts b/res/i18n/ts/it_IT.ts
diff --git a/res/i18n/ts/pl_PL.ts b/res/i18n/ts/pl_PL.ts
diff --git a/res/i18n/ts/pt_BR.ts b/res/i18n/ts/pt_BR.ts
diff --git a/res/i18n/ts/ru_RU.ts b/res/i18n/ts/ru_RU.ts
diff --git a/src/sakia/core/registry/identity.py b/src/sakia/core/registry/identity.py
@@ -246,7 +246,7 @@ async def published_uid(self, community):
                         if person_uid == self.uid:
                             return True
         except errors.UcoinError as e:
-            if e.ucode in (errors.NO_MATCHING_IDENTITY):
+            if e.ucode in (errors.NO_MATCHING_IDENTITY, errors.NO_MEMBER_MATCHING_PUB_OR_UID):
                 logging.debug("Lookup error : {0}".format(str(e)))
         except NoPeerAvailable as e:
             logging.debug(str(e))

diff --git a/src/sakia/gui/process_cfg_community.py b/src/sakia/gui/process_cfg_community.py
@@ -6,6 +6,7 @@
 
 import logging
 import asyncio
+
 import aiohttp
 
 from ucoinpy.api import errors
@@ -65,6 +66,7 @@ async def check_guest(self, checked=False):
         server = self.config_dialog.lineedit_server.text()
         port = self.config_dialog.spinbox_port.value()
         logging.debug("Is valid ? ")
+        self.config_dialog.label_error.setText(self.tr("connecting..."))
         try:
             self.node = await Node.from_address(None, server, port, session=aiohttp.ClientSession())
             community = Community.create(self.node)
@@ -78,12 +80,15 @@ async def check_guest(self, checked=False):
             self.config_dialog.label_error.setText(str(e))
         #except (MalformedDocumentError, ValueError) as e:
         #    self.config_dialog.label_error.setText(str(e))
+        except aiohttp.errors.TimeoutError:
+            self.config_dialog.label_error.setText(self.tr("Could not connect. Check hostname, ip address or port"))
 
     @asyncify
     async def check_connect(self, checked=False):
         server = self.config_dialog.lineedit_server.text()
         port = self.config_dialog.spinbox_port.value()
         logging.debug("Is valid ? ")
+        self.config_dialog.label_error.setText(self.tr("connecting..."))
         try:
             self.node = await Node.from_address(None, server, port, session=aiohttp.ClientSession())
             community = Community.create(self.node)
@@ -108,12 +113,15 @@ async def check_connect(self, checked=False):
             self.config_dialog.label_error.setText(str(e))
         except NoPeerAvailable:
             self.config_dialog.label_error.setText(self.tr("Could not connect. Check node peering entry"))
+        except aiohttp.errors.TimeoutError:
+            self.config_dialog.label_error.setText(self.tr("Could not connect. Check hostname, ip address or port"))
 
     @asyncify
     async def check_register(self, checked=False):
         server = self.config_dialog.lineedit_server.text()
         port = self.config_dialog.spinbox_port.value()
         logging.debug("Is valid ? ")
+        self.config_dialog.label_error.setText(self.tr("connecting..."))
         try:
             session = aiohttp.ClientSession()
             self.node = await Node.from_address(None, server, port, session=session)
@@ -152,6 +160,8 @@ async def check_register(self, checked=False):
             self.config_dialog.label_error.setText(str(e))
         except NoPeerAvailable:
             self.config_dialog.label_error.setText(self.tr("Could not connect. Check node peering entry"))
+        except aiohttp.errors.TimeoutError:
+            self.config_dialog.label_error.setText(self.tr("Could not connect. Check hostname, ip address or port"))
 
     def is_valid(self):
         return self.node is not None