raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Extract filtering to make things more testable

Browse Source
This commit is contained in:
Raoul Snyman 2019-07-02 16:00:27 -07:00
parent f0b6a723e3
commit f27e4f8821
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
openlp/core/api/zeroconf.py
View File

@ -92,6 +92,19 @@ class ZeroconfWorker(ThreadWorker):
self._can_run = False self._can_run = False
def filter_interfaces():
"""
Return a list of interfaces filtered down to valid interfaces
"""
all_interfaces = get_local_ip4()
interfaces = {}
for name, interface in all_interfaces.items():
log.debug('Interface {name}: {interface}'.format(name=name, interface=interface))
if not INTERFACE_FILTER.search(name):
interfaces[name] = interface
return interfaces
def start_zeroconf(): def start_zeroconf():
""" """
Start the Zeroconf service Start the Zeroconf service
@ -101,9 +114,6 @@ def start_zeroconf():
return return
http_port = Settings().value('api/port') http_port = Settings().value('api/port')
ws_port = Settings().value('api/websocket port') ws_port = Settings().value('api/websocket port')
for name, interface in get_local_ip4().items(): for name, interface in filter_interfaces().items():
log.debug('Interface {name}: {interface}'.format(name=name, interface=interface)) worker = ZeroconfWorker(interface['ip'], http_port, ws_port)
if not INTERFACE_FILTER.search(name): run_thread(worker, 'api_zeroconf_{name}'.format(name=name))
# Only advertise on real interfaces
worker = ZeroconfWorker(interface['ip'], http_port, ws_port)
run_thread(worker, 'api_zeroconf_{name}'.format(name=name))