Simplified bonjour contact layout

34bef2b0 · Dan Pascu · e99740bf · 34bef2b0
Commit 34bef2b0 authored Jul 05, 2013 by Dan Pascu
Hide whitespace changes
Inline Side-by-side

Showing with 26 additions and 6 deletions

contacts.py blink/contacts.py +26 -6

No files found.
--- a/blink/contacts.py
+++ b/blink/contacts.py
@@ -995,12 +995,22 @@ class Contact(object):
            return self.settings.name
    @property
-    def uris(self):
+    def location(self):
-        return self.settings.uris
+        if isinstance(self.settings, BonjourNeighbour):
+            return self.settings.hostname
+        else:
+            return None
    @property
    def info(self):
-        return self.note or self.uri
+        if isinstance(self.settings, BonjourNeighbour):
+            return self.note or '@' + self.uri.host
+        else:
+            return self.note or self.uri
+    @property
+    def uris(self):
+        return self.settings.uris
    @property
    def uri(self):
@@ -1125,12 +1135,22 @@ class ContactDetail(object):
            return self.settings.name
    @property
-    def uris(self):
+    def location(self):
-        return self.settings.uris
+        if isinstance(self.settings, BonjourNeighbour):
+            return self.settings.hostname
+        else:
+            return None
    @property
    def info(self):
-        return self.note or self.uri
+        if isinstance(self.settings, BonjourNeighbour):
+            return self.note or '@' + self.uri.host
+        else:
+            return self.note or self.uri
+    @property
+    def uris(self):
+        return self.settings.uris
    @property
    def uri(self):