[icons] update to tabler icons

aslpavel · aslpavel · commit 712ad87aab70 · 2024-04-04T21:52:58.000+01:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/chronicler/Cargo.toml b/chronicler/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "chronicler"
 build = "build.rs"
-version = "0.3.1"
+version = "0.3.2"
 edition = "2021"
 
 [dependencies]
diff --git a/chronicler/src/icons.json b/chronicler/src/icons.json
@@ -1,32 +1,37 @@
 {
-    "material-folder-clock-outline": {
-        "view_box": [0, 0, 24, 24],
+    "path-history": {
+        "name": "tabler-folder-heart",
+        "view_box": [0, 0, 100, 100],
         "size": [1, 3],
         "fallback": " ",
-        "path": "M15,12H16.5V16.25L19.36,17.94L18.61,19.16L15,17V12M19,8H3V18H9.29C9.1,17.37 9,16.7 9,16A7,7 0 0,1 16,9C17.07,9 18.09,9.24 19,9.67V8M3,20C1.89,20 1,19.1 1,18V6A2,2 0 0,1 3,4H9L11,6H19A2,2 0 0,1 21,8V11.1C22.24,12.36 23,14.09 23,16A7,7 0 0,1 16,23C13.62,23 11.5,21.81 10.25,20H3M16,11A5,5 0 0,0 11,16A5,5 0 0,0 16,21A5,5 0 0,0 21,16A5,5 0 0,0 16,11Z"
+        "path": "M17.75,8.9Q17.75,8.9 17.95,8.9Q22.75,8.8 27.25,8.8L36.65,8.9Q37.45,9.1 38.35,9.9Q39.25,10.7 43.75,15.3L49.75,21.1L64.15,21.1Q74.65,21.1 77.25,21.2Q79.25,21.3 80.35,21.7L80.85,21.8Q83.55,22.7 85.6,24.75Q87.65,26.8 88.55,29.5L88.65,29.7Q89.05,31 89.15,31.9Q89.25,33.1 89.25,36.9Q89.25,42.1 89.15,42.5Q89.05,43.3 88.45,44.2Q87.25,45.8 85.05,45.8Q83.95,45.8 83.25,45.5Q81.95,44.9 81.25,43.2Q81.05,42.8 80.95,42Q80.95,40.9 80.95,37.6L80.85,32.4Q80.25,31 79.45,30.4Q78.95,30 77.65,29.5L46.75,29.3Q46.05,29 45.2,28.2Q44.35,27.4 39.75,22.8L33.75,17L26.45,17Q18.95,17 18.55,17.1Q17.05,17.3 16.15,18.4Q15.55,19 15.05,20.2L14.95,43.6Q14.95,66.7 15.2,67.7Q15.45,68.7 16.3,69.5Q17.15,70.3 18.25,70.5Q18.65,70.6 30.65,70.6L40.95,70.7Q42.55,70.7 42.95,70.8Q44.45,71.4 45.1,72.25Q45.75,73.1 45.75,74.85Q45.75,76.6 44.75,77.6Q44.15,78.2 42.75,78.8L30.45,78.9Q17.85,78.9 17.25,78.8Q14.55,78.4 12.15,76.8Q8.15,74.1 6.85,68.8Q6.75,68.4 6.75,66.9L6.75,20.7Q6.75,19.3 6.85,18.9Q7.55,15.5 9.75,13Q11.55,11 14.05,9.8Q16.15,8.9 17.75,8.9ZM72.35,56.1Q72.35,56.1 72.55,56.2Q72.75,56.3 72.95,56.2Q77.35,53.6 82.15,54.35Q86.95,55.1 90.05,58.6Q93.25,62.2 93.25,67.2Q93.25,70.7 91.75,73.5Q90.85,75.1 89.05,76.9Q86.75,79.1 81,84.7Q75.25,90.3 74.95,90.5Q74.05,91.2 72.7,91.2Q71.35,91.2 70.45,90.5Q70.05,90.3 62.85,83.3Q55.65,76.3 55.15,75.6Q51.85,71.7 52.05,66.9Q52.15,62.5 55.2,58.9Q58.25,55.3 62.65,54.4Q67.55,53.4 72.35,56.1ZM63.95,62.6Q61.65,63.3 60.75,65.35Q59.85,67.4 60.85,69.4Q61.05,69.8 61.65,70.4L72.65,81.3L83.95,70.3Q84.45,69.8 84.55,69.4L84.55,69.4Q85.35,67.9 84.95,66.3Q84.55,64.7 83.25,63.6Q81.95,62.5 80.15,62.5Q78.75,62.5 77.65,63.1Q76.95,63.5 75.95,64.4Q74.95,65.3 74.35,65.6Q73.35,66.1 72.15,65.9Q71.15,65.7 70.45,65.2Q70.05,65 69.4,64.3Q68.75,63.6 68.25,63.3Q67.55,62.8 66.55,62.6Q66.05,62.5 65.3,62.5Q64.55,62.5 63.95,62.6Z"
     },
-    "material-folder-search-outline": {
-        "view_box": [0, 0, 24, 24],
+    "path-navigation": {
+        "name": "tabler-folder-search",
+        "view_box": [0, 0, 100, 100],
         "size": [1, 3],
         "fallback": " ",
-        "path": "M16.5,12C19,12 21,14 21,16.5C21,17.38 20.75,18.21 20.31,18.9L23.39,22L22,23.39L18.88,20.32C18.19,20.75 17.37,21 16.5,21C14,21 12,19 12,16.5C12,14 14,12 16.5,12M16.5,14A2.5,2.5 0 0,0 14,16.5A2.5,2.5 0 0,0 16.5,19A2.5,2.5 0 0,0 19,16.5A2.5,2.5 0 0,0 16.5,14M19,8H3V18H10.17C10.34,18.72 10.63,19.39 11,20H3C1.89,20 1,19.1 1,18V6C1,4.89 1.89,4 3,4H9L11,6H19A2,2 0 0,1 21,8V11.81C20.42,11.26 19.75,10.81 19,10.5V8Z"
+        "path": "M17.75,8.9Q17.75,8.9 17.95,8.9Q22.75,8.8 27.25,8.8L36.65,8.9Q37.45,9.1 38.35,9.9Q39.25,10.7 43.75,15.3L49.75,21.1L76.55,21.2Q78.85,21.2 79.35,21.3Q81.95,22 84.05,23.5Q88.05,26.3 89.05,31.5Q89.15,32 89.15,38.4L89.15,42.4Q89.15,44.8 89.05,45.1Q88.45,47 86.75,47.65Q85.05,48.3 83.4,47.6Q81.75,46.9 81.15,45.1Q80.95,44.7 80.95,43.8L80.95,38.6L80.85,32.4Q80.25,31 79.45,30.4Q78.95,30 77.65,29.5L46.75,29.3Q46.05,29 45.2,28.2Q44.35,27.4 39.75,22.8L33.75,17L26.45,17Q18.95,17 18.55,17.1Q17.05,17.3 16.15,18.4Q15.55,19 15.05,20.2L14.95,43.6Q14.95,66.7 15.15,67.7Q15.85,69.7 17.85,70.4Q18.25,70.6 31.55,70.6L44.85,70.6L45.55,71Q46.95,71.7 47.55,73.05Q48.15,74.4 47.8,75.85Q47.45,77.3 46.15,78.2L45.95,78.3Q45.55,78.6 44.85,78.7Q43.95,78.8 41.05,78.8L21.15,78.8Q18.15,78.8 17.05,78.7Q16.25,78.6 15.35,78.3L15.15,78.3Q11.95,77.2 9.75,74.65Q7.55,72.1 6.85,68.8Q6.75,68.4 6.75,66.9L6.75,20.7Q6.75,19.3 6.85,18.9Q7.55,15.5 9.75,13Q11.55,11 14.05,9.8Q16.15,8.9 17.75,8.9ZM93.25,87.1Q93.25,88.9 92.1,90.05Q90.95,91.2 89.15,91.2Q88.25,91.2 87.75,91.05Q87.25,90.9 86.35,90.1Q85.75,89.6 83.85,87.7L81.05,84.9L80.05,85.4Q75.95,87.4 71.5,87.05Q67.05,86.7 63.35,84.25Q59.65,81.8 57.85,77.8Q55.45,72.8 56.45,67.6Q57.45,62.8 60.95,59.15Q64.45,55.5 69.35,54.5Q74.55,53.4 79.85,55.8Q83.05,57.3 85.45,60.2Q89.15,64.6 89.15,70.6Q89.15,74.8 87.55,78L86.95,79L89.75,81.8Q91.65,83.7 92.15,84.3Q92.95,85.2 93.1,85.7Q93.25,86.2 93.25,87.1ZM70.95,62.6Q68.45,63.2 66.75,64.95Q65.05,66.7 64.6,69.1Q64.15,71.5 65.05,73.8Q66.15,76.4 68.55,77.75Q70.95,79.1 73.7,78.85Q76.45,78.6 78.45,76.6Q80.45,74.6 80.8,71.95Q81.15,69.3 80,66.9Q78.85,64.5 76.55,63.3Q74.05,62 70.95,62.6Z"
     },
-    "material-console": {
-        "view_box": [0, 0, 24, 24],
+    "cmd-history": {
+        "name": "tabler-terminal-2",
+        "view_box": [0, 0, 100, 100],
         "size": [1, 3],
         "fallback": " ",
-        "path": "M20,19V7H4V19H20M20,3A2,2 0 0,1 22,5V19A2,2 0 0,1 20,21H4A2,2 0 0,1 2,19V5C2,3.89 2.9,3 4,3H20M13,17V15H18V17H13M9.58,13L5.57,9H8.4L11.7,12.3C12.09,12.69 12.09,13.33 11.7,13.72L8.42,17H5.59L9.58,13Z"
+        "path": "M19.1,13.1Q20.5,12.9 49.8,12.9Q79.1,12.9 80.9,13.1Q84.7,13.7 87.5,16.4Q90.3,19.1 91.1,23Q91.2,23.4 91.2,24.9L91.2,75.1Q91.2,76.6 91.1,77Q90.6,79.7 88.9,82Q86.1,85.9 80.9,86.9Q79.1,87.1 50,87.1Q20.9,87.1 19.1,86.9Q15.2,86.3 12.45,83.6Q9.7,80.9 8.9,77Q8.8,76.6 8.8,75.1L8.8,24.9Q8.8,23.4 8.9,23Q9.7,19.1 12.45,16.4Q15.2,13.7 19.1,13.1ZM20.3,21.2Q17.8,22 17.1,24.3L17.1,75.7Q17.9,78 20.1,78.7L79.9,78.7Q82.1,78 82.9,75.7L82.9,24.3Q82.3,22.8 81.8,22.35Q81.3,21.9 79.9,21.3L50.1,21.2L20.3,21.2ZM29.4,38.2Q29.1,36.6 30.1,35.3Q31.1,34 32.7,33.6Q34.3,33.2 35.6,34.1Q36.2,34.5 42.8,41L43.8,42Q47.2,45.5 48.1,46.4Q49.4,47.8 49.65,48.35Q49.9,48.9 49.9,49.7L49.9,51Q49.8,51.3 49.6,51.75Q49.4,52.2 48.8,52.8L37.6,64.1Q36,65.5 35.5,65.9Q35,66.3 34.3,66.4L34.2,66.4Q32,66.8 30.55,65.35Q29.1,63.9 29.4,61.8L29.4,61.6Q29.5,61 29.8,60.55Q30.1,60.1 31.1,58.95Q32.1,57.8 34.9,55L40,50L34.9,44.9Q32.1,42.1 31.1,41Q30.1,39.9 29.8,39.45Q29.5,39 29.4,38.4L29.4,38.2ZM53.1,58.4Q51.9,58.7 51,59.7Q50,60.8 50,62.35Q50,63.9 51,65.1Q51.9,66 53.1,66.3Q53.7,66.5 60.25,66.5Q66.8,66.5 67.4,66.3Q69.4,65.8 70.2,64.15Q71,62.5 70.25,60.75Q69.5,59 67.4,58.4Q66.8,58.3 60.25,58.3Q53.7,58.3 53.1,58.4Z"
     },
-    "fluent-dismiss-circle": {
+    "failed": {
+        "name": "tabler-square-rounded-x",
         "view_box": [0, 0, 100, 100],
         "size": [1, 2],
         "fallback": "[X]",
-        "path": "M50,10Q60.8,10 70,15.4Q79.2,20.8 84.6,30Q90,39.2 90,50Q90,60.8 84.6,70Q79.2,79.2 70,84.6Q60.8,90 50,90Q39.2,90 30,84.6Q20.8,79.2 15.4,70Q10,60.8 10,50Q10,39.2 15.4,30Q20.8,20.8 30,15.4Q39.2,10 50,10ZM50,15Q40.4,15 32.4,19.7Q24.4,24.4 19.7,32.4Q15,40.4 15,50Q15,59.6 19.7,67.6Q24.4,75.6 32.4,80.3Q40.4,85 50,85Q59.6,85 67.6,80.3Q75.6,75.6 80.3,67.6Q85,59.6 85,50Q85,40.4 80.3,32.4Q75.6,24.4 67.6,19.7Q59.6,15 50,15ZM39,35.6L39.4,35.8L50,46.4L60.6,35.8Q61.2,35.2 62.1,35.1Q63,35 63.8,35.6L64.2,35.8Q64.8,36.6 64.9,37.5Q65,38.4 64.4,39L53.6,50L64.2,60.6Q64.8,61.2 64.9,62.1Q65,63 64.4,63.8L64.2,64.2Q63.4,64.8 62.5,64.9Q61.6,65 61,64.4L50,53.6L39.4,64.2Q38.8,64.8 37.9,64.9Q37,65 36.2,64.4L35.8,64.2Q35.2,63.4 35.1,62.5Q35,61.6 35.6,61L46.4,50L35.8,39.4Q35.2,38.8 35.1,37.9Q35,37 35.6,36.2L35.8,35.8Q36.6,35.2 37.5,35.1Q38.4,35 39,35.6Z"
+        "path": "M44.8,8.85Q61.2,8.35 70.55,10.9Q79.9,13.45 84.6,19.75Q89,25.65 90.5,36.55Q91.1,41.15 91.3,46.95Q91.6,57.55 90.1,65.85Q88.1,77.25 82.8,82.55Q79.5,85.85 74.85,87.8Q70.2,89.75 63.5,90.55Q59.4,91.05 53.8,91.25Q43,91.65 34.6,90.25Q22.9,88.15 17.5,82.85Q15.3,80.65 13.9,78.25Q11.4,73.85 10.1,67.15Q8.4,58.55 8.8,46.15Q9,36.55 10.5,30.55Q12.5,22.35 17.4,17.45Q21.6,13.35 28.1,11.3Q34.6,9.25 44.8,8.85ZM50,83.05Q60.7,83.05 66.6,81.75Q73.2,80.35 76.7,76.85Q80.2,73.35 81.6,66.75Q83,60.75 83,50.05Q83,40.25 81.8,34.25Q80.6,28.15 77.95,24.7Q75.3,21.25 70.6,19.45Q66.4,17.95 59.2,17.35Q52.2,16.85 45,17.15Q31.8,17.65 26,21.15Q22.7,23.15 20.75,26.65Q18.8,30.15 17.9,35.75Q17,41.35 17,50.05Q17,60.95 18.5,67.25Q20,73.55 23.3,76.85Q26.3,79.75 31.7,81.25Q38.2,83.05 50,83.05ZM40.8,37.75Q39.8,37.95 38.85,38.85Q37.9,39.75 37.65,41.1Q37.4,42.45 38.2,43.95Q38.4,44.35 41.3,47.15L44.1,50.05L41.3,52.95Q38.4,55.75 38.2,56.15Q37.2,57.95 37.9,59.65Q38.6,61.35 40.35,62.1Q42.1,62.85 43.9,61.85Q44.3,61.65 47.1,58.75L50,55.95L52.9,58.75Q55.7,61.65 56.1,61.85Q57.9,62.85 59.65,62.1Q61.4,61.35 62.1,59.65Q62.8,57.95 61.8,56.15Q61.6,55.75 58.7,52.95L55.9,50.05L58.7,47.15Q61.6,44.35 61.8,43.95Q62.8,42.15 62.05,40.4Q61.3,38.65 59.6,37.95Q57.9,37.25 56.1,38.25Q55.7,38.45 52.9,41.35L50,44.15L47.1,41.35Q44.6,38.85 43.7,38.25Q42.4,37.45 40.8,37.75Z"
     },
-    "fluent-folder": {
+    "folder": {
+        "name": "tabler-folder",
         "view_box": [0, 0, 100, 100],
         "size": [1, 2],
         "fallback": "[F]",
-        "path": "M22.6,15Q17.4,15 13.7,18.7Q10,22.4 10,27.6L10,72.4Q10,77.6 13.7,81.3Q17.4,85 22.6,85L77.6,85Q82.6,85 86.3,81.3Q90,77.6 90,72.6L90,37.4Q90,32.4 86.3,28.7Q82.6,25 77.4,25L48.6,25L41.2,17.6Q38.6,15 35,15L22.6,15ZM15,27.4Q15,24.4 17.2,22.2Q19.4,20 22.6,20L35,20Q36.4,20 37.6,21.2L44,27.4L37.2,34.2Q36.4,35 35.4,35L15,35L15,27.4ZM15,40L35.4,40Q38.6,40 40.8,37.8L48.6,30L77.6,30Q80.6,30 82.8,32.2Q85,34.4 85,37.6L85,72.4Q85,75.6 82.8,77.8Q80.6,80 77.4,80L22.6,80Q19.4,80 17.2,77.8Q15,75.6 15,72.4L15,40Z"
+        "path": "M14.2,17.05Q15.8,15.95 17.25,15.55Q18.7,15.15 21.4,14.95Q23.2,14.95 29.2,14.95L38.7,15.05Q39.5,15.25 40.4,16.05Q41.3,16.85 45.8,21.45L51.8,27.25L65.8,27.25Q79.3,27.25 80.9,27.45Q84.7,28.05 87.5,30.8Q90.3,33.55 91.1,37.35Q91.2,37.75 91.2,38.95L91.2,74.25L91,75.25Q90.3,78.15 88.5,80.45Q85.8,83.95 81,84.95Q80.3,85.05 75.8,85.05L24.2,85.05Q19.7,85.05 19,84.95Q16.5,84.45 14.2,82.85Q10,80.05 8.9,75.05Q8.8,74.65 8.8,73.25L8.8,26.65Q8.8,25.35 8.9,24.95Q10.1,19.75 14.2,17.05ZM19.7,23.45Q18.4,23.95 17.8,24.85Q17.4,25.35 17.1,26.35L17.1,73.65Q17.6,74.75 18.1,75.35Q18.9,76.25 20.2,76.55Q21.2,76.75 50,76.75Q78.8,76.75 79.8,76.55Q81.1,76.25 81.9,75.35Q82.4,74.75 82.9,73.65L82.9,38.55Q82.2,37.25 81.85,36.9Q81.5,36.55 79.9,35.65L58.7,35.55L51.7,35.55Q49.6,35.45 49,35.4Q48.4,35.35 48.1,35.15L47.9,35.05Q47.7,34.95 41.8,28.95L36,23.25L20.3,23.25L19.7,23.45Z"
     }
 }
diff --git a/chronicler/src/navigator.rs b/chronicler/src/navigator.rs
@@ -519,19 +519,19 @@ lazy_static::lazy_static! {
         serde_json::from_str(include_str!("./icons.json"))
             .expect("invalid icons.json file");
 
-    static ref PATH_HISTORY_ICON: &'static Glyph = ICONS.get("material-folder-clock-outline")
+    static ref PATH_HISTORY_ICON: &'static Glyph = ICONS.get("path-history")
         .expect("failed to find path history icon");
 
-    static ref PATH_NAV_ICON: &'static Glyph = ICONS.get("material-folder-search-outline")
+    static ref PATH_NAV_ICON: &'static Glyph = ICONS.get("path-navigation")
         .expect("failed to find path navigation icon");
 
-    static ref CMD_HISTORY_ICON: &'static Glyph = ICONS.get("material-console")
+    static ref CMD_HISTORY_ICON: &'static Glyph = ICONS.get("cmd-history")
         .expect("failed to find path navigation icon");
 
-    pub(crate) static ref FAILED_ICON: &'static Glyph = ICONS.get("fluent-dismiss-circle")
+    pub(crate) static ref FAILED_ICON: &'static Glyph = ICONS.get("failed")
         .expect("faield to find failed icon");
 
-    pub(crate) static ref FOLDER_ICON: &'static Glyph = ICONS.get("fluent-folder")
+    pub(crate) static ref FOLDER_ICON: &'static Glyph = ICONS.get("folder")
         .expect("faield to find folder icon");
 }
 
diff --git a/sweep/Cargo.toml b/sweep/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Pavel Aslanov <asl.pavel@gmail.com>"]
 build = "build.rs"
 edition = "2021"
 name = "sweep"
-version = "0.16.4"
+version = "0.16.5"
 include = ["**/*.rs", "src/icons.json", "Cargo.toml", "Cargo.lock", "README.md"]
 
 [lib]
diff --git a/sweep/src/icons.json b/sweep/src/icons.json
diff --git a/sweep/src/sweep.rs b/sweep/src/sweep.rs
@@ -44,7 +44,7 @@ lazy_static::lazy_static! {
     static ref ICONS: HashMap<String, Glyph> =
         serde_json::from_str(include_str!("./icons.json"))
             .expect("invalid icons.json file");
-    static ref PROMPT_DEFAULT_ICON: &'static Glyph = ICONS.get("broom")
+    static ref PROMPT_DEFAULT_ICON: &'static Glyph = ICONS.get("prompt")
         .expect("failed to get prompt default icon");
     static ref KEYBOARD_ICON: &'static Glyph = ICONS.get("keyboard")
         .expect("failed to get keyboard icon");
@@ -1058,11 +1058,11 @@ impl<'a, H: Haystack> IntoView for &'a mut SweepState<H> {
         }
         stats
             .push_fmt(format_args!(
-                "{}/{} {:.2?}",
+                "{}/{} ",
                 ranker_result.len(),
                 ranker_result.haystack_len(),
-                ranker_result.duration(),
             ))
+            .push_fmt(format_args!("{:.0?}", ranker_result.duration()))
             .with_face(Default::default(), |text| {
                 let name = ranker_result.scorer().name();
                 match ICONS.get(name) {
