Presets: convert hard coded ANSI escape code to formatting placeholders

CarterLi · CarterLi · commit 745865d66ae0 · 2024-05-28T16:10:24.000+08:00
diff --git a/presets/archey.jsonc b/presets/archey.jsonc
@@ -40,7 +40,7 @@
         },
         {
             "type": "terminal",
-            "format": "{5} {6} \u001b[37m█\u001b[97m█ \u001b[36m█\u001b[96m█ \u001b[35m█\u001b[95m█ \u001b[34m█\u001b[94m█ \u001b[33m█\u001b[93m█ \u001b[32m█\u001b[92m█ \u001b[31m█\u001b[91m█ \u001b[30m█\u001b[90m█"
+            "format": "{5} {6} {#37}█{#97}█ {#36}█{#96}█ {#35}█{#95}█ {#34}█{#94}█ {#33}█{#93}█ {#32}█{#92}█ {#31}█{#91}█ {#30}█{#90}█"
         },
         {
             "type": "packages",
diff --git a/presets/examples/10.jsonc b/presets/examples/10.jsonc
@@ -14,23 +14,26 @@
     "modules": [
         {
             "type": "custom",
-            "format": "\u001b[90m┌────────────────────────────────────────────────────────────┐"
+            "format": "┌────────────────────────────────────────────────────────────┐",
+            "outputColor": "90"
         },
         {
             "type": "title",
             "keyWidth": 10
         },
         {
             "type": "custom",
-            "format": "\u001b[90m└────────────────────────────────────────────────────────────┘"
+            "format": "└────────────────────────────────────────────────────────────┘",
+            "outputColor": "90"
         },
         {
             "type": "custom",
-            "format": " \u001b[90m  \u001b[31m  \u001b[32m  \u001b[33m  \u001b[34m  \u001b[35m  \u001b[36m  \u001b[37m  \u001b[38m  \u001b[39m       \u001b[38m  \u001b[37m  \u001b[36m  \u001b[35m  \u001b[34m  \u001b[33m  \u001b[32m  \u001b[31m  \u001b[90m"
+            "format": " {#90}  {#31}  {#32}  {#33}  {#34}  {#35}  {#36}  {#37}  {#38}  {#39}       {#38}  {#37}  {#36}  {#35}  {#34}  {#33}  {#32}  {#31}  {#90}"
         },
         {
             "type": "custom",
-            "format": "\u001b[90m┌────────────────────────────────────────────────────────────┐"
+            "format": "┌────────────────────────────────────────────────────────────┐",
+            "outputColor": "90"
         },
         {
             "type": "os",
@@ -139,12 +142,13 @@
         },
         {
             "type": "custom",
-            "format": "\u001b[90m└────────────────────────────────────────────────────────────┘"
+            "format": "└────────────────────────────────────────────────────────────┘",
+            "outputColor": "90"
         },
         "break",
         {
             "type": "custom",
-            "format": " \u001b[90m  \u001b[31m  \u001b[32m  \u001b[33m  \u001b[34m  \u001b[35m  \u001b[36m  \u001b[37m  \u001b[38m  \u001b[39m       \u001b[38m  \u001b[37m  \u001b[36m  \u001b[35m  \u001b[34m  \u001b[33m  \u001b[32m  \u001b[31m  \u001b[90m"
+            "format": " {#90}  {#31}  {#32}  {#33}  {#34}  {#35}  {#36}  {#37}  {#38}  {#39}       {#38}  {#37}  {#36}  {#35}  {#34}  {#33}  {#32}  {#31}  {#90}"
         }
     ]
 }
diff --git a/presets/examples/12.jsonc b/presets/examples/12.jsonc
@@ -4,7 +4,7 @@
         "type": "none"
     },
     "display": {
-        "separator": "->   "
+        "separator": "\u001b[1m->   "
     },
     "modules": [
         {
@@ -14,7 +14,7 @@
         "break",
         {
             "type": "custom",
-            "format": "┌───────────────────────────── \u001b[1mSystem Information\u001b[0m ─────────────────────────────┐" // `\u001b` is `\033`, or `\e`
+            "format": "┌───────────────────────────── {#1}System Information{#} ─────────────────────────────┐"
         },
         "break",
         {
@@ -92,7 +92,7 @@
         "break",
         {
             "type": "custom",
-            "format": "└──────────────────────────────────────────────────────────────────────────────┘" // `\u001b` is `\033`, or `\e`
+            "format": "└──────────────────────────────────────────────────────────────────────────────┘"
         },
         "break",
         {
diff --git a/presets/examples/13.jsonc b/presets/examples/13.jsonc
@@ -17,54 +17,55 @@
         },
         {
             // draw borders first to make colors of left and right border consistant
-            "key": "│           │\u001b[11D\u001b[31m user",
+            "key": "│           │\u001b[11D{#31} user",
             "type": "title",
             "format": "{1}"
         },
         {
-            "key": "│           │\u001b[11D\u001b[32m󰇅 hname",
+            "key": "│           │\u001b[11D{#32}󰇅 hname",
             "type": "title",
             "format": "{2}"
         },
         {
-            "key": "│           │\u001b[11D\u001b[33m󰅐 uptime",
+            "key": "│           │\u001b[11D{#33}󰅐 uptime",
             "type": "uptime"
         },
         {
-            "key": "│           │\u001b[11D\u001b[34m󰟾 distro",
+            "key": "│           │\u001b[11D{#34}󰟾 distro",
             "type": "os"
         },
         {
-            "key": "│           │\u001b[11D\u001b[35m kernel",
+            "key": "│           │\u001b[11D{#35} kernel",
             "type": "kernel"
         },
         {
-            "key": "│           │\u001b[11D\u001b[36m󰇄 desktop",
+            "key": "│           │\u001b[11D{#36}󰇄 desktop",
             "type": "de"
         },
         {
-            "key": "│           │\u001b[11D\u001b[31m term",
+            "key": "│           │\u001b[11D{#31} term",
             "type": "terminal"
         },
         {
-            "key": "│           │\u001b[11D\u001b[32m shell",
+            "key": "│           │\u001b[11D{#32} shell",
             "type": "shell"
         },
         {
-            "key": "│           │\u001b[11D\u001b[33m󰍛 cpu",
-            "type": "cpu"
+            "key": "│           │\u001b[11D{#33}󰍛 cpu",
+            "type": "cpu",
+            "showPeCoreCount": true
         },
         {
-            "key": "│           │\u001b[11D\u001b[34m󰉉 disk",
+            "key": "│           │\u001b[11D{#34}󰉉 disk",
             "type": "disk",
             "folders": "/"
         },
         {
-            "key": "│           │\u001b[11D\u001b[35m memory",
+            "key": "│           │\u001b[11D{#35} memory",
             "type": "memory"
         },
         {
-            "key": "│           │\u001b[11D\u001b[36m󰩟 network",
+            "key": "│           │\u001b[11D{#36}󰩟 network",
             "type": "localip",
             "format": "{1} ({4})"
         },
@@ -73,7 +74,7 @@
             "type": "custom"
         },
         {
-            "key": "│           │\u001b[11D\u001b[m colors",
+            "key": "│           │\u001b[11D{#39} colors",
             "type": "colors",
             "symbol": "circle"
         },
diff --git a/presets/examples/2.jsonc b/presets/examples/2.jsonc
@@ -15,7 +15,7 @@
     "modules": [
         {
             "type": "custom", // HardwareStart
-            "format": "┌─────────── \u001b[1mHardware Information\u001b[0m ───────────┐" // `\u001b` is `\033`, or `\e`
+            "format": "┌─────────── {#1}Hardware Information{#} ───────────┐" // {#1} is the same as `\u001b[1m`. {#} is `\u001b[m`
         },
         {
             "type": "host",
@@ -71,7 +71,7 @@
         },
         {
             "type": "custom", // SoftwareStart
-            "format": "├─────────── \u001b[1mSoftware Information\u001b[0m ───────────┤"
+            "format": "├─────────── {#1}Software Information{#} ───────────┤"
         },
         {
             "type": "title",
diff --git a/presets/examples/8.jsonc b/presets/examples/8.jsonc
@@ -46,7 +46,7 @@
         {
             "type": "custom",
             "key": "",
-            "format": "\u001b[31m███\u001b[32m███\u001b[33m███\u001b[34m███\u001b[35m███\u001b[36m███"
+            "format": "{#31}███{#32}███{#33}███{#34}███{#35}███{#36}███"
         }
     ]
 }

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@`
`40`	`40`	`},`
`41`	`41`	`{`
`42`	`42`	`"type": "terminal",`
`43`		`- "format": "{5} {6} \u001b[37m█\u001b[97m█ \u001b[36m█\u001b[96m█ \u001b[35m█\u001b[95m█ \u001b[34m█\u001b[94m█ \u001b[33m█\u001b[93m█ \u001b[32m█\u001b[92m█ \u001b[31m█\u001b[91m█ \u001b[30m█\u001b[90m█"`
	`43`	`+ "format": "{5} {6} {#37}█{#97}█ {#36}█{#96}█ {#35}█{#95}█ {#34}█{#94}█ {#33}█{#93}█ {#32}█{#92}█ {#31}█{#91}█ {#30}█{#90}█"`
`44`	`44`	`},`
`45`	`45`	`{`
`46`	`46`	`"type": "packages",`
Original file line number	Diff line number	Diff line change
`@@ -14,23 +14,26 @@`
`14`	`14`	`"modules": [`
`15`	`15`	`{`
`16`	`16`	`"type": "custom",`
`17`		`- "format": "\u001b[90m┌────────────────────────────────────────────────────────────┐"`
	`17`	`+ "format": "┌────────────────────────────────────────────────────────────┐",`
	`18`	`+ "outputColor": "90"`
`18`	`19`	`},`
`19`	`20`	`{`
`20`	`21`	`"type": "title",`
`21`	`22`	`"keyWidth": 10`
`22`	`23`	`},`
`23`	`24`	`{`
`24`	`25`	`"type": "custom",`
`25`		`- "format": "\u001b[90m└────────────────────────────────────────────────────────────┘"`
	`26`	`+ "format": "└────────────────────────────────────────────────────────────┘",`
	`27`	`+ "outputColor": "90"`
`26`	`28`	`},`
`27`	`29`	`{`
`28`	`30`	`"type": "custom",`
`29`		`- "format": " \u001b[90m \u001b[31m \u001b[32m \u001b[33m \u001b[34m \u001b[35m \u001b[36m \u001b[37m \u001b[38m \u001b[39m  \u001b[38m \u001b[37m \u001b[36m \u001b[35m \u001b[34m \u001b[33m \u001b[32m \u001b[31m \u001b[90m"`
	`31`	`+ "format": " {#90} {#31} {#32} {#33} {#34} {#35} {#36} {#37} {#38} {#39}  {#38} {#37} {#36} {#35} {#34} {#33} {#32} {#31} {#90}"`
`30`	`32`	`},`
`31`	`33`	`{`
`32`	`34`	`"type": "custom",`
`33`		`- "format": "\u001b[90m┌────────────────────────────────────────────────────────────┐"`
	`35`	`+ "format": "┌────────────────────────────────────────────────────────────┐",`
	`36`	`+ "outputColor": "90"`
`34`	`37`	`},`
`35`	`38`	`{`
`36`	`39`	`"type": "os",`
`@@ -139,12 +142,13 @@`
`139`	`142`	`},`
`140`	`143`	`{`
`141`	`144`	`"type": "custom",`
`142`		`- "format": "\u001b[90m└────────────────────────────────────────────────────────────┘"`
	`145`	`+ "format": "└────────────────────────────────────────────────────────────┘",`
	`146`	`+ "outputColor": "90"`
`143`	`147`	`},`
`144`	`148`	`"break",`
`145`	`149`	`{`
`146`	`150`	`"type": "custom",`
`147`		`- "format": " \u001b[90m \u001b[31m \u001b[32m \u001b[33m \u001b[34m \u001b[35m \u001b[36m \u001b[37m \u001b[38m \u001b[39m  \u001b[38m \u001b[37m \u001b[36m \u001b[35m \u001b[34m \u001b[33m \u001b[32m \u001b[31m \u001b[90m"`
	`151`	`+ "format": " {#90} {#31} {#32} {#33} {#34} {#35} {#36} {#37} {#38} {#39}  {#38} {#37} {#36} {#35} {#34} {#33} {#32} {#31} {#90}"`
`148`	`152`	`}`
`149`	`153`	`]`
`150`	`154`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`"type": "none"`
`5`	`5`	`},`
`6`	`6`	`"display": {`
`7`		`- "separator": "-> "`
	`7`	`+ "separator": "\u001b[1m-> "`
`8`	`8`	`},`
`9`	`9`	`"modules": [`
`10`	`10`	`{`
`@@ -14,7 +14,7 @@`
`14`	`14`	`"break",`
`15`	`15`	`{`
`16`	`16`	`"type": "custom",`
`17`		- "format": "┌───────────────────────────── \u001b[1mSystem Information\u001b[0m ─────────────────────────────┐" // `\u001b` is `\033`, or `\e`
	`17`	`+ "format": "┌───────────────────────────── {#1}System Information{#} ─────────────────────────────┐"`
`18`	`18`	`},`
`19`	`19`	`"break",`
`20`	`20`	`{`
`@@ -92,7 +92,7 @@`
`92`	`92`	`"break",`
`93`	`93`	`{`
`94`	`94`	`"type": "custom",`
`95`		- "format": "└──────────────────────────────────────────────────────────────────────────────┘" // `\u001b` is `\033`, or `\e`
	`95`	`+ "format": "└──────────────────────────────────────────────────────────────────────────────┘"`
`96`	`96`	`},`
`97`	`97`	`"break",`
`98`	`98`	`{`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`"modules": [`
`16`	`16`	`{`
`17`	`17`	`"type": "custom", // HardwareStart`
`18`		- "format": "┌─────────── \u001b[1mHardware Information\u001b[0m ───────────┐" // `\u001b` is `\033`, or `\e`
	`18`	+ "format": "┌─────────── {#1}Hardware Information{#} ───────────┐" // {#1} is the same as `\u001b[1m`. {#} is `\u001b[m`
`19`	`19`	`},`
`20`	`20`	`{`
`21`	`21`	`"type": "host",`
`@@ -71,7 +71,7 @@`
`71`	`71`	`},`
`72`	`72`	`{`
`73`	`73`	`"type": "custom", // SoftwareStart`
`74`		`- "format": "├─────────── \u001b[1mSoftware Information\u001b[0m ───────────┤"`
	`74`	`+ "format": "├─────────── {#1}Software Information{#} ───────────┤"`
`75`	`75`	`},`
`76`	`76`	`{`
`77`	`77`	`"type": "title",`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@`
`46`	`46`	`{`
`47`	`47`	`"type": "custom",`
`48`	`48`	`"key": "",`
`49`		`- "format": "\u001b[31m███\u001b[32m███\u001b[33m███\u001b[34m███\u001b[35m███\u001b[36m███"`
	`49`	`+ "format": "{#31}███{#32}███{#33}███{#34}███{#35}███{#36}███"`
`50`	`50`	`}`
`51`	`51`	`]`
`52`	`52`	`}`