Reorganize controllers into dedicated folder

Move the controllers into a controller directory. This removes the need
to identify the type of information contained in a particular module by
its filename.

Move bin/ammo to ammo/bin/ammo. This cleans up the base directory of the
repository.

Delete the base level __init__.py. This provides a clear boundary
between the ammo module and tests.

bin/ammo → ammo/bin/ammo

@@ -2,8 +2,8 @@
 import argparse
 from pathlib import Path
 
-from ammo.game_controller import GameController
 from ammo.ui import UI
+from ammo.controller.game import GameController
 
 parser = argparse.ArgumentParser(description="Manage mods for Bethesda games.")
 

ammo/bethesda_controller.py → ammo/controller/bethesda.py

@@ -13,11 +13,11 @@
     dataclass,
     field,
 )
-from .mod_controller import (
+from .mod import (
     ModController,
     Game,
 )
-from .component import (
+from ammo.component import (
     Mod,
     Download,
     Plugin,

ammo/fomod_controller.py → ammo/controller/fomod.py

@@ -10,9 +10,9 @@
 from pathlib import Path
 from xml.etree import ElementTree
 from functools import reduce
-from .ui import Controller
-from .component import Mod
-from .lib import normalize
+from ammo.ui import Controller
+from ammo.component import Mod
+from ammo.lib import normalize
 
 
 @dataclass

ammo/game_controller.py → ammo/controller/game.py

@@ -7,15 +7,15 @@
     field,
 )
 from pathlib import Path
-from .mod_controller import (
+from .mod import (
     Game,
     ModController,
 )
-from .bethesda_controller import (
+from .bethesda import (
     BethesdaController,
     BethesdaGame,
 )
-from .ui import (
+from ammo.ui import (
     Controller,
     UI,
 )

ammo/mod_controller.py → ammo/controller/mod.py

@@ -14,21 +14,20 @@
 from enum import (
     EnumMeta,
 )
-from .ui import (
+from ammo.ui import (
     UI,
     Controller,
 )
-from .tool_controller import ToolController
-from .fomod_controller import FomodController
-from .component import (
+from ammo.component import (
     Mod,
     Download,
 )
-from .lib import (
+from ammo.lib import (
     normalize,
     NO_EXTRACT_DIRS,
 )
-
+from .tool import ToolController
+from .fomod import FomodController
 
 log = logging.getLogger(__name__)
 

ammo/tool_controller.py → ammo/controller/tool.py

@@ -10,9 +10,9 @@
 from enum import (
     EnumMeta,
 )
-from .ui import Controller
-from .component import Download
-from .lib import NO_EXTRACT_DIRS
+from ammo.ui import Controller
+from ammo.component import Download
+from ammo.lib import NO_EXTRACT_DIRS
 
 
 class Tool:

setup.py

@@ -6,6 +6,6 @@
     description="A simple terminal based mod organizer for Linux.",
     author="cyberrumor",
     url="https://github.com/cyberrumor/ammo",
-    packages=["ammo"],
-    scripts=["bin/ammo"],
+    packages=["ammo", "ammo/controller"],
+    scripts=["ammo/bin/ammo"],
 )

test/bethesda/common.py

@@ -3,11 +3,11 @@
 import shutil
 from pathlib import Path
 
-from ammo.bethesda_controller import (
+from ammo.controller.bethesda import (
     BethesdaController,
     BethesdaGame,
 )
-from ammo.fomod_controller import FomodController
+from ammo.controller.fomod import FomodController
 from ammo.component import Mod