From: Phillip Berndt <phillip.berndt@googlemail.com>
Date: Thu, 16 Dec 2021 08:52:19 +0000 (+0100)
Subject: Merge --cycle option (needs work)
X-Git-Tag: 1.12~11
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=9a023ca0fa8fd7a12a99e8852a063266bf49f078;hp=-c;p=deb_pkgs%2Fautorandr.git

Merge --cycle option (needs work)
---

9a023ca0fa8fd7a12a99e8852a063266bf49f078
diff --combined autorandr.py
index c9c4f16,0581f57..9f1f557
--- a/autorandr.py
+++ b/autorandr.py
@@@ -1,4 -1,4 +1,4 @@@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3
  # encoding: utf-8
  #
  # autorandr.py
@@@ -39,14 -39,10 +39,14 @@@ import tim
  import glob
  
  from collections import OrderedDict
 -from distutils.version import LooseVersion as Version
  from functools import reduce
  from itertools import chain
  
 +try:
 +    from packaging.version import Version
 +except ModuleNotFoundError:
 +    from distutils.version import LooseVersion as Version
 +
  if sys.version_info.major == 2:
      import ConfigParser as configparser
  else:
@@@ -80,12 -76,12 +80,13 @@@ Usage: autorandr [options
  --batch                 run autorandr for all users with active X11 sessions
  --current               only list current (active) configuration(s)
  --config                dump your current xrandr setup
+ --cycle                 automatically load the next detected profile
  --debug                 enable verbose output
  --detected              only list detected (available) configuration(s)
  --dry-run               don't change anything, only print the xrandr commands
  --fingerprint           fingerprint your current hardware setup
  --force                 force (re)loading of a profile / overwrite exiting files
 +--list                  list configurations
  --skip-options <option> comma separated list of xrandr arguments (e.g. "gamma")
                          to skip both in detecting changes and applying a profile
  --version               show version information and exit
@@@ -1214,9 -1210,9 +1215,9 @@@ def read_config(options, directory)
  def main(argv):
      try:
          opts, args = getopt.getopt(argv[1:], "s:r:l:d:cfh",
-                                    ["batch", "dry-run", "change", "default=", "save=", "remove=", "load=",
+                                    ["batch", "dry-run", "change", "cycle", "default=", "save=", "remove=", "load=",
                                      "force", "fingerprint", "config", "debug", "skip-options=", "help",
 -                                    "current", "detected", "version"])
 +                                    "list", "current", "detected", "version"])
      except getopt.GetoptError as e:
          print("Failed to parse options: {0}.\n"
                "Use --help to get usage information.".format(str(e)),
@@@ -1375,10 -1371,11 +1376,11 @@@
          best_index = 9999
          for profile_name in profiles.keys():
              if profile_blocked(os.path.join(profile_path, profile_name), block_script_metadata):
 -                if "--current" not in options and "--detected" not in options:
 +                if not any(opt in options for opt in ("--current", "--detected", "--list")):
                      print("%s (blocked)" % profile_name)
                  continue
              props = []
+             is_current_profile = profile_name in current_profiles
              if profile_name in detected_profiles:
                  if len(detected_profiles) == 1:
                      index = 1
@@@ -1386,16 -1383,17 +1388,17 @@@
                  else:
                      index = detected_profiles.index(profile_name) + 1
                      props.append("(detected) (%d%s match)" % (index, ["st", "nd", "rd"][index - 1] if index < 4 else "th"))
-                 if ("-c" in options or "--change" in options) and index < best_index:
-                     load_profile = profile_name
-                     best_index = index
+                 if index < best_index:
+                     if "-c" in options or "--change" in options or ("--cycle" in options and not is_current_profile):
+                         load_profile = profile_name
+                         best_index = index
              elif "--detected" in options:
                  continue
-             if profile_name in current_profiles:
+             if is_current_profile:
                  props.append("(current)")
              elif "--current" in options:
                  continue
 -            if "--current" in options or "--detected" in options:
 +            if any(opt in options for opt in ("--current", "--detected", "--list")):
                  print("%s" % (profile_name, ))
              else:
                  print("%s%s%s" % (profile_name, " " if props else "", " ".join(props)))
@@@ -1404,7 -1402,7 +1407,7 @@@
  
      if "-d" in options:
          options["--default"] = options["-d"]
-     if not load_profile and "--default" in options and ("-c" in options or "--change" in options):
+     if not load_profile and "--default" in options and ("-c" in options or "--change" in options or "--cycle" in options):
          load_profile = options["--default"]
  
      if load_profile: