From afca099edeca08043f3142ac6c289b142685bb55 Mon Sep 17 00:00:00 2001
From: InsanePrawn <insane.prawny@gmail.com>
Date: Sun, 16 Oct 2022 04:43:45 +0200
Subject: [PATCH] net: make new module from {forwarding,ssh,telnet}.py

---
 docs/source/cmd.rst                | 4 +---
 image.py                           | 2 +-
 main.py                            | 8 ++------
 net/__init__.py                    | 0
 net/cli.py                         | 9 +++++++++
 forwarding.py => net/forwarding.py | 3 ++-
 ssh.py => net/ssh.py               | 0
 telnet.py => net/telnet.py         | 0
 packages/cli.py                    | 2 +-
 9 files changed, 16 insertions(+), 12 deletions(-)
 create mode 100644 net/__init__.py
 create mode 100644 net/cli.py
 rename forwarding.py => net/forwarding.py (97%)
 rename ssh.py => net/ssh.py (100%)
 rename telnet.py => net/telnet.py (100%)

diff --git a/docs/source/cmd.rst b/docs/source/cmd.rst
index 2c3b0cc..f55e34a 100644
--- a/docs/source/cmd.rst
+++ b/docs/source/cmd.rst
@@ -15,8 +15,6 @@ only used to trigger builds of the submodule docs!
     devices
     flash
     flavours
-    forwarding
     image
+    net
     packages
-    ssh
-    telnet
diff --git a/image.py b/image.py
index 908556e..358db50 100644
--- a/image.py
+++ b/image.py
@@ -18,7 +18,7 @@ from exec.file import root_write_file, root_makedir, makedir
 from packages.build import build_enable_qemu_binfmt, build_packages, filter_pkgbuilds
 from devices.device import Device, get_profile_device
 from flavours.flavour import Flavour, get_profile_flavour
-from ssh import copy_ssh_keys
+from net.ssh import copy_ssh_keys
 from wrapper import enforce_wrap
 
 # image files need to be slightly smaller than partitions to fit
diff --git a/main.py b/main.py
index 3aea9c3..0f0f045 100755
--- a/main.py
+++ b/main.py
@@ -9,17 +9,15 @@ from typing import Optional
 from logger import logging, setup_logging, verbose_option
 from wrapper import nowrapper_option, enforce_wrap
 from config.cli import config, config_option, cmd_config
-from forwarding import cmd_forwarding
 from packages.cli import cmd_packages
 from flavours.cli import cmd_flavours
 from devices.cli import cmd_devices
-from telnet import cmd_telnet
+from net.cli import cmd_net
 from chroot.cli import cmd_chroot
 from cache import cmd_cache
 from image import cmd_image
 from boot import cmd_boot
 from flash import cmd_flash
-from ssh import cmd_ssh
 
 
 @click.group()
@@ -68,11 +66,9 @@ cli.add_command(cmd_config)
 cli.add_command(cmd_devices)
 cli.add_command(cmd_flash)
 cli.add_command(cmd_flavours)
-cli.add_command(cmd_forwarding)
 cli.add_command(cmd_image)
+cli.add_command(cmd_net)
 cli.add_command(cmd_packages)
-cli.add_command(cmd_ssh)
-cli.add_command(cmd_telnet)
 
 if __name__ == '__main__':
     main()
diff --git a/net/__init__.py b/net/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/net/cli.py b/net/cli.py
new file mode 100644
index 0000000..656c083
--- /dev/null
+++ b/net/cli.py
@@ -0,0 +1,9 @@
+import click
+
+from .forwarding import cmd_forwarding
+from .ssh import cmd_ssh
+from .telnet import cmd_telnet
+
+cmd_net = click.Group('net', help='Network utilities like ssh and telnet')
+for cmd in cmd_forwarding, cmd_ssh, cmd_telnet:
+    cmd_net.add_command(cmd)
diff --git a/forwarding.py b/net/forwarding.py
similarity index 97%
rename from forwarding.py
rename to net/forwarding.py
index 5c14458..5089c42 100644
--- a/forwarding.py
+++ b/net/forwarding.py
@@ -2,9 +2,10 @@ import click
 import logging
 
 from exec.cmd import run_root_cmd
-from ssh import run_ssh_command
 from wrapper import check_programs_wrap
 
+from .ssh import run_ssh_command
+
 
 @click.command(name='forwarding')
 def cmd_forwarding():
diff --git a/ssh.py b/net/ssh.py
similarity index 100%
rename from ssh.py
rename to net/ssh.py
diff --git a/telnet.py b/net/telnet.py
similarity index 100%
rename from telnet.py
rename to net/telnet.py
diff --git a/packages/cli.py b/packages/cli.py
index 0e26be6..fe288e4 100644
--- a/packages/cli.py
+++ b/packages/cli.py
@@ -11,7 +11,7 @@ from exec.file import remove_file
 from devices.device import get_profile_device
 from distro.distro import get_kupfer_local
 from distro.package import LocalPackage
-from ssh import run_ssh_command, scp_put_files
+from net.ssh import run_ssh_command, scp_put_files
 from utils import git
 from wrapper import check_programs_wrap, enforce_wrap