From 66e79b6017b15ac3c59eb9eabe5ab9ba2774c6ad Mon Sep 17 00:00:00 2001
From: Eric Froemling <ericfroemling@gmail.com>
Date: Tue, 15 Jun 2021 10:59:27 -0500
Subject: [PATCH] more tidying

---
 assets/src/ba_data/python/._ba_sources_hash     | 2 +-
 assets/src/ba_data/python/bastd/tutorial.py     | 2 +-
 tools/batools/{genchangelog.py => changelog.py} | 0
 tools/batools/{gendocs.py => docs.py}           | 6 +++---
 tools/batools/dummymodule.py                    | 4 ++--
 tools/batools/pcommand.py                       | 6 +++---
 6 files changed, 10 insertions(+), 10 deletions(-)
 rename tools/batools/{genchangelog.py => changelog.py} (100%)
 rename tools/batools/{gendocs.py => docs.py} (99%)

diff --git a/assets/src/ba_data/python/._ba_sources_hash b/assets/src/ba_data/python/._ba_sources_hash
index e4a5e599..173a737f 100644
--- a/assets/src/ba_data/python/._ba_sources_hash
+++ b/assets/src/ba_data/python/._ba_sources_hash
@@ -1 +1 @@
-226926683788933102100058650343380221118
\ No newline at end of file
+187820143871408304678286045117862733188
\ No newline at end of file
diff --git a/assets/src/ba_data/python/bastd/tutorial.py b/assets/src/ba_data/python/bastd/tutorial.py
index 39bad74d..f4c0c50e 100644
--- a/assets/src/ba_data/python/bastd/tutorial.py
+++ b/assets/src/ba_data/python/bastd/tutorial.py
@@ -2302,7 +2302,7 @@ class TutorialActivity(ba.Activity[Player, Team]):
         while self._entries:
             entry = self._entries.pop(0)
             try:
-                result = entry.run(self)
+                result = entry.generate(self)
             except Exception:
                 result = None
                 ba.print_exception()
diff --git a/tools/batools/genchangelog.py b/tools/batools/changelog.py
similarity index 100%
rename from tools/batools/genchangelog.py
rename to tools/batools/changelog.py
diff --git a/tools/batools/gendocs.py b/tools/batools/docs.py
similarity index 99%
rename from tools/batools/gendocs.py
rename to tools/batools/docs.py
index e7a0b33b..03b2051e 100755
--- a/tools/batools/gendocs.py
+++ b/tools/batools/docs.py
@@ -1272,7 +1272,7 @@ class Generator:
         ba.quit()
 
 
-def run(projroot: str) -> None:
+def generate(projroot: str) -> None:
     """Main entry point."""
     toolsdir = os.path.abspath(os.path.join(projroot, 'tools'))
 
@@ -1298,8 +1298,8 @@ def run(projroot: str) -> None:
                 f'    import sys\n'
                 f'    import ba\n'
                 f'    sys.path.append("{toolsdir}")\n'
-                f'    from batools import gendocs\n'
-                f'    gendocs.Generator().run("{outfilename}")\n'
+                f'    import batools.docs\n'
+                f'    batools.docs.Generator().run("{outfilename}")\n'
                 f'    ba.quit()\n'
                 f'except Exception:\n'
                 f'    import sys\n'
diff --git a/tools/batools/dummymodule.py b/tools/batools/dummymodule.py
index 95f6aa00..38c87afd 100755
--- a/tools/batools/dummymodule.py
+++ b/tools/batools/dummymodule.py
@@ -22,7 +22,7 @@ from efrotools import get_files_hash
 if TYPE_CHECKING:
     from types import ModuleType
     from typing import Sequence, Any, Tuple, List
-    from batools.gendocs import AttributeInfo
+    from batools.docs import AttributeInfo
 
 
 def _get_varying_func_info(sig_in: str) -> Tuple[str, str]:
@@ -488,7 +488,7 @@ def _formatdoc(docstr: str, indent: int) -> str:
 def _writeclasses(module: ModuleType, classnames: Sequence[str]) -> str:
     # pylint: disable=too-many-branches
     import types
-    from batools.gendocs import parse_docs_attrs
+    from batools.docs import parse_docs_attrs
     out = ''
     for classname in classnames:
         cls = getattr(module, classname)
diff --git a/tools/batools/pcommand.py b/tools/batools/pcommand.py
index 74103918..cd72af96 100644
--- a/tools/batools/pcommand.py
+++ b/tools/batools/pcommand.py
@@ -447,8 +447,8 @@ def warm_start_asset_build() -> None:
 
 def gendocs() -> None:
     """Generate docs html."""
-    import batools.gendocs
-    batools.gendocs.run(projroot=str(PROJROOT))
+    import batools.docs
+    batools.docs.generate(projroot=str(PROJROOT))
 
 
 def update_docs_md() -> None:
@@ -874,7 +874,7 @@ def win_ci_binary_build() -> None:
 
 def genchangelog() -> None:
     """Gen a pretty html changelog."""
-    from batools.genchangelog import generate
+    from batools.changelog import generate
     generate(projroot=str(PROJROOT))