From fef9612532240e2b2cf268b712d66d4d4c3cba14 Mon Sep 17 00:00:00 2001
From: amtoine <stevan.antoine@gmail.com>
Date: Sat, 20 Jul 2024 10:50:58 +0200
Subject: [PATCH] show the failed themes at the end and tidy up main

---
 themes/src/make.nu | 40 ++++++++++++----------------------------
 1 file changed, 12 insertions(+), 28 deletions(-)

diff --git a/themes/src/make.nu b/themes/src/make.nu
index 916d9a66..bf9a6dbb 100755
--- a/themes/src/make.nu
+++ b/themes/src/make.nu
@@ -219,38 +219,22 @@ def main [] {
 
     try { git clone $LEMNOS_SOURCE.remote_repo $LEMNOS_SOURCE.local_repo }
 
-    let lemnos_failed = ls $LEMNOS_SOURCE.dir
-    | get name
-    | path parse
-    | get stem
-    | each {|theme|
-        info -n $"Converting ($theme)                                       \r"
+    let themes = ls $LEMNOS_SOURCE.dir
+        | insert source "lemnos"
+        | append (ls $CUSTOM_SOURCE.dir | insert source "custom")
+        | update name { path parse | get stem }
+        | select name source
+
+    let failed = $themes | each { |t|
+        info -n $"Converting ($t.name)                                       \r"
         try {
-            make_theme $theme
-        } catch {|e|
-            err $"Converting ($theme) failed: ($e.msg)"
-            $theme
+            make_theme $t.name $t.source
+        } catch { |e|
+            err $"Converting ($t.name) failed: ($e.msg)"
+            $t
         }
     }
 
-    let custom_failed = ls $CUSTOM_SOURCE.dir
-    | get name
-    | path parse
-    | get stem
-    | each {|theme|
-        info -n $"Converting ($theme)                                       \r"
-        try {
-            make_theme $theme "custom"
-        } catch {|e|
-            err $"Converting ($theme) failed: ($e.msg)"
-            $theme
-        }
-    }
-
-    let failed = $custom_failed | wrap name | insert source "custom" | append (
-        $lemnos_failed | wrap name | insert source "lemnos"
-    )
-
     print ''
     if not ($failed | is-empty) {
         warn "The following themes have failed:"