Fixed history bugs

danfragoso · May 24, 2020 · 7edcc9a · 7edcc9a
1 parent 6e8b642
commit 7edcc9a
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 41 deletions.
diff --git a/browser.go b/browser.go
@@ -9,7 +9,7 @@ import (
 	structs "thdwb/structs"
 )
 
-func loadDocument(browser *structs.WebBrowser, link string, callback func()) {
+func loadDocument(browser *structs.WebBrowser, link string) {
 	URL := sauce.ParseURL(link)
 
 	if URL.Scheme == "" && URL.Host == "" {
@@ -22,38 +22,28 @@ func loadDocument(browser *structs.WebBrowser, link string, callback func()) {
 	parsedDocument.URL = resource.URL
 
 	browser.Document = parsedDocument
-	callback()
-}
-
-func loadDocumentFromAsset(document []byte) *structs.HTMLDocument {
-	parsedDocument := ketchup.ParseDocument(string(document))
-	parsedDocument.URL = sauce.ParseURL("thdwb://homepage/")
 
-	return parsedDocument
+	if browser.History.PageCount() == 0 || browser.History.Last().String() != resource.URL.String() {
+		browser.History.Push(resource.URL)
+	}
 }
 
 func loadDocumentFromUrl(browser *structs.WebBrowser, statusLabel *mustard.LabelWidget, urlInput *mustard.InputWidget, viewPort *mustard.CanvasWidget) {
 	statusLabel.SetContent("Loading: " + urlInput.GetValue())
 
-	go loadDocument(browser, urlInput.GetValue(), func() {
-		browser.History.Push(browser.Document.URL.String())
-
-		ctx := viewPort.GetContext()
-		ctx.SetRGB(1, 1, 1)
-		ctx.Clear()
+	loadDocument(browser, urlInput.GetValue())
 
-		perf.Start("render")
-		bun.RenderDocument(ctx, browser.Document)
-		perf.Stop("render")
+	perf.Start("render")
+	bun.RenderDocument(viewPort.GetContext(), browser.Document)
+	perf.Stop("render")
 
-		statusLabel.SetContent(createStatusLabel(perf))
-		viewPort.SetOffset(0)
-		viewPort.SetDrawingRepaint(true)
-		viewPort.RequestRepaint()
-		statusLabel.RequestRepaint()
+	statusLabel.SetContent(createStatusLabel(perf))
+	viewPort.SetOffset(0)
+	viewPort.SetDrawingRepaint(true)
+	viewPort.RequestRepaint()
+	statusLabel.RequestRepaint()
 
-		urlInput.SetValue(browser.Document.URL.String())
-	})
+	urlInput.SetValue(browser.Document.URL.String())
 }
 
 func createStatusLabel(perf *profiler.Profiler) string {

diff --git a/main.go b/main.go
@@ -3,10 +3,8 @@ package main
 import (
 	"runtime"
 
-	assets "thdwb/assets"
 	bun "thdwb/bun"
 	gg "thdwb/gg"
-	ketchup "thdwb/ketchup"
 	mustard "thdwb/mustard"
 	profiler "thdwb/profiler"
 	structs "thdwb/structs"
@@ -26,8 +24,7 @@ func main() {
 
 	perf = profiler.CreateProfiler()
 
-	browser := &structs.WebBrowser{Document: loadDocumentFromAsset(assets.HomePage()), History: &structs.History{}}
-	browser.History.Push("thdwb://homepage/")
+	browser := &structs.WebBrowser{Document: &structs.HTMLDocument{}, History: &structs.History{}}
 
 	app := mustard.CreateNewApp("THDWB")
 	window := mustard.CreateNewWindow("THDWB", 600, 600)
@@ -42,7 +39,9 @@ func main() {
 
 	debugFrame := createDebugFrame(window, browser)
 	rootFrame.AttachWidget(appBar)
-	browser.Document = ketchup.ParseDocument(browser.Document.RawDocument)
+
+	loadDocument(browser, "thdwb://homepage")
+	urlInput.SetValue(browser.Document.URL.String())
 
 	viewPort := mustard.CreateCanvasWidget(func(ctx *gg.Context) {
 		bun.RenderDocument(ctx, browser.Document)
@@ -58,13 +57,15 @@ func main() {
 	})
 
 	window.RegisterButton(goButton, func() {
-		loadDocumentFromUrl(browser, statusLabel, urlInput, viewPort)
+		go loadDocumentFromUrl(browser, statusLabel, urlInput, viewPort)
 	})
 
 	window.RegisterButton(backButton, func() {
-		browser.History.Pop()
-		urlInput.SetValue(browser.History.Last())
-		loadDocumentFromUrl(browser, statusLabel, urlInput, viewPort)
+		if browser.History.PageCount() > 1 {
+			browser.History.Pop()
+			urlInput.SetValue(browser.History.Last().String())
+			go loadDocumentFromUrl(browser, statusLabel, urlInput, viewPort)
+		}
 	})
 
 	window.AttachPointerPositionEventListener(func(pointerX, pointerY float64) {
@@ -95,7 +96,7 @@ func main() {
 			if browser.Document.SelectedElement.Element == "a" {
 				href := browser.Document.SelectedElement.Attr("href")
 				urlInput.SetValue(href)
-				loadDocumentFromUrl(browser, statusLabel, urlInput, viewPort)
+				go loadDocumentFromUrl(browser, statusLabel, urlInput, viewPort)
 			}
 		}
 	})

diff --git a/sauce/sauce.go b/sauce/sauce.go
@@ -16,6 +16,7 @@ func GetResource(URL *url.URL) *structs.Resource {
 		if URL.Host == "homepage" {
 			return &structs.Resource{
 				Body: string(assets.HomePage()),
+				URL:  URL,
 			}
 		}
 

diff --git a/structs/structs.go b/structs/structs.go
@@ -29,14 +29,18 @@ type HTMLDocument struct {
 }
 
 type History struct {
-	pages []string
+	pages []*url.URL
 }
 
-func (history *History) Push(url string) {
-	history.pages = append(history.pages, url)
+func (history *History) PageCount() int {
+	return len(history.pages)
 }
 
-func (history *History) Last() string {
+func (history *History) Push(URL *url.URL) {
+	history.pages = append(history.pages, URL)
+}
+
+func (history *History) Last() *url.URL {
 	return history.pages[len(history.pages)-1]
 }
 

diff --git a/ui.go b/ui.go
@@ -17,14 +17,14 @@ func createDebugFrame(window *mustard.Window, browser *structs.WebBrowser) *must
 	debugBar.SetBackgroundColor("#eee")
 	debugFrame.SetHeight(400)
 
-	source := mustard.CreateTextWidget(browser.Document.RawDocument)
+	source := mustard.CreateTextWidget("")
 	source.SetFontSize(12)
 
 	dv := mustard.CreateFrame(mustard.HorizontalFrame)
 	dv.SetBackgroundColor("#999")
 	dv.SetWidth(1)
 
-	jsonByte, _ := json.MarshalIndent(browser.Document.RootElement, "", "  ")
+	jsonByte, _ := json.MarshalIndent("", "", "  ")
 	json := mustard.CreateTextWidget(string(jsonByte))
 	json.SetWidth(200)
 	json.SetFontSize(12)
@@ -50,7 +50,6 @@ func createMainBar(window *mustard.Window, browser *structs.WebBrowser) (*mustar
 
 	inputFrame := mustard.CreateFrame(mustard.VerticalFrame)
 	urlInput := mustard.CreateInputWidget()
-	urlInput.SetValue(browser.Document.URL.String())
 	icon := mustard.CreateFrame(mustard.VerticalFrame)
 	img := mustard.CreateImageWidget(assets.Logo())