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

Avahi hostname choice extracted for reuse

Browse Source
This commit is contained in:
David Eisner 2013-11-05 11:07:35 +00:00
parent e9173ae81f
commit c4281339b6
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,14 +43,11 @@ class MpdFrontend(pykka.ThreadingActor, CoreListener):
try: try:
if self.config['mpd']['zeroconf_enabled']: if self.config['mpd']['zeroconf_enabled']:
name = self.config['mpd']['zeroconf_name'] name = self.config['mpd']['zeroconf_name']
import re
lo = re.search('(?<![.\d])(127|0)[.]', self.hostname)
hostname = "" if lo else self.hostname
from mopidy.utils.zeroconf import Zeroconf from mopidy.utils.zeroconf import Zeroconf
self.service = Zeroconf( self.service = Zeroconf(
stype="_mpd._tcp", stype="_mpd._tcp",
name=name, port=self.port, host=hostname) name=name, port=self.port, host=self.hostname)
self.service.publish() self.service.publish()
logger.info('Registered with Avahi as %s', name) logger.info('Registered with Avahi as %s', name)

6
mopidy/utils/zeroconf.py
View File

@ -18,9 +18,13 @@ class Zeroconf:
self.name = name self.name = name
self.stype = stype self.stype = stype
self.domain = domain self.domain = domain
self.host = host
self.port = port self.port = port
self.text = text self.text = text
# Let avahi choose how to advertise services
# listening on lo and meta addresses
import re
lo = re.search('(?<![.\d])(127|0)[.]', host)
self.host = "" if lo else host
def publish(self): def publish(self):
bus = dbus.SystemBus() bus = dbus.SystemBus()