change entry points

wright-group · Feb 17, 2024 · b797ef7 · b797ef7
1 parent 0de18ce
commit b797ef7
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 16 deletions.
diff --git a/WrightTools/__main__.py b/WrightTools/__main__.py
@@ -40,7 +40,7 @@ def load(path):
     _interact(shell, path)
 
 
-@cli.command(name="scan", help="scan a directory and survey the wt5 objects found.")
+@cli.command(name="glob", help="Scan a directory and survey the wt5 objects found.")
 @click.option(
     "--directory", "-d", default=None, help="Directory to scan.  Defaults to current directory."
 )
@@ -56,25 +56,28 @@ def scan(directory=None, no_recursion=False):
 
     table = Table(title=directory)
     table.add_column("", justify="right")  # index
-    table.add_column("path", max_width=60, no_wrap=True)
-    table.add_column("size (MB)", justify="center")
-    table.add_column("created", max_width=30)
-    table.add_column("name")
-    table.add_column("shape")
-    table.add_column("axes", max_width=50)
-    table.add_column("variables")
-    table.add_column("channels")
+    table.add_column("path", max_width=60, no_wrap=True, style="blue")
+    table.add_column("size (MB)", justify="center", style="blue")
+    table.add_column("created", max_width=30, style="blue")
+    table.add_column("name", style="blue")
+    table.add_column("shape", style="blue")
+    table.add_column("axes", max_width=50, style="blue")
+    table.add_column("variables", style="blue")
+    table.add_column("channels", style="blue")
 
     update_title = lambda n: directory + f" ({n} wt5 file{'s' if n != 1 else None} found)"
     paths = []
 
     with Live(table) as live:
         for i, path in enumerate(wt.kit.glob_wt5s(directory, not no_recursion)):
-            paths.append(path)
             desc = wt.kit.describe_wt5(path)
             desc["filesize"] = f"{os.path.getsize(path) / 1e6:.1f}"
-            desc["path"] = str(path.relative_to(directory))
-            row = [str(i)] + [
+            path = path.relative_to(directory)
+            print(path.parent)
+            desc["path"] = f"[link={path.parent}]{path.parent}[/link]" + r"\\" if str(path.parent) != "." else ""
+            desc["path"] +=  f"[bold]{path.name}[/bold]"
+            # desc["path"] = f"[link={str(path)}]{path}[/link]"
+            row = [f"{i}"] + [
                 str(desc[k])
                 for k in ["path", "filesize", "created", "name", "shape", "axes", "nvars", "nchan"]
             ]
@@ -93,7 +96,7 @@ def raise_sys_exit():
             " ".join(
                 [
                     "Specify an index to load that entry.",
-                    "Use 't' to rerender table.",
+                    "Use `t` to rerender table.",
                     "Use no argument to exit.",
                 ]
             )

diff --git a/WrightTools/kit/_glob.py b/WrightTools/kit/_glob.py
@@ -33,6 +33,5 @@ def describe_wt5(path: Union[str, os.PathLike]) -> dict:
 
 def glob_wt5s(directory: Union[str, os.PathLike], recursive=True):
     """find all wt5 files in a directory"""
-    pattern = "**/*.wt5" if recursive else "*.wt5"
-    print(pattern)
+    pattern = "**/*.wt5" if recursive else f"*.wt5"
     return pathlib.Path(directory).glob(pattern)
diff --git a/setup.py b/setup.py
@@ -68,7 +68,11 @@ def read(fname):
     license="MIT",
     url="http://wright.tools",
     keywords="spectroscopy science multidimensional visualization",
-    entry_points={"console_scripts": ["wtools=WrightTools.__main__:cli"]},
+    entry_points={"console_scripts": [
+        "wt-tree=WrightTools.__main__:tree", 
+        "wt5=WrightTools.__main__:wt5", 
+        "wt-convert=WrightTools.__main__:convert"
+    ]},
     classifiers=[
         "Development Status :: 5 - Production/Stable",
         "Intended Audience :: Science/Research",