rework modinfo

froehlichA · Apr 17, 2022 · b956fab · b956fab
1 parent 175a061
commit b956fab
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/modpack/modinfo.nim b/src/modpack/modinfo.nim
@@ -4,10 +4,10 @@
 ## - if the addon is up-to-date
 ## - if the addon is compatible with the modpack
 
-import sequtils, sugar
+import std/[sequtils, sugar]
 import ../api/cfcore
-import ../term/color
 import ../modpack/version
+import ../term/color
 
 type
   Compability* = enum
@@ -50,14 +50,14 @@ proc getMessage*(c: Compability): string =
     of Compability.Major: "The installed mod only matches the major version as the modpack. Issues may arise."
     of Compability.None: "The installed mod is incompatible with the modpack's minecraft version."
 
-proc getFreshness*(file: CfAddonFile, modpackVersion: Version, addon: CfAddon): Freshness =
+proc getFreshness*(file: CfAddonFile, mpVersion: Version, addon: CfAddon): Freshness =
   ## get freshness of a file
   let latestFiles = addon.gameVersionLatestFiles
-  let modpackVersionFiles = latestFiles.filter((x) => x.version == modpackVersion)
+  let modpackVersionFiles = latestFiles.filter((x) => x.version == mpVersion)
   if modpackVersionFiles.len == 1:
     if modpackVersionFiles[0].fileId == file.fileId:
       return Freshness.Newest
-  if latestFiles.any((x) => x.fileId == file.fileId and x.version.minor == modpackVersion.minor):
+  if latestFiles.any((x) => x.fileId == file.fileId and x.version.minor == mpVersion.minor):
     return Freshness.NewestForAVersion
   return Freshness.Old
 

diff --git a/tests/modpack/tmodinfo.nim b/tests/modpack/tmodinfo.nim
@@ -1,5 +1,6 @@
-import sequtils, sugar
-import api/cfcore, modpack/modinfo, modpack/version
+import std/[sequtils, sugar]
+import api/cfcore
+import modpack/[modinfo, version]
 
 proc initCfAddon(projectId: int, name: string, gameVersionLatestFiles: seq[tuple[version: Version, fileId: int]]): CfAddon =
   result = CfAddon()