revpi/revpicommander
1
0
Fork 0
mirror of https://github.com/naruxde/revpicommander.git synced 2025-11-08 16:43:53 +01:00
Code Issues Packages Releases Wiki Activity

Get AVAHI IPv4 addresses with service_info

Browse Source
This commit is contained in:
Sven Sager
2021-04-10 15:42:04 +02:00
parent bf1c5e6e5d
commit 9f8409f375
7 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.idea/revpicommander.iml generated
View File

@@ -9,4 +9,8 @@
<orderEntry type="jdk" jdkName="Python 3.8" jdkType="Python SDK" /> <orderEntry type="jdk" jdkName="Python 3.8" jdkType="Python SDK" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
</component> </component>
<component name="PackageRequirementsSettings">
<option name="versionSpecifier" value="Greater or equal (&gt;=x.y.z)" />
<option name="removeUnused" value="true" />
</component>
</module> </module>

3
requirements.txt Normal file
View File

@@ -0,0 +1,3 @@
PyQt5>=5.14.1
revpimodio2>=2.5.6
zeroconf>=0.24.4

10
revpicommander/avahisearch.py
View File

@@ -6,10 +6,9 @@ __license__ = "GPLv3"
from os import name as osname from os import name as osname
from re import compile from re import compile
from socket import gethostbyname
from PyQt5 import QtCore, QtGui, QtWidgets from PyQt5 import QtCore, QtGui, QtWidgets
from zeroconf import ServiceBrowser, Zeroconf from zeroconf import IPVersion, ServiceBrowser, Zeroconf
import helper import helper
import proginit as pi import proginit as pi
@@ -62,11 +61,8 @@ class AvahiSearchThread(QtCore.QThread):
if not info: if not info:
return return
try: for ip in info.parsed_addresses(IPVersion.V4Only):
ip = gethostbyname(info.server) self.added.emit(name, info.server, info.port, conf_type, ip)
except Exception:
ip = self.tr("N/A")
self.added.emit(name, info.server, info.port, conf_type, ip)
def run(self): def run(self):
pi.logger.debug("Started zero conf discovery.") pi.logger.debug("Started zero conf discovery.")

3
revpicommander/debugios.py
View File

@@ -112,7 +112,8 @@ class DebugIos(QtWidgets.QMainWindow, Ui_win_debugios):
self.splitter.setSizes([1, 1]) self.splitter.setSizes([1, 1])
def _create_widget(self, name: str, byte_length: int, bit_address: int, byteorder: str, signed: bool, read_only: bool): def _create_widget(
self, name: str, byte_length: int, bit_address: int, byteorder: str, signed: bool, read_only: bool):
"""Create widget in functions address space to use lambda functions.""" """Create widget in functions address space to use lambda functions."""
if bit_address >= 0: if bit_address >= 0:
val = QtWidgets.QCheckBox() val = QtWidgets.QCheckBox()

4
revpicommander/revpicommander.py
View File

@@ -477,8 +477,8 @@ class RevPiCommander(QtWidgets.QMainWindow, Ui_win_revpicommander):
if __name__ == "__main__": if __name__ == "__main__":
import sys import sys
#QtWidgets.QApplication.setAttribute(QtCore.Qt.AA_EnableHighDpiScaling, True) # QtWidgets.QApplication.setAttribute(QtCore.Qt.AA_EnableHighDpiScaling, True)
#QtWidgets.QApplication.setAttribute(QtCore.Qt.AA_UseHighDpiPixmaps, True) # QtWidgets.QApplication.setAttribute(QtCore.Qt.AA_UseHighDpiPixmaps, True)
app = QtWidgets.QApplication(sys.argv) app = QtWidgets.QApplication(sys.argv)

1
revpicommander/revpilogfile.py
View File

@@ -20,7 +20,6 @@ class LogType(IntEnum):
class DataThread(QtCore.QThread): class DataThread(QtCore.QThread):
error_detected = QtCore.pyqtSignal(str) error_detected = QtCore.pyqtSignal(str)
line_logged = QtCore.pyqtSignal(LogType, bool, str) line_logged = QtCore.pyqtSignal(LogType, bool, str)

4
revpicommander/revpiprogram.py
View File

@@ -9,7 +9,7 @@ import os
import tarfile import tarfile
import zipfile import zipfile
from shutil import rmtree from shutil import rmtree
from tempfile import mkdtemp, mkstemp from tempfile import mkdtemp
from xmlrpc.client import Binary from xmlrpc.client import Binary
from PyQt5 import QtCore, QtGui, QtWidgets from PyQt5 import QtCore, QtGui, QtWidgets
@@ -174,7 +174,7 @@ class RevPiProgram(QtWidgets.QDialog, Ui_diag_program):
self._load_settings() self._load_settings()
self._apply_acl() self._apply_acl()
return super(RevPiProgram, self).exec() return super(RevPiProgram, self).exec()
def reject(self) -> None: def reject(self) -> None: