Handle additional capabilities parse error - resolves #20

Fix starting controls on first run for the instance where capabilities cannot be parsed. Handle additional capabilities parse error - resolves #20 Fix starting controls on first run for the instance where capabilities cannot be parsed.
digitaltrails · Jun 10, 2022 · bbb5984 · bbb5984
1 parent 450528d
commit bbb5984
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/PKGBUILD b/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=vdu_controls
-pkgver=1.6.4
+pkgver=1.6.5
 pkgrel=1
 pkgdesc="Visual Display Unit virtual control panel"
 arch=('i686' 'x86_64')

diff --git a/README.md b/README.md
@@ -179,6 +179,8 @@ Michael Hamilton\
 
 Version History
 ---------------
+* 1.6.5
+  * Widen handling of pare exceptions for VDU capabilities - catch more exceptions.
 * 1.6.4
   * Wait for system tray to become available (for autostart Plasma Wayland).
   * Enable HiDPI icons (for the bottom toolbar) - fix blurred toolbar icons on up-scaled desktops.

diff --git a/setup.cfg b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = vdu_controls-digitaltrails
-version = 1.6.4
+version = 1.6.5
 author = Michael Hamilton
 author_email = [email protected]
 description = A GUI for controlling Visual Display Units

diff --git a/vdu_controls.py b/vdu_controls.py
@@ -317,7 +317,7 @@
     QSplashScreen, QPushButton, QProgressBar, QComboBox, QSystemTrayIcon, QMenu, QStyle, QTextEdit, QDialog, QTabWidget, \
     QCheckBox, QPlainTextEdit, QGridLayout, QSizePolicy, QAction, QMainWindow, QToolBar, QToolButton
 
-VDU_CONTROLS_VERSION = '1.6.4'
+VDU_CONTROLS_VERSION = '1.6.5'
 
 
 def proper_name(*args):
@@ -498,7 +498,7 @@ def translate(source_text: str):
 without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  
 """
-
+ASSUMED_CONTROLS_CONFIG_VCP_CODES = ['10', '12']
 ASSUMED_CONTROLS_CONFIG_TEXT = ('\n'
                                 'capabilities-override = Model: unknown\n'
                                 '	MCCS version: 2.2\n'
@@ -1053,6 +1053,7 @@ def __init__(self, vdu_id: str, vdu_model_name: str, vdu_serial: str, manufactur
             if ignore_monitor:
                 self.capabilities_text = ''
             elif assume_standard_controls:
+                self.enabled_vcp_codes = ASSUMED_CONTROLS_CONFIG_VCP_CODES
                 self.capabilities_text = ASSUMED_CONTROLS_CONFIG_TEXT
             else:
                 self.capabilities_text = ddcutil.query_capabilities(vdu_id)

diff --git a/vdu_controls.spec b/vdu_controls.spec
@@ -17,7 +17,7 @@
 #
 
 Name: vdu_controls
-Version: 1.6.4
+Version: 1.6.5
 Release: 0
 License: GPL-3.0-or-later
 BuildArch: noarch
@@ -84,6 +84,8 @@ gzip -c docs/_build/man/vdu_controls.1 > %{buildroot}/%{_datadir}/man/man1/%{nam
 %{_datadir}/man/man1/%{name}.1.gz
 
 %changelog
+* Sat Jun 11 2022 Michael Hamilton <[email protected]>
+- Widen handling of pare exceptions for VDU capabilities - catch more exceptions : vdu_controls 1.6.5
 * Wed Apr 13 2022 Michael Hamilton <[email protected]>
 - Wayland wait for system tray at login. Enable HiDPI icons : vdu_controls 1.6.4
 * Sun Apr 10 2022 Michael Hamilton <[email protected]>