-
-
Notifications
You must be signed in to change notification settings - Fork 52
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: use 'embed' to package WebUI sources instead of go.rice
- Loading branch information
1 parent
11bd9e0
commit e3ba5cf
Showing
9 changed files
with
90 additions
and
63 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| package webui | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "fmt" | ||
| "io" | ||
| "io/fs" | ||
| "net/http" | ||
| "strings" | ||
| ) | ||
|
|
||
| func Handler() http.Handler { | ||
| return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { | ||
| if strings.HasSuffix(r.URL.Path, "/") { | ||
| r.URL.Path += "index.html" | ||
| } | ||
|
|
||
| f, err := content.Open(contentPrefix + r.URL.Path + ".gz") | ||
| if err == nil { | ||
| defer f.Close() | ||
| w.Header().Set("Content-Encoding", "gzip") | ||
| serveFile(f, w, r, r.URL.Path) | ||
| return | ||
| } | ||
|
|
||
| f, err = content.Open(contentPrefix + r.URL.Path) | ||
| if err == nil { | ||
| defer f.Close() | ||
| serveFile(f, w, r, r.URL.Path) | ||
| return | ||
| } | ||
|
|
||
| http.Error(w, "Not found", http.StatusNotFound) | ||
| }) | ||
| } | ||
|
|
||
| func serveFile(f fs.File, w http.ResponseWriter, r *http.Request, path string) { | ||
| data, err := io.ReadAll(f) | ||
| if err != nil { | ||
| http.Error(w, err.Error(), http.StatusInternalServerError) | ||
| return | ||
| } | ||
|
|
||
| stat, err := f.Stat() | ||
| if err != nil { | ||
| http.Error(w, err.Error(), http.StatusInternalServerError) | ||
| return | ||
| } | ||
|
|
||
| http.ServeContent(w, r, path, stat.ModTime(), bytes.NewReader(data)) | ||
| } | ||
|
|
||
| func init() { | ||
| files, err := fs.ReadDir(content, contentPrefix) | ||
| if err != nil { | ||
| panic("expected embedded files for WebUI") | ||
| } | ||
|
|
||
| if len(files) == 0 { | ||
| panic(fmt.Sprintf("expected >0 embedded files for WebUI, got %d", len(files))) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| //go:build linux || darwin | ||
| // +build linux darwin | ||
|
|
||
| //go:generate sh -c "rm -rf ./dist && UI_OS=unix npm run build && gzip ./dist/*" | ||
|
|
||
| package webui | ||
|
|
||
| import ( | ||
| "embed" | ||
| ) | ||
|
|
||
| //go:embed dist | ||
| var content embed.FS | ||
| var contentPrefix = "dist" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| //go:build windows | ||
| // +build windows | ||
|
|
||
| //go:generate sh -c "rm -rf ./dist-windows && UI_OS=unix npm run build-windows && gzip ./dist-windows/*" | ||
|
|
||
| package webui | ||
|
|
||
| import "embed" | ||
|
|
||
| //go:embed dist-windows/* | ||
| var content embed.FS | ||
| var contentPrefix = "dist-windows" |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.