site_tool uses VaultModel (#622)

bolsinga · Sep 14, 2023 · 93c1d6b · 93c1d6b
1 parent 962fe51
commit 93c1d6b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/Sources/Site/Music/VaultModel.swift b/Sources/Site/Music/VaultModel.swift
@@ -30,7 +30,7 @@ extension VaultError: LocalizedError {
 @MainActor public final class VaultModel: ObservableObject {
   let urlString: String
 
-  @Published var vault: Vault?
+  @Published public var vault: Vault?
   @Published var error: Error?
   @Published var todayConcerts: [Concert] = []
   @Published var venuePlacemarks: [Venue.ID: CLPlacemark] = [:]
@@ -41,7 +41,7 @@ extension VaultError: LocalizedError {
     self.error = error
   }
 
-  func load() async {
+  public func load() async {
     Logger.vaultModel.log("start")
     defer {
       Logger.vaultModel.log("end")

diff --git a/Sources/site_tool/Program.swift b/Sources/site_tool/Program.swift
@@ -11,16 +11,17 @@ import Site
 
 @main
 struct Program: AsyncParsableCommand {
-  enum URLError: Error {
+  enum ProgramError: Error {
     case notURLString(String)
+    case noVault
   }
 
   @Argument(
     help:
       "The root URL for the json files.",
     transform: ({
       let url = URL(string: $0)
-      guard let url else { throw URLError.notURLString($0) }
+      guard let url else { throw ProgramError.notURLString($0) }
       return url
     })
   )
@@ -46,7 +47,9 @@ struct Program: AsyncParsableCommand {
 
     try jsonDirectoryURL?.appending(path: "diary.json").writeJSON(diary)
 
-    let vault = try await Vault.load(url: rootURL.appending(path: "music.json"))
+    let model = await VaultModel(urlString: rootURL.appending(path: "music.json").absoluteString)
+    await model.load()
+    guard let vault = await model.vault else { throw ProgramError.noVault }
 
     let concerts = vault.concerts
     let artistDigests = vault.artistDigests