From d51d598ac11a3e7a4405c865c6c37a5eaef91b31 Mon Sep 17 00:00:00 2001
From: Daniel Langbein <daniel@systemli.org>
Date: Sun, 22 May 2022 14:32:35 +0200
Subject: [PATCH] fix get_current_orientation

---
 rotate-screen.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/rotate-screen.py b/rotate-screen.py
index c81e5b8..82a135d 100644
--- a/rotate-screen.py
+++ b/rotate-screen.py
@@ -69,13 +69,18 @@ def get_current_orientation(screen: str):
     - stdout includes line: eDP connected primary 2880x1620+0+0 (0x55) normal (normal left inverted right x axis y axis) 344mm x 194mm
     - screen: eDP
     - returns: normal
+
+    Example:
+    - stdout includes line: eDP-1 connected 1920x1280+0+0 (0x46) normal (normal left inverted right x axis y axis) 222mm x 148mm
+    - screen: eDP-1
+    - returns: normal
     """
     stdout = execute(['xrandr', '--query', '--verbose'])
-    pattern = re.compile(rf'^({re.escape(screen)}\s.*)$', flags=re.MULTILINE)
+    # pattern = re.compile(rf'^{re.escape(screen)} .* \([^\)]+\) (\S+) \([^\)]+\) .*$', flags=re.MULTILINE)
+    pattern = re.compile(rf'^{re.escape(screen)} connected [^\(]+ \([^\)]+\) (\S+) \([^\)]+\) [^\(]+$', flags=re.MULTILINE)
     match = pattern.search(stdout)
     if match is None: raise Exception(f'Did not find screen {screen} in stdout:\n{stdout}')
-    line = match.group(1)
-    return line.rsplit()[5]
+    return match.group(1)
 
 
 def is_connected(screen: str):