github/wails
5
0
Fork 0
mirror of https://github.com/wailsapp/wails.git synced 2025-05-03 06:51:26 +08:00
Code Projects Activity

Initial commit (#1241)

Browse Source
This commit is contained in:
Lea Anthony 2022-03-10 21:20:41 +11:00 committed by GitHub
parent 622c4adad6
commit 1048782eb4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
v2/internal/frontend/assetserver/assetserver_desktop.go
View File

@ -17,13 +17,16 @@ import (
var defaultHTML []byte var defaultHTML []byte
type DesktopAssetServer struct { type DesktopAssetServer struct {
assets fs.FS assets fs.FS
runtimeJS []byte runtimeJS []byte
logger *logger.Logger logger *logger.Logger
servingFromDisk bool
} }
func NewDesktopAssetServer(ctx context.Context, assets fs.FS, bindingsJSON string) (*DesktopAssetServer, error) { func NewDesktopAssetServer(ctx context.Context, assets fs.FS, bindingsJSON string, servingFromDisk bool) (*DesktopAssetServer, error) {
result := &DesktopAssetServer{} result := &DesktopAssetServer{
servingFromDisk: servingFromDisk,
}
_logger := ctx.Value("logger") _logger := ctx.Value("logger")
if _logger != nil { if _logger != nil {
@ -53,6 +56,9 @@ func (d *DesktopAssetServer) LogDebug(message string, args ...interface{}) {
// loadFile will try to load the file from disk. If there is an error // loadFile will try to load the file from disk. If there is an error
// it will retry until eventually it will give up and error. // it will retry until eventually it will give up and error.
func (d *DesktopAssetServer) loadFile(filename string) ([]byte, error) { func (d *DesktopAssetServer) loadFile(filename string) ([]byte, error) {
if !d.servingFromDisk {
return fs.ReadFile(d.assets, filename)
}
var result []byte var result []byte
var err error var err error
for tries := 0; tries < 50; tries++ { for tries := 0; tries < 50; tries++ {

2
v2/internal/frontend/desktop/darwin/frontend.go
View File

@ -80,7 +80,7 @@ func NewFrontend(ctx context.Context, appoptions *options.App, myLogger *logger.
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
assets, err := assetserver.NewDesktopAssetServer(ctx, appoptions.Assets, bindingsJSON) assets, err := assetserver.NewDesktopAssetServer(ctx, appoptions.Assets, bindingsJSON, result.servingFromDisk)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }

2
v2/internal/frontend/desktop/linux/frontend.go
View File

@ -87,7 +87,7 @@ func NewFrontend(ctx context.Context, appoptions *options.App, myLogger *logger.
result.servingFromDisk = true result.servingFromDisk = true
} }
assets, err := assetserver.NewDesktopAssetServer(ctx, appoptions.Assets, bindingsJSON) assets, err := assetserver.NewDesktopAssetServer(ctx, appoptions.Assets, bindingsJSON, result.servingFromDisk)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }

2
v2/internal/frontend/desktop/windows/frontend.go
View File

@ -82,7 +82,7 @@ func NewFrontend(ctx context.Context, appoptions *options.App, myLogger *logger.
result.servingFromDisk = true result.servingFromDisk = true
} }
assets, err := assetserver.NewDesktopAssetServer(ctx, appoptions.Assets, bindingsJSON) assets, err := assetserver.NewDesktopAssetServer(ctx, appoptions.Assets, bindingsJSON, result.servingFromDisk)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }