summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShulhan <ms@kilabit.info>2024-04-10 22:19:22 +0700
committerShulhan <ms@kilabit.info>2024-04-10 22:19:22 +0700
commit77b2da671a29eff58925c13ea0e690c3977698a5 (patch)
treeb6206419cb1a960f77f36e01fd33a2309c452637
parentfe1ea808d929befa53998423c07c808d62fee7c9 (diff)
downloadpakakeh.go-77b2da671a29eff58925c13ea0e690c3977698a5.tar.xz
lib/memfs: set embed file mode to print as octal
Using octal in mode make the code more readable, for example mode with permission "0o644" much more readable than 420.
Diffstat
-rw-r--r--lib/memfs/internal/test/embed/embed_test.go76
-rw-r--r--lib/memfs/internal/test/embed_disable_modtime/embed_test.go38
-rw-r--r--lib/memfs/template.go2
3 files changed, 58 insertions, 58 deletions
diff --git a/lib/memfs/internal/test/embed/embed_test.go b/lib/memfs/internal/test/embed/embed_test.go
index 0428f11a..1dcfc954 100644
--- a/lib/memfs/internal/test/embed/embed_test.go
+++ b/lib/memfs/internal/test/embed/embed_test.go
@@ -15,8 +15,8 @@ func generate_testdata() *memfs.Node {
ContentType: "",
GenFuncName: "generate_testdata",
}
- node.SetMode(2147484141)
- node.SetModTimeUnix(1699901114, 455911441)
+ node.SetMode(0o20000000755)
+ node.SetModTimeUnix(1709751019, 629372161)
node.SetName("/")
node.SetSize(0)
node.AddChild(_memFS_getNode(memFS, "/direct", generate_testdata_direct))
@@ -36,8 +36,8 @@ func generate_testdata_direct() *memfs.Node {
ContentType: "",
GenFuncName: "generate_testdata_direct",
}
- node.SetMode(2147484141)
- node.SetModTimeUnix(1569586540, 0)
+ node.SetMode(0o20000000755)
+ node.SetModTimeUnix(1709751019, 626038828)
node.SetName("direct")
node.SetSize(0)
node.AddChild(_memFS_getNode(memFS, "/direct/add", generate_testdata_direct_add))
@@ -51,8 +51,8 @@ func generate_testdata_direct_add() *memfs.Node {
ContentType: "",
GenFuncName: "generate_testdata_direct_add",
}
- node.SetMode(2147484141)
- node.SetModTimeUnix(1569586540, 0)
+ node.SetMode(0o20000000755)
+ node.SetModTimeUnix(1709751019, 626038828)
node.SetName("add")
node.SetSize(0)
node.AddChild(_memFS_getNode(memFS, "/direct/add/file", generate_testdata_direct_add_file))
@@ -68,8 +68,8 @@ func generate_testdata_direct_add_file() *memfs.Node {
GenFuncName: "generate_testdata_direct_add_file",
Content: []byte("\x54\x65\x73\x74\x20\x64\x69\x72\x65\x63\x74\x20\x61\x64\x64\x20\x66\x69\x6C\x65\x2E\x0A"),
}
- node.SetMode(420)
- node.SetModTimeUnix(1569586540, 0)
+ node.SetMode(0o644)
+ node.SetModTimeUnix(1709751019, 626038828)
node.SetName("file")
node.SetSize(22)
return node
@@ -83,8 +83,8 @@ func generate_testdata_direct_add_file2() *memfs.Node {
GenFuncName: "generate_testdata_direct_add_file2",
Content: []byte("\x54\x65\x73\x74\x20\x64\x69\x72\x65\x63\x74\x20\x61\x64\x64\x20\x66\x69\x6C\x65\x20\x32\x2E\x0A"),
}
- node.SetMode(420)
- node.SetModTimeUnix(1569586540, 0)
+ node.SetMode(0o644)
+ node.SetModTimeUnix(1709751019, 626038828)
node.SetName("file2")
node.SetSize(24)
return node
@@ -97,8 +97,8 @@ func generate_testdata_exclude() *memfs.Node {
ContentType: "",
GenFuncName: "generate_testdata_exclude",
}
- node.SetMode(2147484141)
- node.SetModTimeUnix(1633792794, 467899662)
+ node.SetMode(0o20000000755)
+ node.SetModTimeUnix(1710216708, 236975330)
node.SetName("exclude")
node.SetSize(0)
node.AddChild(_memFS_getNode(memFS, "/exclude/dir", generate_testdata_exclude_dir))
@@ -115,8 +115,8 @@ func generate_testdata_exclude_dir() *memfs.Node {
ContentType: "",
GenFuncName: "generate_testdata_exclude_dir",
}
- node.SetMode(2147484096)
- node.SetModTimeUnix(1629620045, 798024232)
+ node.SetMode(0o20000000700)
+ node.SetModTimeUnix(1710216708, 236975330)
node.SetName("dir")
node.SetSize(0)
return node
@@ -130,8 +130,8 @@ func generate_testdata_exclude_index_link_css() *memfs.Node {
GenFuncName: "generate_testdata_exclude_index_link_css",
Content: []byte("\x62\x6F\x64\x79\x20\x7B\x0A\x7D\x0A"),
}
- node.SetMode(420)
- node.SetModTimeUnix(1562038157, 0)
+ node.SetMode(0o644)
+ node.SetModTimeUnix(1709751019, 626038828)
node.SetName("index-link.css")
node.SetSize(9)
return node
@@ -145,8 +145,8 @@ func generate_testdata_exclude_index_link_html() *memfs.Node {
GenFuncName: "generate_testdata_exclude_index_link_html",
Content: []byte("\x3C\x68\x74\x6D\x6C\x3E\x3C\x2F\x68\x74\x6D\x6C\x3E\x0A"),
}
- node.SetMode(420)
- node.SetModTimeUnix(1588592347, 0)
+ node.SetMode(0o644)
+ node.SetModTimeUnix(1709751019, 629372161)
node.SetName("index-link.html")
node.SetSize(14)
return node
@@ -160,8 +160,8 @@ func generate_testdata_exclude_index_link_js() *memfs.Node {
GenFuncName: "generate_testdata_exclude_index_link_js",
Content: []byte("\x66\x75\x6E\x63\x74\x69\x6F\x6E\x20\x58\x28\x29\x20\x7B\x7D\x0A"),
}
- node.SetMode(420)
- node.SetModTimeUnix(1562038157, 0)
+ node.SetMode(0o644)
+ node.SetModTimeUnix(1709751019, 629372161)
node.SetName("index-link.js")
node.SetSize(16)
return node
@@ -174,8 +174,8 @@ func generate_testdata_include() *memfs.Node {
ContentType: "",
GenFuncName: "generate_testdata_include",
}
- node.SetMode(2147484141)
- node.SetModTimeUnix(1629623653, 749800911)
+ node.SetMode(0o20000000755)
+ node.SetModTimeUnix(1710216708, 236975330)
node.SetName("include")
node.SetSize(0)
node.AddChild(_memFS_getNode(memFS, "/include/dir", generate_testdata_include_dir))
@@ -192,8 +192,8 @@ func generate_testdata_include_dir() *memfs.Node {
ContentType: "",
GenFuncName: "generate_testdata_include_dir",
}
- node.SetMode(2147484096)
- node.SetModTimeUnix(1564836597, 0)
+ node.SetMode(0o20000000700)
+ node.SetModTimeUnix(1710216708, 236975330)
node.SetName("dir")
node.SetSize(0)
return node
@@ -207,8 +207,8 @@ func generate_testdata_include_index_css() *memfs.Node {
GenFuncName: "generate_testdata_include_index_css",
Content: []byte("\x62\x6F\x64\x79\x20\x7B\x0A\x7D\x0A"),
}
- node.SetMode(420)
- node.SetModTimeUnix(1562038157, 0)
+ node.SetMode(0o644)
+ node.SetModTimeUnix(1709751019, 626038828)
node.SetName("index.css")
node.SetSize(9)
return node
@@ -222,8 +222,8 @@ func generate_testdata_include_index_html() *memfs.Node {
GenFuncName: "generate_testdata_include_index_html",
Content: []byte("\x3C\x68\x74\x6D\x6C\x3E\x3C\x2F\x68\x74\x6D\x6C\x3E\x0A"),
}
- node.SetMode(420)
- node.SetModTimeUnix(1588592347, 0)
+ node.SetMode(0o644)
+ node.SetModTimeUnix(1709751019, 629372161)
node.SetName("index.html")
node.SetSize(14)
return node
@@ -237,8 +237,8 @@ func generate_testdata_include_index_js() *memfs.Node {
GenFuncName: "generate_testdata_include_index_js",
Content: []byte("\x66\x75\x6E\x63\x74\x69\x6F\x6E\x20\x58\x28\x29\x20\x7B\x7D\x0A"),
}
- node.SetMode(420)
- node.SetModTimeUnix(1562038157, 0)
+ node.SetMode(0o644)
+ node.SetModTimeUnix(1709751019, 629372161)
node.SetName("index.js")
node.SetSize(16)
return node
@@ -252,8 +252,8 @@ func generate_testdata_index_css() *memfs.Node {
GenFuncName: "generate_testdata_index_css",
Content: []byte("\x62\x6F\x64\x79\x20\x7B\x0A\x7D\x0A"),
}
- node.SetMode(420)
- node.SetModTimeUnix(1562038157, 0)
+ node.SetMode(0o644)
+ node.SetModTimeUnix(1709751019, 626038828)
node.SetName("index.css")
node.SetSize(9)
return node
@@ -267,8 +267,8 @@ func generate_testdata_index_html() *memfs.Node {
GenFuncName: "generate_testdata_index_html",
Content: []byte("\x3C\x68\x74\x6D\x6C\x3E\x3C\x2F\x68\x74\x6D\x6C\x3E\x0A"),
}
- node.SetMode(420)
- node.SetModTimeUnix(1588592347, 0)
+ node.SetMode(0o644)
+ node.SetModTimeUnix(1709751019, 629372161)
node.SetName("index.html")
node.SetSize(14)
return node
@@ -282,8 +282,8 @@ func generate_testdata_index_js() *memfs.Node {
GenFuncName: "generate_testdata_index_js",
Content: []byte("\x66\x75\x6E\x63\x74\x69\x6F\x6E\x20\x58\x28\x29\x20\x7B\x7D\x0A"),
}
- node.SetMode(420)
- node.SetModTimeUnix(1562038157, 0)
+ node.SetMode(0o644)
+ node.SetModTimeUnix(1709751019, 629372161)
node.SetName("index.js")
node.SetSize(16)
return node
@@ -297,8 +297,8 @@ func generate_testdata_plain() *memfs.Node {
GenFuncName: "generate_testdata_plain",
Content: []byte("\x54\x68\x69\x73\x20\x69\x73\x20\x61\x20\x70\x6C\x61\x69\x6E\x20\x74\x65\x78\x74\x2E\x0A"),
}
- node.SetMode(420)
- node.SetModTimeUnix(1562038157, 0)
+ node.SetMode(0o644)
+ node.SetModTimeUnix(1709751019, 629372161)
node.SetName("plain")
node.SetSize(22)
return node
diff --git a/lib/memfs/internal/test/embed_disable_modtime/embed_test.go b/lib/memfs/internal/test/embed_disable_modtime/embed_test.go
index a691eebc..e4ec47ba 100644
--- a/lib/memfs/internal/test/embed_disable_modtime/embed_test.go
+++ b/lib/memfs/internal/test/embed_disable_modtime/embed_test.go
@@ -13,7 +13,7 @@ func generate_testdata() *memfs.Node {
ContentType: "",
GenFuncName: "generate_testdata",
}
- node.SetMode(2147484141)
+ node.SetMode(0o20000000755)
node.SetName("/")
node.SetSize(0)
node.AddChild(_memFS_getNode(memFS, "/direct", generate_testdata_direct))
@@ -33,7 +33,7 @@ func generate_testdata_direct() *memfs.Node {
ContentType: "",
GenFuncName: "generate_testdata_direct",
}
- node.SetMode(2147484141)
+ node.SetMode(0o20000000755)
node.SetName("direct")
node.SetSize(0)
node.AddChild(_memFS_getNode(memFS, "/direct/add", generate_testdata_direct_add))
@@ -47,7 +47,7 @@ func generate_testdata_direct_add() *memfs.Node {
ContentType: "",
GenFuncName: "generate_testdata_direct_add",
}
- node.SetMode(2147484141)
+ node.SetMode(0o20000000755)
node.SetName("add")
node.SetSize(0)
node.AddChild(_memFS_getNode(memFS, "/direct/add/file", generate_testdata_direct_add_file))
@@ -63,7 +63,7 @@ func generate_testdata_direct_add_file() *memfs.Node {
GenFuncName: "generate_testdata_direct_add_file",
Content: []byte("\x54\x65\x73\x74\x20\x64\x69\x72\x65\x63\x74\x20\x61\x64\x64\x20\x66\x69\x6C\x65\x2E\x0A"),
}
- node.SetMode(420)
+ node.SetMode(0o644)
node.SetName("file")
node.SetSize(22)
return node
@@ -77,7 +77,7 @@ func generate_testdata_direct_add_file2() *memfs.Node {
GenFuncName: "generate_testdata_direct_add_file2",
Content: []byte("\x54\x65\x73\x74\x20\x64\x69\x72\x65\x63\x74\x20\x61\x64\x64\x20\x66\x69\x6C\x65\x20\x32\x2E\x0A"),
}
- node.SetMode(420)
+ node.SetMode(0o644)
node.SetName("file2")
node.SetSize(24)
return node
@@ -90,7 +90,7 @@ func generate_testdata_exclude() *memfs.Node {
ContentType: "",
GenFuncName: "generate_testdata_exclude",
}
- node.SetMode(2147484141)
+ node.SetMode(0o20000000755)
node.SetName("exclude")
node.SetSize(0)
node.AddChild(_memFS_getNode(memFS, "/exclude/dir", generate_testdata_exclude_dir))
@@ -107,7 +107,7 @@ func generate_testdata_exclude_dir() *memfs.Node {
ContentType: "",
GenFuncName: "generate_testdata_exclude_dir",
}
- node.SetMode(2147484096)
+ node.SetMode(0o20000000700)
node.SetName("dir")
node.SetSize(0)
return node
@@ -121,7 +121,7 @@ func generate_testdata_exclude_index_link_css() *memfs.Node {
GenFuncName: "generate_testdata_exclude_index_link_css",
Content: []byte("\x62\x6F\x64\x79\x20\x7B\x0A\x7D\x0A"),
}
- node.SetMode(420)
+ node.SetMode(0o644)
node.SetName("index-link.css")
node.SetSize(9)
return node
@@ -135,7 +135,7 @@ func generate_testdata_exclude_index_link_html() *memfs.Node {
GenFuncName: "generate_testdata_exclude_index_link_html",
Content: []byte("\x3C\x68\x74\x6D\x6C\x3E\x3C\x2F\x68\x74\x6D\x6C\x3E\x0A"),
}
- node.SetMode(420)
+ node.SetMode(0o644)
node.SetName("index-link.html")
node.SetSize(14)
return node
@@ -149,7 +149,7 @@ func generate_testdata_exclude_index_link_js() *memfs.Node {
GenFuncName: "generate_testdata_exclude_index_link_js",
Content: []byte("\x66\x75\x6E\x63\x74\x69\x6F\x6E\x20\x58\x28\x29\x20\x7B\x7D\x0A"),
}
- node.SetMode(420)
+ node.SetMode(0o644)
node.SetName("index-link.js")
node.SetSize(16)
return node
@@ -162,7 +162,7 @@ func generate_testdata_include() *memfs.Node {
ContentType: "",
GenFuncName: "generate_testdata_include",
}
- node.SetMode(2147484141)
+ node.SetMode(0o20000000755)
node.SetName("include")
node.SetSize(0)
node.AddChild(_memFS_getNode(memFS, "/include/dir", generate_testdata_include_dir))
@@ -179,7 +179,7 @@ func generate_testdata_include_dir() *memfs.Node {
ContentType: "",
GenFuncName: "generate_testdata_include_dir",
}
- node.SetMode(2147484096)
+ node.SetMode(0o20000000700)
node.SetName("dir")
node.SetSize(0)
return node
@@ -193,7 +193,7 @@ func generate_testdata_include_index_css() *memfs.Node {
GenFuncName: "generate_testdata_include_index_css",
Content: []byte("\x62\x6F\x64\x79\x20\x7B\x0A\x7D\x0A"),
}
- node.SetMode(420)
+ node.SetMode(0o644)
node.SetName("index.css")
node.SetSize(9)
return node
@@ -207,7 +207,7 @@ func generate_testdata_include_index_html() *memfs.Node {
GenFuncName: "generate_testdata_include_index_html",
Content: []byte("\x3C\x68\x74\x6D\x6C\x3E\x3C\x2F\x68\x74\x6D\x6C\x3E\x0A"),
}
- node.SetMode(420)
+ node.SetMode(0o644)
node.SetName("index.html")
node.SetSize(14)
return node
@@ -221,7 +221,7 @@ func generate_testdata_include_index_js() *memfs.Node {
GenFuncName: "generate_testdata_include_index_js",
Content: []byte("\x66\x75\x6E\x63\x74\x69\x6F\x6E\x20\x58\x28\x29\x20\x7B\x7D\x0A"),
}
- node.SetMode(420)
+ node.SetMode(0o644)
node.SetName("index.js")
node.SetSize(16)
return node
@@ -235,7 +235,7 @@ func generate_testdata_index_css() *memfs.Node {
GenFuncName: "generate_testdata_index_css",
Content: []byte("\x62\x6F\x64\x79\x20\x7B\x0A\x7D\x0A"),
}
- node.SetMode(420)
+ node.SetMode(0o644)
node.SetName("index.css")
node.SetSize(9)
return node
@@ -249,7 +249,7 @@ func generate_testdata_index_html() *memfs.Node {
GenFuncName: "generate_testdata_index_html",
Content: []byte("\x3C\x68\x74\x6D\x6C\x3E\x3C\x2F\x68\x74\x6D\x6C\x3E\x0A"),
}
- node.SetMode(420)
+ node.SetMode(0o644)
node.SetName("index.html")
node.SetSize(14)
return node
@@ -263,7 +263,7 @@ func generate_testdata_index_js() *memfs.Node {
GenFuncName: "generate_testdata_index_js",
Content: []byte("\x66\x75\x6E\x63\x74\x69\x6F\x6E\x20\x58\x28\x29\x20\x7B\x7D\x0A"),
}
- node.SetMode(420)
+ node.SetMode(0o644)
node.SetName("index.js")
node.SetSize(16)
return node
@@ -277,7 +277,7 @@ func generate_testdata_plain() *memfs.Node {
GenFuncName: "generate_testdata_plain",
Content: []byte("\x54\x68\x69\x73\x20\x69\x73\x20\x61\x20\x70\x6C\x61\x69\x6E\x20\x74\x65\x78\x74\x2E\x0A"),
}
- node.SetMode(420)
+ node.SetMode(0o644)
node.SetName("plain")
node.SetSize(22)
return node
diff --git a/lib/memfs/template.go b/lib/memfs/template.go
index 5f21bf02..c751ac73 100644
--- a/lib/memfs/template.go
+++ b/lib/memfs/template.go
@@ -59,7 +59,7 @@ func {{ .Node.GenFuncName}}() *memfs.Node {
Content: []byte("{{range $x, $c := .Node.Content}}{{ printf "\\x%02X" $c }}{{end}}"),
{{- end }}
}
- node.SetMode({{printf "%d" .Node.Mode}})
+ node.SetMode({{printf "%O" .Node.Mode}})
{{- if not .Opts.Embed.WithoutModTime }}
node.SetModTimeUnix({{.Node.ModTime.Unix}}, {{.Node.ModTime.Nanosecond}})
{{- end }}
generated by cgit v1.3 (git 2.53.0) at 2026-04-15 01:52:45 +0000