sync: make parameter order more consistent

Still not great.
exercism · Jun 27, 2021 · 1f4a39e · 1f4a39e
1 parent 28002bb
commit 1f4a39e
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 18 deletions.
diff --git a/src/sync/sync.nim b/src/sync/sync.nim
@@ -43,8 +43,8 @@ proc sync*(conf: Conf) =
       case syncKind
       # Check/sync docs
       of skDocs:
-        let sdPairs = checkDocs(exercises, psExercisesDir,
-                                trackPracticeExercisesDir, seenUnsynced, conf)
+        let sdPairs = checkDocs(conf, seenUnsynced, trackPracticeExercisesDir,
+                                exercises, psExercisesDir)
         if sdPairs.len > 0: # Implies that `--update` was passed.
           if conf.action.yes or userSaysYes(syncKind):
             for sdPair in sdPairs:
@@ -56,15 +56,14 @@ proc sync*(conf: Conf) =
 
       # Check/sync filepaths
       of skFilepaths:
-        let configPairs = checkFilepaths(conf, trackConceptExercisesDir,
-                                         trackPracticeExercisesDir, seenUnsynced)
+        let configPairs = checkFilepaths(conf, seenUnsynced, trackPracticeExercisesDir,
+                                         trackConceptExercisesDir)
         update(configPairs, conf, syncKind, seenUnsynced)
 
       # Check/sync metadata
       of skMetadata:
-        let configPairs = checkMetadata(exercises, psExercisesDir,
-                                        trackPracticeExercisesDir, seenUnsynced,
-                                        conf)
+        let configPairs = checkMetadata(conf, seenUnsynced, trackPracticeExercisesDir,
+                                        exercises, psExercisesDir)
         update(configPairs, conf, syncKind, seenUnsynced)
 
       # Check/sync tests

diff --git a/src/sync/sync_docs.nim b/src/sync/sync_docs.nim
@@ -34,11 +34,11 @@ proc checkFilesIdentical(source, dest, slug, filename: string;
     if conf.action.update:
       sdPairs.add SourceDestPair(source: source, dest: dest)
 
-proc checkDocs*(exercises: seq[Exercise],
-                psExercisesDir: string,
-                trackPracticeExercisesDir: string,
+proc checkDocs*(conf: Conf,
                 seenUnsynced: var set[SyncKind],
-                conf: Conf): seq[SourceDestPair] =
+                trackPracticeExercisesDir: string,
+                exercises: seq[Exercise],
+                psExercisesDir: string): seq[SourceDestPair] =
   for exercise in exercises:
     let slug = exercise.slug.string
     let trackDocsDir = joinPath(trackPracticeExercisesDir, slug, ".docs")

diff --git a/src/sync/sync_filepaths.nim b/src/sync/sync_filepaths.nim
@@ -168,9 +168,9 @@ proc checkFilepathsForExercise(res: var seq[PathAndUpdatedJson], conf: Conf,
       res.add PathAndUpdatedJson(path: trackExerciseConfigPath,
                                  updatedJson: j)
 
-proc checkFilepaths*(conf: Conf;
-                     trackConceptExercisesDir, trackPracticeExercisesDir: string;
-                     seenUnsynced: var set[SyncKind]): seq[PathAndUpdatedJson] =
+proc checkFilepaths*(conf: Conf; seenUnsynced: var set[SyncKind],
+                     trackPracticeExercisesDir: string,
+                     trackConceptExercisesDir: string): seq[PathAndUpdatedJson] =
   let configFilename = "config.json"
   let trackConfigPath = conf.trackDir / configFilename
 

diff --git a/src/sync/sync_metadata.nim b/src/sync/sync_metadata.nim
@@ -56,11 +56,11 @@ proc isThisMetadataSynced(res: var seq[PathAndUpdatedJson]; conf: Conf; slug: st
   else:
     logNormal(&"[error] {slug}: {psMetadataTomlPath} is missing")
 
-proc checkMetadata*(exercises: seq[Exercise],
-                    psExercisesDir: string,
-                    trackPracticeExercisesDir: string,
+proc checkMetadata*(conf: Conf,
                     seenUnsynced: var set[SyncKind],
-                    conf: Conf): seq[PathAndUpdatedJson] =
+                    trackPracticeExercisesDir: string,
+                    exercises: seq[Exercise],
+                    psExercisesDir: string): seq[PathAndUpdatedJson] =
   for exercise in exercises:
     let slug = exercise.slug.string
     let trackMetaDir = joinPath(trackPracticeExercisesDir, slug, ".meta")