andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avahi: More review comments and some other fixes.

Browse Source 
- Switched to newstyle class
- Switched to safe values in kwargs
This commit is contained in:
Thomas Adamcik 2013-11-11 22:04:13 +01:00
parent c964d15ac4
commit f03c049485
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mopidy/frontends/mpd/actor.py
View File

@ -43,8 +43,8 @@ class MpdFrontend(pykka.ThreadingActor, CoreListener):
def on_start(self):
if self.config_section['zeroconf']:
self.zeroconf_service = zeroconf.Zeroconf(
stype="_mpd._tcp", name=self.config_section['zeroconf'],
port=self.port, host=self.hostname)
stype='_mpd._tcp', name=self.config_section['zeroconf'],
host=self.hostname, port=self.port)
if self.zeroconf_service.publish():
logger.info('Registered MPD with Zeroconf as "%s"',

24
mopidy/utils/zeroconf.py
View File

@ -28,17 +28,17 @@ def _convert_text_to_dbus_bytes(text):
return [dbus.Byte(ord(c)) for c in text]
class Zeroconf:
"""Publish a network service with zeroconf using Avahi."""
class Zeroconf(object):
"""Publish a network service with Zeroconf using Avahi."""
def __init__(self, name, port, stype="_http._tcp",
domain="", host="", text=[]):
def __init__(self, name, port, stype=None, domain=None,
host=None, text=None):
self.group = None
self.stype = stype
self.domain = domain
self.stype = stype or '_http._tcp'
self.domain = domain or ''
self.port = port
self.text = text
self.host = _filter_loopback_and_meta_addresses(host)
self.text = text or []
self.host = _filter_loopback_and_meta_addresses(host or '')
template = string.Template(name)
self.name = template.safe_substitute(
@ -59,12 +59,12 @@ class Zeroconf:
logger.debug('Zeroconf publish failed: Avahi service not running.')
return False
server = dbus.Interface(bus.get_object("org.freedesktop.Avahi", "/"),
"org.freedesktop.Avahi.Server")
server = dbus.Interface(bus.get_object('org.freedesktop.Avahi', '/'),
'org.freedesktop.Avahi.Server')
self.group = dbus.Interface(
bus.get_object("org.freedesktop.Avahi", server.EntryGroupNew()),
"org.freedesktop.Avahi.EntryGroup")
bus.get_object('org.freedesktop.Avahi', server.EntryGroupNew()),
'org.freedesktop.Avahi.EntryGroup')
text = [_convert_text_to_dbus_bytes(t) for t in self.text]
self.group.AddService(_AVAHI_IF_UNSPEC, _AVAHI_PROTO_UNSPEC,