From 46b6c1bd563a44848cbbc0cff77877fc2023b090 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asger=20Geel=20Weirs=C3=B8e?= Date: Thu, 12 Nov 2020 14:55:47 +0100 Subject: [PATCH] Fixed bug with how the output is detected, and minor spelling fixes --- pi3/smart_workspace.py | 8 ++++---- setup.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pi3/smart_workspace.py b/pi3/smart_workspace.py index ccaef06..371c0dc 100644 --- a/pi3/smart_workspace.py +++ b/pi3/smart_workspace.py @@ -25,7 +25,7 @@ class WorkSpacer: self.config = self.i3.get_config().__dict__['config'] config_outputs = {} for matchNo, match in enumerate( - re.finditer(r'set (\$[a-zA-Z]+) ((HDMI|DP|VGA|eDP)(-|)\d)', self.config, re.MULTILINE), start=1 + re.finditer(r'set (\$[a-zA-Z]+) ((HDMI|DP|VGA|eDP)(-|)(\d|$))', self.config, re.MULTILINE), start=1 ): config_outputs[match.group(1)] = match.group(2) config_workspace_names = {} @@ -97,13 +97,13 @@ def main(): required_group = parser.add_argument_group('Required', '') required_group.add_argument("-i", "--index", type=int, required=True, - help="the number index of the workspace that should be openend. 1 = first workspace in config etc.") + help="The indexed workspace for the output where the cursor is currently located") shift_group = parser.add_argument_group('Shift', 'manipulate the active window') shift_group.add_argument("-s", "--shift", action='store_true', - help="if present, moves the current active window to target workspace") + help="Moves the active window to the index workspace") shift_group.add_argument('-k', '--keep-with-it', action='store_true', - help='if present, moves with the ') + help='Moves the active window to the index workspace, and moves with it') # pprint.pprint(parser.parse_args().__dict__) WorkSpacer(parser.parse_args()).run() diff --git a/setup.py b/setup.py index 80a95b6..374839b 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ with open('README.rst', 'r') as fh: setup( name='pi3-smart-workspace', - version='0.1.5', + version='0.1.6', packages=['pi3'], url='https://github.com/GeneralDenmark/PyOutputHandler', license='Apache-2.0 License ',