feat(#291): Reorganized utility

util.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from util import gen_wiki, prepare_after, prepare_before, make_release, \
+from util.utility import gen_wiki, prepare_after, prepare_before, make_release, \
     install, wiki
 from util.command import RootCommand, Command, not_enough_args, not_found
 

util/__init__.py

@@ -1,6 +1,2 @@
-from .wiki import gen as gen_wiki
-from .pages import prepare_after, prepare_before
-from .release import main as make_release
-from .install import install
 from .liner import liner, hard_liner
 from .versions import sort_vers

util/utility/__init__.py

@@ -0,0 +1,4 @@
+from .wiki import gen as gen_wiki
+from .pages import prepare_after, prepare_before
+from .release import main as make_release
+from .install import install

util/install.py → util/utility/install.py

@@ -12,4 +12,4 @@ def install(ex: str, options: list[str],
         sys.exit(2)
     else:
         dest = options[0]
-        print(os.popen(f'sh -c "./util/install.sh {dest}"').read())
+        print(os.popen(f'sh -c "./util/utility/install.sh {dest}"').read())

util/pages.py → util/utility/pages.py

@@ -16,7 +16,7 @@
 import json
 from urllib import request
 
-from util.wiki import Wiki
+from .wiki import Wiki
 
 """
 The files dictionary specifies how and which files should be processed.

util/release/__init__.py → util/utility/release/__init__.py

@@ -4,7 +4,7 @@
 from .changelog import write_changelog
 from .appimage import write_appimage
 from .release_py import write_release_py
-from ..command import not_enough_args
+from util.command import not_enough_args
 
 TAG_REGEX = r"^v([0-9]+)\.([0-9]+)\.([0-9]+)(-[0-9A-Za-z-]+)?$"
 

util/wiki.py → util/utility/wiki.py

@@ -2,7 +2,6 @@
 """This script generates the Pokete wiki"""
 import os
 from os.path import exists, isdir
-import sys
 import scrap_engine as se
 import release
 from pokete_classes.effects import effects, effect_list