consolidating mithril/tailwind vendoring

tractordev · Mar 9, 2024 · 4321873 · 4321873
1 parent 83e6749
commit 4321873
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 50 deletions.
diff --git a/internal/app/explorer/index.html b/internal/app/explorer/index.html
@@ -3,8 +3,8 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <link href="./vnd/tailwind-2.2.16.min.css" rel="stylesheet" />
-    <script src="./vnd/mithril-2.0.3.min.js"></script>
+    <link href="/sys/cmd/kernel/web/vnd/tailwind/tailwind-2.2.16.min.css" rel="stylesheet" />
+    <script src="/sys/cmd/kernel/web/vnd/mithril/mithril-2.2.3.min.js"></script>
     <link rel="stylesheet" href="./styles.css">
     <title>File Explorer</title>
   </head>

diff --git a/internal/app/explorer/vnd/mithril-2.0.3.min.js b/internal/app/explorer/vnd/mithril-2.0.3.min.js
diff --git a/internal/app/explorer/vnd/tailwind-2.2.16.min.css b/internal/app/explorer/vnd/tailwind-2.2.16.min.css
diff --git a/internal/app/jazz-todo/index.html b/internal/app/jazz-todo/index.html
@@ -3,8 +3,8 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <link href="./vnd/tailwind-2.2.16.min.css" rel="stylesheet" />
-    <script src="./vnd/mithril-2.2.3.min.js"></script>
+    <link href="/sys/cmd/kernel/web/vnd/tailwind/tailwind-2.2.16.min.css" rel="stylesheet" />
+    <script src="/sys/cmd/kernel/web/vnd/mithril/mithril-2.2.3.min.js"></script>
     <title>Jazz Todos</title>
   </head>
   <body class="h-full font-mono font-semibold bg-gray-300">

diff --git a/internal/app/jazz-todo/vnd/jazz.min.js b/internal/app/jazz-todo/vnd/jazz.min.js
diff --git a/internal/app/jazz-todo/vnd/tailwind-2.2.16.min.css b/internal/app/jazz-todo/vnd/tailwind-2.2.16.min.css
diff --git a/kernel/jazz/jazz.go b/kernel/jazz/jazz.go
@@ -34,7 +34,7 @@ type jazzfs struct {
 
 func NewJazzFs() fs.FS {
 	return &jazzfs{
-		cache: cache.New(1 * time.Second),
+		cache: cache.New(2 * time.Second),
 	}
 }
 
@@ -200,10 +200,9 @@ type jazzfile struct {
 	node    js.Value
 	path    string
 	offset  int64
-	rcache  []byte
+	cache   []byte
 	lastFid string
 	dirty   bool
-	wcache  []byte
 	wmu     sync.Mutex
 }
 
@@ -220,16 +219,17 @@ func (f *jazzfile) ReadDir(n int) ([]fs.DirEntry, error) {
 }
 
 func (f *jazzfile) data() ([]byte, error) {
-	stat := fsUtil("stat", f.path)
-	if stat.IsNull() {
-		return []byte{}, os.ErrNotExist
+	fi, err := f.fs.Stat(f.path)
+	if err != nil {
+		return nil, err
 	}
-	fid := stat.Get("fileID")
+	stat := fi.(*jazzinfo)
+	fid := stat.val.Get("fileID")
 	if fid.IsUndefined() {
 		return []byte{}, os.ErrNotExist
 	}
 	if fid.String() == f.lastFid {
-		return f.rcache, nil
+		return f.cache, nil
 	}
 	jsbuf := fsUtil("fetchFile", fid)
 	buf := make([]byte, jsbuf.Length())
@@ -240,7 +240,7 @@ func (f *jazzfile) data() ([]byte, error) {
 	// 	log("slow file load, returning cached", f.path)
 	// 	return f.rcache, nil
 	// case b := <-ch:
-	f.rcache = buf
+	f.cache = buf
 	f.lastFid = fid.String()
 	return buf, nil
 	// }
@@ -300,11 +300,11 @@ func (f *jazzfile) Write(p []byte) (n int, err error) {
 	}
 	new := make([]byte, f.offset+int64(len(p)))
 	copy(new, cur[:f.offset])
-	copy(new[f.offset:], p)
-	f.wcache = new
-	f.offset += int64(len(p))
+	n = copy(new[f.offset:], p)
+	f.cache = new
+	f.offset += int64(n)
 	f.dirty = true
-	return len(p), nil
+	return n, nil
 }
 
 func (f *jazzfile) Close() error {
@@ -322,7 +322,7 @@ func (f *jazzfile) Sync() error {
 	f.dirty = false
 	ch := make(chan bool, 1)
 	go func() {
-		f.setData(f.wcache)
+		f.setData(f.cache)
 		ch <- true
 	}()
 	select {

diff --git a/kernel/jazz/jazz.min.js b/kernel/jazz/jazz.min.js
diff --git a/kernel/web/vnd/mithril/mithril-2.0.3.min.js b/kernel/web/vnd/mithril/mithril-2.0.3.min.js
diff --git a/...al/app/jazz-todo/vnd/mithril-2.2.3.min.js → kernel/web/vnd/mithril/mithril-2.2.3.min.js b/...al/app/jazz-todo/vnd/mithril-2.2.3.min.js → kernel/web/vnd/mithril/mithril-2.2.3.min.js