better use result lib

bwireman · Jun 1, 2024 · 4ecdb4f · 4ecdb4f
1 parent dae5bc0
commit 4ecdb4f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/go_over/advisories.gleam b/src/go_over/advisories.gleam
@@ -1,6 +1,7 @@
 import filepath
 import gleam/list
 import gleam/option
+import gleam/result.{unwrap}
 import go_over/cache
 import go_over/comparisons
 import go_over/constants.{go_over_path, six_hours}
@@ -41,11 +42,11 @@ fn read_adv(path: String) -> Advisory {
 fn read_all_adv() -> List(Advisory) {
   let packages_path = filepath.join(path(), "packages")
 
-  let assert Ok(packages) = simplifile.read_directory(packages_path)
+  let packages = simplifile.read_directory(packages_path) |> unwrap([])
   list.flat_map(packages, fn(dir) {
     let dir_path = filepath.join(packages_path, dir)
 
-    let assert Ok(adv_names) = simplifile.read_directory(dir_path)
+    let adv_names = simplifile.read_directory(dir_path) |> unwrap([])
     list.map(adv_names, fn(adv_name) {
       read_adv(filepath.join(dir_path, adv_name))
     })

diff --git a/src/go_over/cache.gleam b/src/go_over/cache.gleam
@@ -14,7 +14,7 @@ fn file_cached(path: String, max_age_seconds: Int) -> Result(Bool, Nil) {
   path
   |> cache_name()
   |> simplifile.read()
-  |> result.map_error(fn(_) { Nil })
+  |> result.replace_error(Nil)
   |> result.try(int.base_parse(_, 10))
   |> result.map(fn(v) {
     let cutoff = birl.from_unix(v + max_age_seconds)