feat: embed static files and templates in binary
This commit is contained in:
parent
98c98d16b4
commit
c8b706aee6
2
.gitignore
vendored
2
.gitignore
vendored
@ -1,4 +1,4 @@
|
||||
|
||||
tmp/
|
||||
main
|
||||
|
||||
viddl
|
||||
|
9
bindata.go
Normal file
9
bindata.go
Normal file
@ -0,0 +1,9 @@
|
||||
package main
|
||||
|
||||
import "embed"
|
||||
|
||||
//go:embed templates/*
|
||||
var TemplatesFS embed.FS
|
||||
|
||||
//go:embed static/css/*
|
||||
var PublicFS embed.FS
|
24
main.go
24
main.go
@ -9,7 +9,6 @@ import (
|
||||
"net/http"
|
||||
"time"
|
||||
|
||||
"gitea.hbanafa.com/hesham/viddl/templates"
|
||||
)
|
||||
|
||||
const (
|
||||
@ -79,17 +78,29 @@ func writeJSONResponse(w http.ResponseWriter, s string) http.ResponseWriter {
|
||||
|
||||
}
|
||||
|
||||
var views *template.Template
|
||||
var templates *template.Template
|
||||
|
||||
// TODO: Change all this to have a unified context
|
||||
var AppURL string = "http://localhost:8080"
|
||||
type HTMLBaseData struct {
|
||||
Formats []DownloadFormats
|
||||
AppURL string
|
||||
}
|
||||
|
||||
var appData HTMLBaseData = HTMLBaseData{
|
||||
AppURL: AppURL,
|
||||
}
|
||||
|
||||
func init() {
|
||||
|
||||
log.Println("[ init ] Starting...")
|
||||
views = template.Must(template.ParseFS(templates.TemplatesFS , "*.html"))
|
||||
templates = template.Must(template.ParseFS(TemplatesFS , "templates/*.html"))
|
||||
|
||||
}
|
||||
func main() {
|
||||
|
||||
handler := http.NewServeMux()
|
||||
handler.Handle("/static/", http.StripPrefix("/static/", http.FileServer(http.FS(PublicFS))))
|
||||
|
||||
handler.HandleFunc(
|
||||
"/download",
|
||||
@ -131,8 +142,7 @@ func main() {
|
||||
log.Println("URL from convx", downloadURL)
|
||||
|
||||
// Serve Button Template
|
||||
tmpl := template.Must(template.ParseFiles("templates/download-result.html"))
|
||||
err = tmpl.Execute(w, downloadURL)
|
||||
err = templates.ExecuteTemplate(w,"download-result.html", downloadURL)
|
||||
if err != nil {
|
||||
log.Println(err.Error())
|
||||
w.WriteHeader(500)
|
||||
@ -141,14 +151,14 @@ func main() {
|
||||
},
|
||||
)
|
||||
handler.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
|
||||
tmpl := template.Must(template.ParseFiles("templates/download.html"))
|
||||
formats := []DownloadFormats{}
|
||||
formats = append(formats, DownloadFormats{
|
||||
VideoRes: "720p",
|
||||
audioOnly: false,
|
||||
videoOnly: false,
|
||||
})
|
||||
err := tmpl.Execute(w, formats)
|
||||
appData.Formats = formats
|
||||
err := templates.ExecuteTemplate(w, "download.html", appData)
|
||||
if err != nil {
|
||||
log.Println(err.Error())
|
||||
w.WriteHeader(500)
|
||||
|
@ -3,7 +3,7 @@
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@picocss/pico@1/css/pico.min.css">
|
||||
<link rel="stylesheet" href="{{ .AppURL }}/static/static/css/pico.min.css">
|
||||
<script src="https://unpkg.com/htmx.org@1.9.5"></script>
|
||||
<title>YT Download</title>
|
||||
</head>
|
||||
@ -15,7 +15,7 @@
|
||||
<!-- Select -->
|
||||
<select required>
|
||||
<option value="" disabled selected>Format</option>
|
||||
{{ range . }} <option>{{ .VideoRes }}</option>{{ end }}
|
||||
{{ range .Formats }} <option>{{ .VideoRes }}</option>{{ end }}
|
||||
</select>
|
||||
</div>
|
||||
<button id="get-btn">Get
|
||||
|
@ -1,7 +0,0 @@
|
||||
package templates
|
||||
|
||||
import "embed"
|
||||
|
||||
//go:embed *.html
|
||||
var TemplatesFS embed.FS
|
||||
|
Loading…
Reference in New Issue
Block a user