Restructure ctrl

- Package ctrl - Split into collection, mix, common - Hide non-relevant via __ALL__ - Add some missing docstrings - Sort imports
JOJ0 · Nov 2, 2024 · 118ce43 · 118ce43
1 parent d235160
commit 118ce43
Show file tree

Hide file tree

Showing 11 changed files with 427 additions and 399 deletions.
diff --git a/discodos/cmd23/import_.py b/discodos/cmd23/import_.py
@@ -1,8 +1,8 @@
+import logging
 import click
 from click_option_group import optgroup, MutuallyExclusiveOptionGroup
-import logging
 
-from discodos.ctrls import Coll_ctrl_cli
+from discodos.ctrl import Coll_ctrl_cli
 
 log = logging.getLogger('discodos')
 

diff --git a/discodos/cmd23/ls.py b/discodos/cmd23/ls.py
@@ -1,7 +1,6 @@
-import click
 import logging
-
-from discodos.ctrls import Coll_ctrl_cli
+import click
+from discodos.ctrl import Coll_ctrl_cli
 
 log = logging.getLogger('discodos')
 

diff --git a/discodos/cmd23/mix.py b/discodos/cmd23/mix.py
@@ -1,8 +1,8 @@
-import click
-from click_option_group import optgroup, MutuallyExclusiveOptionGroup
 import logging
+import click
+from click_option_group import MutuallyExclusiveOptionGroup, optgroup
 
-from discodos.ctrls import Mix_ctrl_cli, Coll_ctrl_cli
+from discodos.ctrl import Coll_ctrl_cli, Mix_ctrl_cli
 
 log = logging.getLogger('discodos')
 

diff --git a/discodos/cmd23/search.py b/discodos/cmd23/search.py
@@ -1,8 +1,8 @@
+import logging
 import click
 from click_option_group import optgroup, MutuallyExclusiveOptionGroup
-import logging
 
-from discodos.ctrls import Mix_ctrl_cli, Coll_ctrl_cli
+from discodos.ctrl import Coll_ctrl_cli, Mix_ctrl_cli
 
 log = logging.getLogger('discodos')
 

diff --git a/discodos/cmd23/setup.py b/discodos/cmd23/setup.py
@@ -1,8 +1,8 @@
-import click
 import logging
+import click
 
 from discodos.config import Db_setup
-from discodos.ctrls import Coll_ctrl_cli
+from discodos.ctrl import Coll_ctrl_cli
 
 log = logging.getLogger('discodos')
 

diff --git a/discodos/cmd23/stats.py b/discodos/cmd23/stats.py
@@ -1,7 +1,7 @@
-import click
 import logging
+import click
 
-from discodos.ctrls import Coll_ctrl_cli
+from discodos.ctrl import Coll_ctrl_cli
 
 log = logging.getLogger('discodos')
 

diff --git a/discodos/cmd23/suggest.py b/discodos/cmd23/suggest.py
@@ -1,7 +1,7 @@
-import click
 import logging
+import click
 
-from discodos.ctrls import Coll_ctrl_cli
+from discodos.ctrl import Coll_ctrl_cli
 
 log = logging.getLogger('discodos')
 

diff --git a/discodos/ctrl/__init__.py b/discodos/ctrl/__init__.py
@@ -0,0 +1,7 @@
+from discodos.ctrl.collection import Coll_ctrl_cli
+from discodos.ctrl.mix import Mix_ctrl_cli
+
+__ALL__ = [
+    Coll_ctrl_cli,
+    Mix_ctrl_cli
+]