Show JOJ progress, -i argument now optional

1 files changed, 10 insertions, 4 deletions

diff --git a/worker/JOJWorker.py b/worker/JOJWorker.py
index 4e17956..4846096 100644
--- a/worker/JOJWorker.py
+++ b/worker/JOJWorker.py
@@ -24,6 +24,7 @@ class JOJWorker():
         self.courseID = courseID
         self.hgroups = hgroups
         self.logger = logger
+        self.joj_progress = 0  # number of JOJ problems checked
 
     def uploadZip(self, homeworkID, problemID, zipPath, lang):
         files = {
@@ -112,10 +113,15 @@ class JOJWorker():
             #         self.checkGroupJOJProcess,
             #         [[HGROUP_NO, hwNum, jojInfo, fns, problemID]
             #          for fns, problemID, _ in jojInfo["problemInfo"]])
-            scores = [
-                self.checkGroupJOJProcess(HGROUP_NO, hwNum, jojInfo, fns, problemID)
-                for fns, problemID, _ in jojInfo["problemInfo"]
-            ]
+            scores = []
+            for fns, problemID, _ in jojInfo["problemInfo"]:
+                scores.append(
+                    self.checkGroupJOJProcess(HGROUP_NO, hwNum, jojInfo, fns, problemID)
+                )
+                files = ", ".join(jojInfo["problemInfo"][self.joj_progress][0])
+                self.joj_progress += 1
+                problem_count = len(jojInfo["problemInfo"])
+                print(f"-> Checked: {files} ({self.joj_progress}/{problem_count})")
             scores = [(scores[i], jojInfo["problemInfo"][i][2])
                       for i in range(len(scores))]
             self.logger.info(f"{key} h{hwNum} score {scores.__repr__()}")