theme: Update flag

2 files changed, 17 insertions, 16 deletions

diff --git a/pywal/__main__.py b/pywal/__main__.py
index 2857ae3..09d0769 100644
--- a/pywal/__main__.py
+++ b/pywal/__main__.py
@@ -41,17 +41,17 @@ def get_args(args):
                      help="Which color backend to use.",
                      const="list_backends", type=str, nargs="?", default="wal")
 
+    arg.add_argument("--theme", metavar="/path/to/file or theme_name",
+                     help="Which colorscheme file to use. \
+                           Use 'wal -f' to list available builtin themes.",
+                     const="list_themes", nargs="?")
+
     arg.add_argument("-c", action="store_true",
                      help="Delete all cached colorschemes.")
 
     arg.add_argument("-i", metavar="\"/path/to/img.jpg\"",
                      help="Which image or directory to use.")
 
-    arg.add_argument("-f", metavar="/path/to/colorscheme/file or theme_name",
-                     help="Which colorscheme file to use. \
-                           Use 'wal -f' to list available builtin themes.",
-                     const="list_themes", nargs="?")
-
     arg.add_argument("-g", action="store_true",
                      help="Generate an oomox theme.")
 
@@ -96,7 +96,7 @@ def process_args(args):
               "       Refer to \"wal -h\" for more info.")
         sys.exit(1)
 
-    if args.i and args.f:
+    if args.i and args.theme:
         print("error: Conflicting arguments -i and -f.\n"
               "       Refer to \"wal -h\" for more info.")
         sys.exit(1)
@@ -109,14 +109,15 @@ def process_args(args):
         reload.colors()
         sys.exit(0)
 
-    if args.f == "list_themes":
-        themes = [theme.name.replace(".json", "") for theme in theme.index()]
-        print("Themes:", ", ".join(themes))
-        print("Extra: 'random (select a random theme)'")
+    if args.theme == "list_themes":
+        themes = [theme.name.replace(".json", "")
+                  for theme in theme.list_themes()]
+        print("Themes:", themes)
+        print("Extra: 'random' (select a random theme)")
         sys.exit(0)
 
     if args.backend == "list_backends":
-        print("Available backends:", colors.list_backends())
+        print("Backends:", colors.list_backends())
         sys.exit(0)
 
     if args.q:
@@ -139,8 +140,8 @@ def process_args(args):
         image_file = image.get(args.i)
         colors_plain = colors.get(image_file, args.l, args.backend)
 
-    if args.f:
-        colors_plain = theme.file(args.f)
+    if args.theme:
+        colors_plain = theme.file(args.theme)
 
     if args.a:
         util.Color.alpha_num = args.a
@@ -150,7 +151,7 @@ def process_args(args):
         colors_plain["special"]["background"] = args.b
         colors_plain["colors"]["color0"] = args.b
 
-    if args.i or args.f:
+    if args.i or args.theme:
         if not args.n:
             wallpaper.change(colors_plain["wallpaper"])
 
diff --git a/pywal/theme.py b/pywal/theme.py
index 6d0acdc..a049ad2 100644
--- a/pywal/theme.py
+++ b/pywal/theme.py
@@ -9,7 +9,7 @@ from .settings import CONF_DIR, MODULE_DIR
 from . import util
 
 
-def index():
+def list_themes():
     """List all installed theme files."""
     return [*os.scandir(os.path.join(CONF_DIR, "colorschemes")),
             *os.scandir(os.path.join(MODULE_DIR, "colorschemes"))]
@@ -46,7 +46,7 @@ def file(input_file):
         theme_file = user_theme_file
 
     elif input_file == "random":
-        themes = [theme.path for theme in index()]
+        themes = [theme.path for theme in list_themes()]
         random.shuffle(themes)
         theme_file = themes[0]