Parse a little more

xrandroll/monitor.py

@@ -43,8 +43,8 @@ class Mode:
         self.data = data
         self.header = data[0]
         self.name = parse.search("({mode_name})", self.header)["mode_name"]
-        self.res_x = parse.search("h: width {res_x:d}", data[1])["res_x"]
-        self.res_y = parse.search("v: height {res_y:d}", data[2])["res_y"]
+        self.res_x = parse.search("h: width{:s}{res_x:d}", data[1])["res_x"]
+        self.res_y = parse.search("v: height{:s}{res_y:d}", data[2])["res_y"]
         self.refresh = parse.search("{refresh:f}Hz", data[2])["refresh"]
         self.preferred = "+preferred" in self.header
         self.current = "*current" in self.header
@@ -64,6 +64,8 @@ class Monitor:
 
         self.header = data.pop(0)
         self.pos_x, self.pos_y = parse.search("+{:d}+{:d}", self.header)
+        self.output = parse.search("{}{:s}", self.header)[0]
+
         modes_data = _split_by_lines_matching("^  [^ ]", data)
         fields_data = _split_by_lines_matching(r"^\t[^ ]", modes_data.pop(0))
 
@@ -75,6 +77,9 @@ class Monitor:
         for f in (Field(d) for d in fields_data):
             self.fields[f.name] = f
 
+    def __repr__(self):
+        return f"Monitor: {self.output}"
+
     def get_current_mode_name(self):
         for k, v in self.modes.values():
             if v.current:

xrandroll/xrandr.py

@@ -9,16 +9,17 @@ def read_data():
     data = subprocess.check_output(
         ["xrandr", "--verbose"], encoding="utf-8"
     ).splitlines()
+    return data
+
+
+def parse_data(data):
     # Going to pretend there can only be one screen because life is short.
     screen = _split_by_lines_matching("^Screen ", data)[0]
 
     result = []
     for monitor_data in _split_by_lines_matching(r"^[^ \t].*", screen[1:]):
         result.append(Monitor(monitor_data))
-
-
-def parse_data(data):
-    print(data)
+    return result
 
 
 if __name__ == "__main__":