rework loader

froehlichA · Apr 17, 2022 · 7aefee1 · 7aefee1
1 parent ae2a0b8
commit 7aefee1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/src/modpack/loader.nim b/src/modpack/loader.nim
@@ -1,9 +1,9 @@
 ## Exports `Loader` which specifies the modloader type for a given modpack.
 ## 
-## Pax currently has support for the Fabric & Forge modloaders and assumes that mods that work on one modloader
-## do not work on another.
+## Pax currently has support for the Fabric & Forge modloaders and assumes that
+## mods that work on one modloader do not work on another.
 
-import strformat, strutils
+import std/[strformat, strutils]
 
 type
   Loader* = enum

diff --git a/src/modpack/manifest.nim b/src/modpack/manifest.nim
@@ -76,15 +76,10 @@ proc toManifestFile(json: JsonNode): Future[ManifestFile] {.async.} =
     let addon = fetchAddon(result.projectId)
     let addonFile = fetchAddonFile(result.projectId, result.fileId)
     await addon and addonFile
-    if addon.read().isNone() or addonFile.read().isNone():
-      raise newException(
-        ValueError,
-        fmt"projectID {result.projectId} & fileID {result.fileId} are not correct!"
-      )
-    result.metadata.name = addon.read().get().name
+    result.metadata.name = addon.read().name
     result.metadata.explicit = true
     result.metadata.pinned = false
-    result.metadata.dependencies = addonFile.read().get().dependencies
+    result.metadata.dependencies = addonFile.read().dependencies
   else:
     result.metadata.name = json["__meta"]["name"].getStr()
     result.metadata.explicit = json["__meta"]{"explicit"}.getBool(true)