From f9bcd534d441000770176b70e37e1fec4e3240ac Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Sat, 8 Apr 2023 19:20:22 -0700
Subject: [PATCH] Move ansi code into wk/ui

---
 scripts/wk/__init__.py        | 1 -
 scripts/wk/clone/ddrescue.py  | 4 ++--
 scripts/wk/graph.py           | 2 +-
 scripts/wk/hw/benchmark.py    | 3 ++-
 scripts/wk/hw/cpu.py          | 4 ++--
 scripts/wk/hw/diags.py        | 4 ++--
 scripts/wk/hw/disk.py         | 2 +-
 scripts/wk/hw/sensors.py      | 2 +-
 scripts/wk/hw/smart.py        | 2 +-
 scripts/wk/hw/surface_scan.py | 2 +-
 scripts/wk/hw/system.py       | 2 +-
 scripts/wk/os/linux.py        | 2 +-
 scripts/wk/os/win.py          | 2 +-
 scripts/wk/repairs/win.py     | 4 ++--
 scripts/wk/setup/win.py       | 4 ++--
 scripts/wk/ui/__init__.py     | 1 +
 scripts/wk/{ => ui}/ansi.py   | 0
 scripts/wk/ui/cli.py          | 2 +-
 18 files changed, 22 insertions(+), 21 deletions(-)
 rename scripts/wk/{ => ui}/ansi.py (100%)

diff --git a/scripts/wk/__init__.py b/scripts/wk/__init__.py
index 2a77ed94..afb3e8d5 100644
--- a/scripts/wk/__init__.py
+++ b/scripts/wk/__init__.py
@@ -3,7 +3,6 @@
 
 from sys import stderr, version_info
 
-from . import ansi
 from . import cfg
 from . import clone
 from . import debug
diff --git a/scripts/wk/clone/ddrescue.py b/scripts/wk/clone/ddrescue.py
index 2c8bd568..1bc96cff 100644
--- a/scripts/wk/clone/ddrescue.py
+++ b/scripts/wk/clone/ddrescue.py
@@ -20,7 +20,7 @@ from docopt import docopt
 import psutil
 import pytz
 
-from wk import ansi, cfg, debug, exe, io, log, net, std
+from wk import cfg, debug, exe, io, log, net, std
 from wk.cfg.ddrescue import (
   DDRESCUE_MAP_TEMPLATE,
   DDRESCUE_SETTINGS,
@@ -34,7 +34,7 @@ from wk.hw.smart import (
   update_smart_details,
   )
 from wk.ui import cli as ui
-from wk.ui import tmux
+from wk.ui import ansi, tmux
 
 
 # STATIC VARIABLES
diff --git a/scripts/wk/graph.py b/scripts/wk/graph.py
index 70e26cfb..95324956 100644
--- a/scripts/wk/graph.py
+++ b/scripts/wk/graph.py
@@ -3,7 +3,7 @@
 
 import logging
 
-from wk import ansi
+from wk.ui import ansi
 
 
 # STATIC VARIABLES
diff --git a/scripts/wk/hw/benchmark.py b/scripts/wk/hw/benchmark.py
index 5a33ad88..71a0a465 100644
--- a/scripts/wk/hw/benchmark.py
+++ b/scripts/wk/hw/benchmark.py
@@ -5,7 +5,7 @@ import logging
 
 from subprocess import PIPE, STDOUT
 
-from wk import ansi, graph
+from wk import graph
 from wk.cfg.hw import (
   IO_ALT_TEST_SIZE_FACTOR,
   IO_BLOCK_SIZE,
@@ -22,6 +22,7 @@ from wk.cfg.hw import (
   )
 from wk.exe import run_program
 from wk.std import PLATFORM
+from wk.ui import ansi
 
 
 # STATIC VARIABLES
diff --git a/scripts/wk/hw/cpu.py b/scripts/wk/hw/cpu.py
index deb8f808..18a4bd83 100644
--- a/scripts/wk/hw/cpu.py
+++ b/scripts/wk/hw/cpu.py
@@ -7,11 +7,11 @@ import subprocess
 
 from typing import TextIO
 
-from wk import ansi, exe
+from wk import exe
 from wk.cfg.hw import CPU_FAILURE_TEMP
 from wk.os.mac import set_fans as macos_set_fans
 from wk.std import PLATFORM
-from wk.ui import tmux
+from wk.ui import ansi, tmux
 
 
 # STATIC VARIABLES
diff --git a/scripts/wk/hw/diags.py b/scripts/wk/hw/diags.py
index 0ad9206c..dc214205 100644
--- a/scripts/wk/hw/diags.py
+++ b/scripts/wk/hw/diags.py
@@ -10,7 +10,7 @@ import time
 
 from docopt import docopt
 
-from wk import ansi, cfg, debug, exe, log, std
+from wk import cfg, debug, exe, log, std
 from wk.cfg.hw import STATUS_COLORS
 from wk.hw import benchmark as hw_benchmark
 from wk.hw import cpu as hw_cpu
@@ -26,7 +26,7 @@ from wk.hw.screensavers import screensaver
 from wk.hw.test import Test, TestGroup
 
 from wk.ui import cli as ui
-from wk.ui import tmux
+from wk.ui import ansi, tmux
 
 
 # STATIC VARIABLES
diff --git a/scripts/wk/hw/disk.py b/scripts/wk/hw/disk.py
index bae3e305..31704c8f 100644
--- a/scripts/wk/hw/disk.py
+++ b/scripts/wk/hw/disk.py
@@ -11,7 +11,6 @@ import re
 from dataclasses import dataclass, field
 from typing import Any, Union
 
-from wk import ansi
 from wk.cfg.main import KIT_NAME_SHORT
 from wk.cfg.python import DATACLASS_DECORATOR_KWARGS
 from wk.exe import get_json_from_command, run_program
@@ -21,6 +20,7 @@ from wk.hw.smart import (
   get_known_disk_attributes,
   )
 from wk.std import PLATFORM
+from wk.ui import ansi
 
 
 # STATIC VARIABLES
diff --git a/scripts/wk/hw/sensors.py b/scripts/wk/hw/sensors.py
index f05a628d..815a6de5 100644
--- a/scripts/wk/hw/sensors.py
+++ b/scripts/wk/hw/sensors.py
@@ -9,11 +9,11 @@ import re
 from subprocess import CalledProcessError
 from typing import Any
 
-from wk import ansi
 from wk.cfg.hw import CPU_CRITICAL_TEMP, SMC_IDS, TEMP_COLORS
 from wk.exe import run_program, start_thread
 from wk.io import non_clobber_path
 from wk.std import PLATFORM, sleep
+from wk.ui import ansi
 
 
 # STATIC VARIABLES
diff --git a/scripts/wk/hw/smart.py b/scripts/wk/hw/smart.py
index 88c016ab..6a099701 100644
--- a/scripts/wk/hw/smart.py
+++ b/scripts/wk/hw/smart.py
@@ -7,7 +7,6 @@ import re
 
 from typing import Any
 
-from wk import ansi
 from wk.cfg.hw import (
   ATTRIBUTE_COLORS,
   KEY_NVME,
@@ -20,6 +19,7 @@ from wk.cfg.hw import (
   )
 from wk.exe import get_json_from_command, run_program
 from wk.std import bytes_to_string, sleep
+from wk.ui import ansi
 
 
 # STATIC VARIABLES
diff --git a/scripts/wk/hw/surface_scan.py b/scripts/wk/hw/surface_scan.py
index 7f4ed243..135c9951 100644
--- a/scripts/wk/hw/surface_scan.py
+++ b/scripts/wk/hw/surface_scan.py
@@ -5,7 +5,6 @@ import logging
 
 from subprocess import STDOUT
 
-from wk import ansi
 from wk.cfg.hw import (
   BADBLOCKS_EXTRA_LARGE_DISK,
   BADBLOCKS_LARGE_DISK,
@@ -16,6 +15,7 @@ from wk.cfg.hw import (
   )
 from wk.exe import run_program
 from wk.std import PLATFORM, bytes_to_string
+from wk.ui import ansi
 
 
 # STATIC VARIABLES
diff --git a/scripts/wk/hw/system.py b/scripts/wk/hw/system.py
index 949adb38..4309c3df 100644
--- a/scripts/wk/hw/system.py
+++ b/scripts/wk/hw/system.py
@@ -8,12 +8,12 @@ import re
 from dataclasses import dataclass, field
 from typing import Any
 
-from wk import ansi
 from wk.cfg.hw import KNOWN_RAM_VENDOR_IDS
 from wk.cfg.python import DATACLASS_DECORATOR_KWARGS
 from wk.exe import get_json_from_command, run_program
 from wk.hw.test import Test
 from wk.std import PLATFORM, bytes_to_string, string_to_bytes
+from wk.ui import ansi
 
 
 # STATIC VARIABLES
diff --git a/scripts/wk/os/linux.py b/scripts/wk/os/linux.py
index a4c82002..ee17792a 100644
--- a/scripts/wk/os/linux.py
+++ b/scripts/wk/os/linux.py
@@ -7,11 +7,11 @@ import pathlib
 import re
 import subprocess
 
-from wk import ansi
 from wk.cfg.hw import VOLUME_FAILURE_THRESHOLD, VOLUME_WARNING_THRESHOLD
 from wk.exe import get_json_from_command, popen_program, run_program
 from wk.log import format_log_path
 from wk.std import bytes_to_string
+from wk.ui import ansi
 
 
 # STATIC VARIABLES
diff --git a/scripts/wk/os/win.py b/scripts/wk/os/win.py
index 2cdb1df9..4d6d7248 100644
--- a/scripts/wk/os/win.py
+++ b/scripts/wk/os/win.py
@@ -17,7 +17,6 @@ except ImportError as err:
   if platform.system() == 'Windows':
     raise err
 
-from wk import ansi
 from wk.borrowed import acpi
 from wk.cfg.main import KIT_NAME_FULL
 from wk.cfg.windows_builds import (
@@ -34,6 +33,7 @@ from wk.std import (
   sleep,
   )
 from wk.ui import cli as ui
+from wk.ui import ansi
 
 
 # STATIC VARIABLES
diff --git a/scripts/wk/repairs/win.py b/scripts/wk/repairs/win.py
index 5ae419ed..51c418d4 100644
--- a/scripts/wk/repairs/win.py
+++ b/scripts/wk/repairs/win.py
@@ -11,7 +11,6 @@ import time
 from subprocess       import CalledProcessError, DEVNULL
 from xml.dom.minidom  import parse as xml_parse
 
-from wk               import ansi
 from wk.cfg.main      import KIT_NAME_FULL, KIT_NAME_SHORT, WINDOWS_TIME_ZONE
 from wk.cfg.repairs   import (
   AUTO_REPAIR_DELAY_IN_SECONDS,
@@ -61,7 +60,8 @@ from wk.std           import (
   GenericWarning,
   sleep,
   )
-from wk.ui import cli as ui
+from wk.ui            import cli as ui
+from wk.ui            import ansi
 
 
 # STATIC VARIABLES
diff --git a/scripts/wk/setup/win.py b/scripts/wk/setup/win.py
index 96157af3..97f93b5b 100644
--- a/scripts/wk/setup/win.py
+++ b/scripts/wk/setup/win.py
@@ -8,7 +8,6 @@ import os
 import re
 import sys
 
-from wk               import ansi
 from wk.cfg.main      import KIT_NAME_FULL
 from wk.cfg.setup     import (
   BROWSER_PATHS,
@@ -63,7 +62,8 @@ from wk.std           import (
   GenericWarning,
   sleep,
   )
-from wk.ui import cli as ui
+from wk.ui            import cli as ui
+from wk.ui            import ansi
 
 
 # STATIC VARIABLES
diff --git a/scripts/wk/ui/__init__.py b/scripts/wk/ui/__init__.py
index 209a7699..b93cb848 100644
--- a/scripts/wk/ui/__init__.py
+++ b/scripts/wk/ui/__init__.py
@@ -1,4 +1,5 @@
 """WizardKit: ui module init"""
 
+from . import ansi
 from . import cli
 from . import tmux
diff --git a/scripts/wk/ansi.py b/scripts/wk/ui/ansi.py
similarity index 100%
rename from scripts/wk/ansi.py
rename to scripts/wk/ui/ansi.py
diff --git a/scripts/wk/ui/cli.py b/scripts/wk/ui/cli.py
index 83cc2ed0..3fb7c173 100644
--- a/scripts/wk/ui/cli.py
+++ b/scripts/wk/ui/cli.py
@@ -19,7 +19,6 @@ except ImportError:
   # Assuming Python is < 3.9
   from functools import lru_cache as cache
 
-from wk.ansi import clear_screen, color_string, strip_colors
 from wk.cfg.main import (
   ENABLED_UPLOAD_DATA,
   INDENT,
@@ -27,6 +26,7 @@ from wk.cfg.main import (
   WIDTH,
   )
 from wk.std import (sleep, GenericWarning)
+from wk.ui.ansi import clear_screen, color_string, strip_colors
 
 # STATIC VARIABLES
 LOG = logging.getLogger(__name__)