improve handling of --quarter option

Author: TimidRobot

scripts/2-process/gcs_process.py

@@ -44,6 +44,7 @@ def parse_arguments():
     """
     Parse command-line options, returns parsed argument namespace.
     """
+    global QUARTER
     LOGGER.info("Parsing command-line options")
     parser = argparse.ArgumentParser(description=__doc__)
     parser.add_argument(
@@ -70,8 +71,12 @@ def parse_arguments():
     if not args.enable_save and args.enable_git:
         parser.error("--enable-git requires --enable-save")
     if args.quarter != QUARTER:
-        global PATHS
+        global FILE_PATHS, PATHS
+        FILE_PATHS = shared.paths_list_update(
+            LOGGER, FILE_PATHS, QUARTER, args.quarter
+        )
         PATHS = shared.paths_update(LOGGER, PATHS, QUARTER, args.quarter)
+        QUARTER = args.quarter
     args.logger = LOGGER
     args.paths = PATHS
     return args

scripts/2-process/github_process.py

@@ -34,6 +34,7 @@ def parse_arguments():
     """
     Parse command-line options, returns parsed argument namespace.
     """
+    global QUARTER
     LOGGER.info("Parsing command-line options")
     parser = argparse.ArgumentParser(description=__doc__)
     parser.add_argument(
@@ -62,8 +63,12 @@ def parse_arguments():
     if not args.enable_save and args.enable_git:
         parser.error("--enable-git requires --enable-save")
     if args.quarter != QUARTER:
-        global PATHS
+        global FILE_PATHS, PATHS
+        FILE_PATHS = shared.paths_list_update(
+            LOGGER, FILE_PATHS, QUARTER, args.quarter
+        )
         PATHS = shared.paths_update(LOGGER, PATHS, QUARTER, args.quarter)
+        QUARTER = args.quarter
     args.logger = LOGGER
     args.paths = PATHS
     return args

scripts/2-process/wikipedia_process.py

@@ -45,6 +45,7 @@ def parse_arguments():
     """
     Parse command-line options, returns parsed argument namespace.
     """
+    global QUARTER
     LOGGER.info("Parsing command-line options")
     parser = argparse.ArgumentParser(description=__doc__)
     parser.add_argument(
@@ -73,8 +74,12 @@ def parse_arguments():
     if not args.enable_save and args.enable_git:
         parser.error("--enable-git requires --enable-save")
     if args.quarter != QUARTER:
-        global PATHS
+        global FILE_PATHS, PATHS
+        FILE_PATHS = shared.paths_list_update(
+            LOGGER, FILE_PATHS, QUARTER, args.quarter
+        )
         PATHS = shared.paths_update(LOGGER, PATHS, QUARTER, args.quarter)
+        QUARTER = args.quarter
     args.logger = LOGGER
     args.paths = PATHS
     return args

scripts/shared.py

@@ -207,6 +207,13 @@ def paths_update(logger, paths, old_quarter, new_quarter):
     return paths
 
 
+def paths_list_update(logger, paths_list, old_quarter, new_quarter):
+    logger.info(f"Updating paths: replacing {old_quarter} with {new_quarter}")
+    for index, path in enumerate(paths_list):
+        paths_list[index] = path.replace(old_quarter, new_quarter)
+    return paths_list
+
+
 class ColoredFormatter(logging.Formatter):
     """Adds colors to log messages."""
 
@@ -301,8 +308,8 @@ def update_readme(
     logger = args.logger
     paths = args.paths
     ordered_sections = section_order()
-    logger.info(f"ordered_sections:, {ordered_sections}")
-    logger.info(f"section_title:, {section_title}")
+    logger.info(f"ordered_sections: {ordered_sections}")
+    logger.info(f"section_title: {section_title}")
 
     if not args.enable_save:
         return