Hazel/transfem-startpage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: Hazel:16a65df664cbcc7bef1fe1204e34256f06929890
Branches Tags
Hazel:main
..
compare: Hazel:f574a00a8f2e5d42affc6f380d8587bdf6eef867
Branches Tags
Hazel:main

No commits in common. "16a65df664cbcc7bef1fe1204e34256f06929890" and "f574a00a8f2e5d42affc6f380d8587bdf6eef867" have entirely different histories.
16a65df664 ... f574a00a8f

6 changed files with 115 additions and 137 deletions
Show Stats Expand all files Collapse all files

16
internal/cli/start.go
View File

@ -1,18 +1,8 @@
package cli
import (
"log"
"os"
"gitea.elara.ws/Hazel/transfem-startpage/internal/server"
)
import "log"
func Start() error {
profile := "default"
if len(os.Args) > 2 {
profile = os.Args[2]
}
log.Println("starting server with profile " + profile)
return server.Start(profile)
log.Println("starting server")
return nil
}

21
internal/rendering/config.go
View File

@ -2,9 +2,11 @@ package rendering
import (
"errors"
"log"
"fmt"
"maps"
"os"
"path/filepath"
"slices"
"gitea.elara.ws/Hazel/transfem-startpage/internal/diyhrt"
"github.com/pelletier/go-toml"
@ -100,6 +102,17 @@ func NewConfig() Config {
}
}
func (c *Config) LoadDiyHrt(listings []diyhrt.Listing) {
existingStores := make(map[int]diyhrt.Store)
for _, listing := range listings {
existingStores[listing.Store.Id] = listing.Store
}
c.Template.Listings = c.DiyHrt.ListingFilter.Filter(listings)
c.Template.Stores = c.DiyHrt.StoreFilter.Filter(slices.Collect(maps.Values(existingStores)))
}
func (rc *Config) ScanForConfigFile(profile string) error {
profileFile := profile + ".toml"
@ -128,7 +141,7 @@ func (rc *Config) LoadConfigFile(file string) error {
return err
}
log.Println("loading config file", file)
fmt.Println("loading config file: " + file)
content, err := os.ReadFile(file)
@ -140,10 +153,12 @@ func (rc *Config) LoadConfigFile(file string) error {
}
func (c *Config) Init() error {
log.Println("downloading website icons...")
fmt.Print("downloading website icons")
for i := range c.Template.Websites {
fmt.Print(".")
c.Template.Websites[i].Cache()
}
fmt.Print("\n")
return nil
}

28
internal/rendering/diyhrt.go
View File

@ -1,28 +0,0 @@
package rendering
import (
"maps"
"slices"
"gitea.elara.ws/Hazel/transfem-startpage/internal/diyhrt"
)
func (c *Config) LoadDiyHrt(listings []diyhrt.Listing) {
existingStores := make(map[int]diyhrt.Store)
for _, listing := range listings {
existingStores[listing.Store.Id] = listing.Store
}
c.Template.Listings = c.DiyHrt.ListingFilter.Filter(listings)
c.Template.Stores = c.DiyHrt.StoreFilter.Filter(slices.Collect(maps.Values(existingStores)))
}
func (c *Config) FetchDiyHrt() error {
l, err := diyhrt.GetListings(c.DiyHrt.ApiKey)
if err != nil {
return err
}
c.LoadDiyHrt(l)
return nil
}

42
internal/server/embed.go
View File

@ -1,42 +0,0 @@
package server
import (
"bytes"
"embed"
"io/fs"
"log"
"net/http"
"text/template"
"github.com/labstack/echo/v4"
)
var FrontendFiles embed.FS
func getFileContent() string {
content, err := FrontendFiles.ReadFile("frontend/index.html")
if err != nil {
log.Fatal(err)
}
return string(content)
}
func getIndex(c echo.Context) error {
IndexTemplate := template.Must(template.New("index").Parse(getFileContent()))
var tpl bytes.Buffer
IndexTemplate.Execute(&tpl, Config.Template)
return c.HTML(http.StatusOK, tpl.String())
}
func getFileSystem() http.FileSystem {
fsys, err := fs.Sub(FrontendFiles, "frontend")
if err != nil {
panic(err)
}
return http.FS(fsys)
}

48
internal/server/server.go
View File

@ -1,48 +0,0 @@
package server
import (
"log"
"net/http"
"strconv"
"gitea.elara.ws/Hazel/transfem-startpage/internal/rendering"
"github.com/labstack/echo/v4"
)
var Config = rendering.NewConfig()
func Start(profile string) error {
err := Config.ScanForConfigFile(profile)
if err != nil {
return err
}
err = Config.Init()
if err != nil {
return err
}
err = Config.FetchDiyHrt()
if err != nil {
log.Println(err)
}
e := echo.New()
// statically serve the file
cacheDir, err := rendering.GetCacheDir()
if err == nil {
e.Static("/cache", cacheDir)
} else {
log.Println("didn't enable cache dir", err)
}
// https://echo.labstack.com/docs/cookbook/embed-resources
staticHandler := http.FileServer(getFileSystem())
e.GET("/assets/*", echo.WrapHandler(http.StripPrefix("/", staticHandler)))
e.GET("/scripts/*", echo.WrapHandler(http.StripPrefix("/", staticHandler)))
e.GET("/", getIndex)
e.Logger.Fatal(e.Start(":" + strconv.Itoa(Config.Server.Port)))
return nil
}

97
main.go
View File

@ -1,16 +1,107 @@
package main
import (
"bytes"
"embed"
"fmt"
"html/template"
"io/fs"
"log"
"net/http"
"os"
"strconv"
"gitea.elara.ws/Hazel/transfem-startpage/internal/cli"
"gitea.elara.ws/Hazel/transfem-startpage/internal/server"
"gitea.elara.ws/Hazel/transfem-startpage/internal/diyhrt"
"gitea.elara.ws/Hazel/transfem-startpage/internal/rendering"
"github.com/labstack/echo/v4"
)
var CurrentConfig = rendering.NewConfig()
func FetchDiyHrt() error {
fmt.Println("Fetch DiyHrt Marketplaces...")
l, err := diyhrt.GetListings(CurrentConfig.DiyHrt.ApiKey)
if err != nil {
return err
}
CurrentConfig.LoadDiyHrt(l)
return nil
}
//go:embed frontend/*
var FrontendFiles embed.FS
var frontendFiles embed.FS
func getFileContent() string {
content, err := frontendFiles.ReadFile("frontend/index.html")
if err != nil {
log.Fatal(err)
}
return string(content)
}
var IndexTemplate = template.Must(template.New("index").Parse(getFileContent()))
func getIndex(c echo.Context) error {
var tpl bytes.Buffer
IndexTemplate.Execute(&tpl, CurrentConfig.Template)
return c.HTML(http.StatusOK, tpl.String())
}
func getFileSystem() http.FileSystem {
fsys, err := fs.Sub(frontendFiles, "frontend")
if err != nil {
panic(err)
}
return http.FS(fsys)
}
func backMain() {
profile := "default"
if len(os.Args) > 1 {
profile = os.Args[1]
}
fmt.Println("loading profile " + profile)
err := CurrentConfig.ScanForConfigFile(profile)
if err != nil {
fmt.Println(err)
}
err = CurrentConfig.Init()
if err != nil {
fmt.Println(err)
}
err = FetchDiyHrt()
if err != nil {
fmt.Println(err)
}
e := echo.New()
// statically serve the file
cacheDir, err := rendering.GetCacheDir()
if err == nil {
e.Static("/cache", cacheDir)
} else {
fmt.Println(err)
}
// https://echo.labstack.com/docs/cookbook/embed-resources
staticHandler := http.FileServer(getFileSystem())
e.GET("/assets/*", echo.WrapHandler(http.StripPrefix("/", staticHandler)))
e.GET("/scripts/*", echo.WrapHandler(http.StripPrefix("/", staticHandler)))
e.GET("/", getIndex)
e.Logger.Fatal(e.Start(":" + strconv.Itoa(CurrentConfig.Server.Port)))
}
func main() {
server.FrontendFiles = FrontendFiles
cli.Cli()
}