Docker/documize
Docker/documize
1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-07-24 15:49:44 +02:00
Code Releases Activity

Move over to Go embed directive

Browse source
This commit is contained in:
HarveyKandola 2021-08-18 19:39:51 -04:00
parent cddba799f8
commit 470e2d3ecf
18 changed files with 148 additions and 25205 deletions
Download patch file Download diff file Expand all files Collapse all files

48
server/web/embed.go
View file

@ -1,48 +0,0 @@
// Copyright 2016 Documize Inc. <legal@documize.com>. All rights reserved.
//
// This software (Documize Community Edition) is licensed under
// GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html
//
// You can operate outside the AGPL restrictions by purchasing
// Documize Enterprise Edition and obtaining a commercial license
// by contacting <sales@documize.com>.
//
// https://documize.com
// Package web contains the Documize static web data.
package web
import (
"net/http"
)
// EmbedHandler is defined in each embed directory
type EmbedHandler interface {
Asset(string) ([]byte, error)
AssetDir(string) ([]string, error)
StaticAssetsFileSystem() http.FileSystem
}
// Embed allows access to the embedded data
var Embed EmbedHandler
// StaticAssetsFileSystem data encoded in the go:generate above.
func StaticAssetsFileSystem() http.FileSystem {
return Embed.StaticAssetsFileSystem()
//return &assetfs.AssetFS{Asset: Asset, AssetDir: AssetDir, AssetInfo: AssetInfo, Prefix: "bindata/public"}
}
// ReadFile is intended to substitute for ioutil.ReadFile().
func ReadFile(filename string) ([]byte, error) {
return Embed.Asset("bindata/" + filename)
}
// Asset fetch.
func Asset(location string) ([]byte, error) {
return Embed.Asset(location)
}
// AssetDir returns web app "assets" folder.
func AssetDir(dir string) ([]string, error) {
return Embed.AssetDir(dir)
}

8
server/web/serve.go
View file

@ -16,6 +16,7 @@ import (
"html/template"
"net/http"
"github.com/documize/community/core/asset"
"github.com/documize/community/core/env"
"github.com/documize/community/core/secrets"
"github.com/documize/community/domain/store"
@ -39,11 +40,12 @@ type Handler struct {
// EmberHandler serves HTML web pages
func (h *Handler) EmberHandler(w http.ResponseWriter, r *http.Request) {
filename := "index.html"
switch h.Runtime.Flags.SiteMode {
case env.SiteModeOffline:
filename = "offline.html"
case env.SiteModeSetup:
// NoOp
// noop
case env.SiteModeBadDB:
filename = "db-error.html"
default:
@ -52,13 +54,13 @@ func (h *Handler) EmberHandler(w http.ResponseWriter, r *http.Request) {
SiteInfo.Edition = string(h.Runtime.Product.Edition)
data, err := Embed.Asset("bindata/" + filename)
content, _, err := asset.FetchStatic(h.Runtime.Assets, filename)
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
emberView := template.Must(template.New(filename).Parse(string(data)))
emberView := template.Must(template.New(filename).Parse(string(content)))
if err := emberView.Execute(w, SiteInfo); err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)