Fix export

Author: woojiahao

app/commands/progress/__init__.py

@@ -1,12 +1,12 @@
 __all__ = [
     "progress",
-    "LOCAL_FOLDER_NAME",
+    "PROGRESS_LOCAL_FOLDER_NAME",
     "PROGRESS_REPOSITORY_NAME",
     "STUDENT_PROGRESS_FORK_NAME",
 ]
 
 from .constants import (
-    LOCAL_FOLDER_NAME,
+    PROGRESS_LOCAL_FOLDER_NAME,
     PROGRESS_REPOSITORY_NAME,
     STUDENT_PROGRESS_FORK_NAME,
 )

app/commands/progress/reset.py

@@ -10,7 +10,7 @@
 from app.commands.check.github import github
 from app.commands.download import setup_exercise_folder
 from app.commands.progress.constants import (
-    LOCAL_FOLDER_NAME,
+    PROGRESS_LOCAL_FOLDER_NAME,
     PROGRESS_REPOSITORY_NAME,
 )
 from app.utils.cli import rmtree
@@ -69,13 +69,13 @@ def reset() -> None:
             )
         )
 
-    if not os.path.isdir(gitmastery_config.path / LOCAL_FOLDER_NAME):
+    if not os.path.isdir(gitmastery_config.path / PROGRESS_LOCAL_FOLDER_NAME):
         warn(
             f"Progress directory is missing. Set it up again using {click.style('gitmastery progress setup', bold=True, italic=True)}"
         )
         sys.exit(0)
 
-    os.chdir(gitmastery_config.path / LOCAL_FOLDER_NAME)
+    os.chdir(gitmastery_config.path / PROGRESS_LOCAL_FOLDER_NAME)
     if not os.path.isfile("progress.json"):
         warn("Progress tracking file not created yet. No progress to reset.")
         return

app/commands/progress/show.py

@@ -4,7 +4,7 @@
 import click
 
 from app.commands.check.github import github
-from app.commands.progress.constants import LOCAL_FOLDER_NAME
+from app.commands.progress.constants import PROGRESS_LOCAL_FOLDER_NAME
 from app.utils.click import error, info, invoke_command
 from app.utils.github_cli import get_username
 from app.utils.gitmastery import (
@@ -21,15 +21,15 @@ def show() -> None:
     if not config.progress_local:
         error("You do not have progress tracking supported.")
 
-    if not os.path.isdir(config.path / LOCAL_FOLDER_NAME):
+    if not os.path.isdir(config.path / PROGRESS_LOCAL_FOLDER_NAME):
         error(
             f"Something strange has occurred, try to recreate the Git-Mastery exercise directory using {click.style('gitmastery setup', bold=True, italic=True)}"
         )
 
     if config.progress_remote:
         invoke_command(github)
 
-    progress_file_path = config.path / LOCAL_FOLDER_NAME / "progress.json"
+    progress_file_path = config.path / PROGRESS_LOCAL_FOLDER_NAME / "progress.json"
     all_progress = []
     if os.path.isfile(progress_file_path):
         with open(progress_file_path, "r") as file:

app/commands/progress/sync/on.py

@@ -6,7 +6,7 @@
 from app.commands.check.git import git
 from app.commands.check.github import github
 from app.commands.progress.constants import (
-    LOCAL_FOLDER_NAME,
+    PROGRESS_LOCAL_FOLDER_NAME,
     PROGRESS_REPOSITORY_NAME,
     STUDENT_PROGRESS_FORK_NAME,
 )
@@ -57,13 +57,13 @@ def on() -> None:
     # before cloning again. This should automatically setup the origin and upstream
     # remotes as well
     local_progress = []
-    local_progress_filepath = os.path.join(LOCAL_FOLDER_NAME, "progress.json")
+    local_progress_filepath = os.path.join(PROGRESS_LOCAL_FOLDER_NAME, "progress.json")
     if os.path.isfile(local_progress_filepath):
         with open(local_progress_filepath, "r") as file:
             local_progress = json.load(file)
-    rmtree(LOCAL_FOLDER_NAME)
+    rmtree(PROGRESS_LOCAL_FOLDER_NAME)
 
-    clone_with_custom_name(f"{username}/{fork_name}", LOCAL_FOLDER_NAME)
+    clone_with_custom_name(f"{username}/{fork_name}", PROGRESS_LOCAL_FOLDER_NAME)
 
     # To reconcile the difference between local and remote progress, we merge by
     # (exercise_name, start_time) which should be unique
@@ -93,7 +93,7 @@ def on() -> None:
     # push the changes
     had_update = len(seen) > len(remote_progress)
     if had_update:
-        os.chdir(LOCAL_FOLDER_NAME)
+        os.chdir(PROGRESS_LOCAL_FOLDER_NAME)
         add_all()
         commit("Sync progress with local machine")
         push("origin", "main")

app/commands/setup_folder.py

@@ -4,7 +4,7 @@
 import click
 
 from app.commands.check.git import git
-from app.commands.progress.constants import LOCAL_FOLDER_NAME
+from app.commands.progress.constants import PROGRESS_LOCAL_FOLDER_NAME
 from app.utils.click import error, info, invoke_command, prompt
 
 
@@ -35,7 +35,7 @@ def setup() -> None:
     os.chdir(directory_path)
 
     info("Setting up your local progress tracker...")
-    os.makedirs(LOCAL_FOLDER_NAME, exist_ok=True)
+    os.makedirs(PROGRESS_LOCAL_FOLDER_NAME, exist_ok=True)
     with open(".gitmastery.json", "w") as gitmastery_file:
         gitmastery_file.write(
             json.dumps({"progress_local": True, "progress_remote": False})

app/commands/verify.py

@@ -15,7 +15,7 @@
 from git_autograder.output import GitAutograderOutput
 
 from app.commands.progress.constants import (
-    LOCAL_FOLDER_NAME,
+    PROGRESS_LOCAL_FOLDER_NAME,
     PROGRESS_REPOSITORY_NAME,
 )
 from app.utils.click import ClickColor, error, info, warn
@@ -77,13 +77,13 @@ def _submit_progress(output: GitAutograderOutput) -> None:
         )
         return
 
-    if not os.path.isdir(config.path / LOCAL_FOLDER_NAME):
+    if not os.path.isdir(config.path / PROGRESS_LOCAL_FOLDER_NAME):
         error(
             f"Something strange has occurred, try to recreate the Git-Mastery exercise directory using {click.style('gitmastery setup', bold=True, italic=True)}"
         )
 
     info("Saving progress of attempt")
-    os.chdir(config.path / LOCAL_FOLDER_NAME)
+    os.chdir(config.path / PROGRESS_LOCAL_FOLDER_NAME)
     if not os.path.isfile("progress.json"):
         warn("Progress tracking file not created yet, doing that now")
         with open("progress.json", "w") as progress_file: