diff --git a/servlet/templates.go b/servlet/templates.go new file mode 100644 index 0000000..176f4fe --- /dev/null +++ b/servlet/templates.go @@ -0,0 +1,29 @@ +package servlet + +import ( + "html/template" + "io/ioutil" + "net/http" + "os" +) + +func RenderTemplate(w http.ResponseWriter, pathlike string, data any) { + templateHelper := template.New(pathlike) + f, err := os.OpenFile(pathlike, os.O_RDONLY, 0777) + if err != nil { + panic(err) + } + defer f.Close() + + content, err := ioutil.ReadAll(f) + if err != nil { + panic(err) + } + + templ, err := templateHelper.Parse(string(content)) + err = templ.Execute(w, data) + if err != nil { + panic(err) + } + +} diff --git a/vinegarUtil/files.go b/vinegarUtil/files.go index f34d4c8..0769f7b 100644 --- a/vinegarUtil/files.go +++ b/vinegarUtil/files.go @@ -3,33 +3,10 @@ package vinegarUtil import ( "bytes" gzip2 "compress/gzip" - "html/template" "io/ioutil" - "net/http" "os" ) -func RenderTemplate(w http.ResponseWriter, pathlike string, data any) { - templateHelper := template.New(pathlike) - f, err := os.OpenFile(pathlike, os.O_RDONLY, 0777) - if err != nil { - panic(err) - } - defer f.Close() - - content, err := ioutil.ReadAll(f) - if err != nil { - panic(err) - } - - templ, err := templateHelper.Parse(string(content)) - err = templ.Execute(w, data) - if err != nil { - panic(err) - } - -} - func GetDiskContent(filePath string) (*[]byte, bool) { _, ferr := os.Stat(filePath) if os.IsNotExist(ferr) { diff --git a/vinegarUtil/WebLRU.go b/vinegarUtil/webLRU.go similarity index 99% rename from vinegarUtil/WebLRU.go rename to vinegarUtil/webLRU.go index c0697e0..bd56ecc 100644 --- a/vinegarUtil/WebLRU.go +++ b/vinegarUtil/webLRU.go @@ -8,7 +8,7 @@ import ( ) const ( - DefaultCacheTimeInMinutes = 15 + DefaultCacheTimeInMinutes = 1 ) type (