Make subcommand output text consistent

Signed-off-by: Jacob Stopak <jacob@initialcommit.io>

Author: initialcommit-io

git_sim/git_sim_add.py

@@ -29,7 +29,9 @@ def __init__(self, files: list[str]):
                 sys.exit()
 
     def construct(self):
-        print(Settings.INFO_STRING + "add " + " ".join(self.files))
+        print(
+            f"{Settings.INFO_STRING} {type(self).__name__.lower()} {' '.join(self.files)}"
+        )
 
         self.show_intro()
         self.get_commits()

git_sim/git_sim_base_command.py

@@ -42,8 +42,8 @@ def init_repo(self):
             print("git-sim error: No Git repository found at current path.")
             sys.exit(1)
 
-    def execute(self):
-        print("Simulating: git " + Settings.subcommand)
+    def construct(self):
+        print(f"{Settings.INFO_STRING} {type(self).__name__.lower()}")
         self.show_intro()
         self.get_commits()
         self.fadeout()

git_sim/git_sim_branch.py

@@ -12,7 +12,7 @@ def __init__(self, name: str):
         self.name = name
 
     def construct(self):
-        print(f"{Settings.INFO_STRING} branch {self.name}")
+        print(f"{Settings.INFO_STRING} {type(self).__name__.lower()} {self.name}")
 
         self.show_intro()
         self.get_commits()

git_sim/git_sim_cherrypick.py

@@ -34,10 +34,10 @@ def __init__(self, commit: str, edit: str):
             pass
 
     def construct(self):
-        substring = ""
-        if self.edit:
-            substring = f' -e "{self.edit}"'
-        print(f"{Settings.INFO_STRING} cherrypick {self.commit}{substring}")
+        print(
+            f"{Settings.INFO_STRING} {type(self).__name__.lower()} {self.commit}"
+            + ((' -e "' + self.edit + '"') if self.edit else "")
+        )
 
         if self.repo.active_branch.name in self.repo.git.branch(
             "--contains", self.commit

git_sim/git_sim_commit.py

@@ -4,6 +4,7 @@
 import manim as m
 import typer
 from git_sim.animations import handle_animations
+from git_sim.settings import Settings
 
 from git_sim.git_sim_base_command import GitSimBaseCommand
 
@@ -31,7 +32,10 @@ def __init__(self, message: str, amend: bool):
 
     def construct(self):
         print(
-            f"Simulating: git commit {' --amend' if self.amend else ''} -m '{self.message}'"
+            f"{Settings.INFO_STRING} {type(self).__name__.lower()} {'--amend ' if self.amend else ''}"
+            + '-m "'
+            + self.message
+            + '"'
         )
 
         self.show_intro()

git_sim/git_sim_log.py

@@ -16,7 +16,7 @@ def __init__(self, commits: int):
             pass
 
     def construct(self):
-        print(Settings.INFO_STRING + type(self).__name__)
+        print(f"{Settings.INFO_STRING} {type(self).__name__.lower()}")
         self.show_intro()
         self.get_commits()
         self.parse_commits(self.commits[0])

git_sim/git_sim_merge.py

@@ -37,7 +37,9 @@ def __init__(self, branch: str, no_ff: bool):
             pass
 
     def construct(self):
-        print(Settings.INFO_STRING + "merge " + self.branch)
+        print(
+            f"{Settings.INFO_STRING} {type(self).__name__.lower()} {self.branch} {'--no-ff' if self.no_ff else ''}"
+        )
 
         if self.repo.active_branch.name in self.repo.git.branch(
             "--contains", self.branch

git_sim/git_sim_rebase.py

@@ -34,7 +34,7 @@ def __init__(self, branch: str):
             pass
 
     def construct(self):
-        print(Settings.INFO_STRING + "rebase  " + self.branch)
+        print(f"{Settings.INFO_STRING} {type(self).__name__.lower()} {self.branch}")
 
         if self.branch in self.repo.git.branch(
             "--contains", self.repo.active_branch.name

git_sim/git_sim_reset.py

@@ -50,7 +50,7 @@ def __init__(
 
     def construct(self):
         print(
-            f"{Settings.INFO_STRING} reset {' --' + self.mode.value if self.mode != ResetMode.DEFAULT else ''} {self.commit}",
+            f"{Settings.INFO_STRING} {type(self).__name__.lower()}{' --' + self.mode.value if self.mode != ResetMode.DEFAULT else ''} {self.commit}",
         )
 
         self.show_intro()

git_sim/git_sim_restore.py

@@ -27,7 +27,9 @@ def __init__(self, files: list[str]):
                 sys.exit()
 
     def construct(self):
-        print(Settings.INFO_STRING + "restore " + " ".join(self.files))
+        print(
+            f"{Settings.INFO_STRING} {type(self).__name__.lower()} {' '.join(self.files)}"
+        )
 
         self.show_intro()
         self.get_commits()

git_sim/git_sim_revert.py

@@ -36,7 +36,7 @@ def __init__(self, commit: str):
             pass
 
     def construct(self):
-        print(Settings.INFO_STRING + "revert " + self.commit)
+        print(f"{Settings.INFO_STRING} {type(self).__name__.lower()} {self.commit}")
 
         self.show_intro()
         self.get_commits()

git_sim/git_sim_stash.py

@@ -5,13 +5,15 @@
 
 from git_sim.animations import handle_animations
 from git_sim.git_sim_base_command import GitSimBaseCommand
+from git_sim.settings import Settings
 
 
 class Stash(GitSimBaseCommand):
     def __init__(self, files: list[str]):
         super().__init__()
         self.hide_first_tag = True
         self.files = files
+        self.no_files = True if not self.files else False
 
         try:
             self.selected_branches.append(self.repo.active_branch.name)
@@ -31,7 +33,9 @@ def __init__(self, files: list[str]):
             ]
 
     def construct(self):
-        print("Simulating: git stash " + " ".join(self.files))
+        print(
+            f"{Settings.INFO_STRING} {type(self).__name__.lower()} {' '.join(self.files) if not self.no_files else ''}"
+        )
 
         self.show_intro()
         self.get_commits()

git_sim/git_sim_status.py

@@ -12,6 +12,7 @@ def __init__(self):
             pass
 
     def construct(self):
+        print(f"{Settings.INFO_STRING} {type(self).__name__.lower()}")
         self.show_intro()
         self.get_commits()
         self.parse_commits(self.commits[0])

git_sim/git_sim_tag.py

@@ -12,7 +12,7 @@ def __init__(self, name: str):
         self.name = name
 
     def construct(self):
-        print(f"{Settings.INFO_STRING} tag {self.name}")
+        print(f"{Settings.INFO_STRING} {type(self).__name__.lower()} {self.name}")
 
         self.show_intro()
         self.get_commits()

git_sim/settings.py

@@ -32,7 +32,7 @@ class Settings:
     allow_no_commits = False
     low_quality = False
     auto_open = True
-    INFO_STRING = "Simulating: git "
+    INFO_STRING = "Simulating: git"
     # os.path.join(str(pathlib.Path(__file__).parent.resolve()), "logo.png")
     logo = pathlib.Path(__file__).parent.resolve() / "logo.png"
     media_dir = pathlib.Path().cwd()