Deprecate multi-character cli switches

deepfakes · Apr 5, 2024 · 95b4431 · 95b4431
1 parent 64a7b58
commit 95b4431
Show file tree

Hide file tree

Showing 99 changed files with 7,978 additions and 6,338 deletions.
diff --git a/docs/full/lib/gui.rst b/docs/full/lib/gui.rst
@@ -111,6 +111,13 @@ menu module
    :undoc-members:
    :show-inheritance:
 
+options module
+==============
+.. automodule:: lib.gui.options
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
 popup_configure module
 ======================
 .. automodule:: lib.gui.popup_configure

diff --git a/faceswap.py b/faceswap.py
@@ -10,6 +10,8 @@
     os.environ["LANG"], _ = locale.getdefaultlocale()
 
 from lib.cli import args as cli_args  # pylint:disable=wrong-import-position
+from lib.cli.args_train import TrainArgs  # pylint:disable=wrong-import-position
+from lib.cli.args_extract_convert import ConvertArgs, ExtractArgs  # noqa:E501 pylint:disable=wrong-import-position
 from lib.config import generate_configs  # pylint:disable=wrong-import-position
 
 # LOCALES
@@ -41,11 +43,11 @@ def _main() -> None:
     generate_configs()
 
     subparser = _PARSER.add_subparsers()
-    cli_args.ExtractArgs(subparser, "extract", _("Extract the faces from pictures or a video"))
-    cli_args.TrainArgs(subparser, "train", _("Train a model for the two faces A and B"))
-    cli_args.ConvertArgs(subparser,
-                         "convert",
-                         _("Convert source pictures or video to a new one with the face swapped"))
+    ExtractArgs(subparser, "extract", _("Extract the faces from pictures or a video"))
+    TrainArgs(subparser, "train", _("Train a model for the two faces A and B"))
+    ConvertArgs(subparser,
+                "convert",
+                _("Convert source pictures or video to a new one with the face swapped"))
     cli_args.GuiArgs(subparser, "gui", _("Launch the Faceswap Graphical User Interface"))
     _PARSER.set_defaults(func=_bad_args)
     arguments = _PARSER.parse_args()

diff --git a/lib/cli/args.py b/lib/cli/args.py
diff --git a/lib/cli/args_extract_convert.py b/lib/cli/args_extract_convert.py
diff --git a/lib/cli/args_train.py b/lib/cli/args_train.py
diff --git a/lib/cli/launcher.py b/lib/cli/launcher.py
@@ -170,7 +170,7 @@ def _test_tkinter(cls) -> None:
             If tkinter cannot be imported
         """
         try:
-            import tkinter  # noqa pylint: disable=unused-import,import-outside-toplevel
+            import tkinter  # noqa pylint:disable=unused-import,import-outside-toplevel
         except ImportError as err:
             logger.error("It looks like TkInter isn't installed for your OS, so the GUI has been "
                          "disabled. To enable the GUI please install the TkInter application. You "

diff --git a/lib/gui/command.py b/lib/gui/command.py
@@ -9,6 +9,7 @@
 from .control_helper import ControlPanel
 from .custom_widgets import Tooltip
 from .utils import get_images, get_config
+from .options import CliOption
 
 logger = logging.getLogger(__name__)
 
@@ -129,7 +130,7 @@ def build_tab(self):
         """ Build the tab """
         logger.debug("Build Tab: '%s'", self.command)
         options = get_config().cli_opts.opts[self.command]
-        cp_opts = [val["cpanel_option"] for key, val in options.items() if key != "helptext"]
+        cp_opts = [val.cpanel_option for val in options.values() if isinstance(val, CliOption)]
         ControlPanel(self,
                      cp_opts,
                      label_width=16,