From e58fabd89f9708aaeb10e52f731759712034833f Mon Sep 17 00:00:00 2001
From: Feuerfuchs <git@feuerfuchs.dev>
Date: Mon, 18 May 2020 18:02:20 +0200
Subject: WIP: Refactoring

---
 internal/port/main.go | 56 +++++++++++++++++++++++++--------------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

(limited to 'internal/port/main.go')

diff --git a/internal/port/main.go b/internal/port/main.go
index 267df44..763057b 100644
--- a/internal/port/main.go
+++ b/internal/port/main.go
@@ -18,12 +18,12 @@ import (
 )
 
 type AssetList struct {
-	Style      string
-	JS         string
-	FontW      string
-	FontW2     string
-	PropFontW  string
-	PropFontW2 string
+	Style         string
+	JS            string
+	FontRegularW  string
+	FontRegularW2 string
+	FontBoldW     string
+	FontBoldW2    string
 }
 
 type startTemplateVariables struct {
@@ -136,29 +136,29 @@ func ListenAndServe(bind, startpagefile string, robotsfile string, robotsdebug b
 	//
 	// Fonts
 
-	fontdataw, err := box.Find("iosevka-term-ss03-regular.woff")
+	fontRegularWData, err := box.Find("iosevka-fixed-ss03-regular.woff")
 	if err != nil {
-		fontdataw = []byte{}
+		fontRegularWData = []byte{}
 	}
-	fontwAsset := fmt.Sprintf("/iosevka-term-ss03-regular-%x.woff", md5.Sum(fontdataw))
+	fontRegularWAsset := fmt.Sprintf("/iosevka-fixed-ss03-regular-%x.woff", md5.Sum(fontRegularWData))
 
-	fontdataw2, err := box.Find("iosevka-term-ss03-regular.woff2")
+	fontRegularW2Data, err := box.Find("iosevka-fixed-ss03-regular.woff2")
 	if err != nil {
-		fontdataw2 = []byte{}
+		fontRegularW2Data = []byte{}
 	}
-	fontw2Asset := fmt.Sprintf("/iosevka-term-ss03-regular-%x.woff2", md5.Sum(fontdataw2))
+	fontRegularW2Asset := fmt.Sprintf("/iosevka-fixed-ss03-regular-%x.woff2", md5.Sum(fontRegularW2Data))
 
-	propfontdataw, err := box.Find("iosevka-aile-regular.woff")
+	fontBoldWData, err := box.Find("iosevka-fixed-ss03-bold.woff")
 	if err != nil {
-		propfontdataw = []byte{}
+		fontBoldWData = []byte{}
 	}
-	propfontwAsset := fmt.Sprintf("/iosevka-aile-regular-%x.woff", md5.Sum(propfontdataw))
+	fontBoldWAsset := fmt.Sprintf("/iosevka-fixed-ss03-bold-%x.woff", md5.Sum(fontBoldWData))
 
-	propfontdataw2, err := box.Find("iosevka-aile-regular.woff2")
+	fontBoldW2Data, err := box.Find("iosevka-fixed-ss03-bold.woff2")
 	if err != nil {
-		propfontdataw2 = []byte{}
+		fontBoldW2Data = []byte{}
 	}
-	propfontw2Asset := fmt.Sprintf("/iosevka-aile-regular-%x.woff2", md5.Sum(propfontdataw2))
+	fontBoldW2Asset := fmt.Sprintf("/iosevka-fixed-ss03-bold-%x.woff2", md5.Sum(fontBoldW2Data))
 
 	//
 	// Stylesheet
@@ -277,12 +277,12 @@ func ListenAndServe(bind, startpagefile string, robotsfile string, robotsdebug b
 	})
 
 	assets := AssetList{
-		Style:      styleAsset,
-		JS:         jsAsset,
-		FontW:      fontwAsset,
-		FontW2:     fontw2Asset,
-		PropFontW:  propfontwAsset,
-		PropFontW2: propfontw2Asset,
+		Style:         styleAsset,
+		JS:            jsAsset,
+		FontRegularW:  fontRegularWAsset,
+		FontRegularW2: fontRegularW2Asset,
+		FontBoldW:     fontBoldWAsset,
+		FontBoldW2:    fontBoldW2Asset,
 	}
 
 	http.Handle("/", gziphandler.GzipHandler(DefaultHandler(startpageTpl, startpagetext, assets)))
@@ -292,10 +292,10 @@ func ListenAndServe(bind, startpagefile string, robotsfile string, robotsdebug b
 	http.Handle("/favicon.ico", gziphandler.GzipHandler(FaviconHandler(favicondata)))
 	http.Handle(styleAsset, gziphandler.GzipHandler(StyleHandler(styledata)))
 	http.Handle(jsAsset, gziphandler.GzipHandler(JavaScriptHandler(jsdata)))
-	http.HandleFunc(fontwAsset, FontHandler(false, fontdataw))
-	http.HandleFunc(fontw2Asset, FontHandler(true, fontdataw2))
-	http.HandleFunc(propfontwAsset, FontHandler(false, propfontdataw))
-	http.HandleFunc(propfontw2Asset, FontHandler(true, propfontdataw2))
+	http.HandleFunc(fontRegularWAsset, FontHandler(false, fontRegularWData))
+	http.HandleFunc(fontRegularW2Asset, FontHandler(true, fontRegularW2Data))
+	http.HandleFunc(fontBoldWAsset, FontHandler(false, fontBoldWData))
+	http.HandleFunc(fontBoldW2Asset, FontHandler(true, fontBoldW2Data))
 	//http.Handle("/assets/", http.StripPrefix("/assets/", http.FileServer(http.Dir("assets/"))))
 
 	return http.ListenAndServe(bind, nil)
-- 
cgit v1.3.1