From 8e6169430e77469c53cd091ad761ca4948c5ee5d Mon Sep 17 00:00:00 2001
From: Pablu23 <pablu23@gmx.de>
Date: Mon, 26 Feb 2024 12:09:00 +0100
Subject: [PATCH] Fixed Thumbnail Db Entry not loading, added favicon.ico,
 added going back to menu, if no more Chapters exist, added auto start of
 default browser with url, added dark mode to main Menu (doesnt save state),
 added Constructor for Server

---
 cmd/mangaGetter/main.go           |  80 ++++++++++++++++++++++++------
 internal/database/database.go     |   4 +-
 internal/server/favicon.ico       | Bin 0 -> 1406 bytes
 internal/server/handler.go        |  22 ++++++--
 internal/server/server.go         |  46 ++++++++++++++---
 internal/view/Views/menu.gohtml   |  22 ++++++++
 internal/view/Views/viewer.gohtml |   2 +
 7 files changed, 149 insertions(+), 27 deletions(-)
 create mode 100644 internal/server/favicon.ico

diff --git a/cmd/mangaGetter/main.go b/cmd/mangaGetter/main.go
index 5726515..846d24b 100644
--- a/cmd/mangaGetter/main.go
+++ b/cmd/mangaGetter/main.go
@@ -1,34 +1,59 @@
 package main
 
 import (
-	"bytes"
 	"fmt"
-	"net/http"
-	"os"
-	"os/signal"
-	"sync"
-
 	"mangaGetter/internal/database"
 	"mangaGetter/internal/provider"
 	"mangaGetter/internal/server"
+	"net/http"
+	"os"
+	"os/exec"
+	"os/signal"
+	"path/filepath"
+	"runtime"
+	"time"
 )
 
 func main() {
-	db := database.NewDatabase("db.sqlite", true)
-	err := db.Open()
+	dir, err := os.UserCacheDir()
 	if err != nil {
+		fmt.Println(nil)
 		return
 	}
 
-	s := server.Server{
-		ImageBuffers: make(map[string]*bytes.Buffer),
-		NextReady:    make(chan bool),
-		PrevReady:    make(chan bool),
-		Provider:     &provider.Bato{},
-		DbMgr:        &db,
-		Mutex:        &sync.Mutex{},
+	dirPath := filepath.Join(dir, "MangaGetter")
+	filePath := filepath.Join(dirPath, "db.sqlite")
+
+	if _, err := os.Stat(dirPath); os.IsNotExist(err) {
+		err = os.Mkdir(dirPath, os.ModePerm)
+		if err != nil {
+			fmt.Println(err)
+			return
+		}
 	}
 
+	if _, err := os.Stat(filePath); os.IsNotExist(err) {
+		f, err := os.Create(filePath)
+		if err != nil {
+			fmt.Println(err)
+			return
+		}
+		err = f.Close()
+		if err != nil {
+			fmt.Println(err)
+			return
+		}
+	}
+
+	db := database.NewDatabase(filePath, true)
+	err = db.Open()
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
+
+	s := server.New(&provider.Bato{}, &db)
+
 	c := make(chan os.Signal, 1)
 	signal.Notify(c, os.Interrupt)
 
@@ -48,6 +73,14 @@ func main() {
 	http.HandleFunc("POST /exit", s.HandleExit)
 	http.HandleFunc("POST /delete", s.HandleDelete)
 
+	go func() {
+		time.Sleep(300 * time.Millisecond)
+		err := open("http://localhost:8000")
+		if err != nil {
+			fmt.Println(err)
+		}
+	}()
+
 	fmt.Println("Server starting...")
 	err = http.ListenAndServe(":8000", nil)
 	if err != nil {
@@ -56,6 +89,23 @@ func main() {
 	}
 }
 
+func open(url string) error {
+	var cmd string
+	var args []string
+
+	switch runtime.GOOS {
+	case "windows":
+		cmd = "cmd"
+		args = []string{"/c", "start"}
+	case "darwin":
+		cmd = "open"
+	default: // "linux", "freebsd", "openbsd", "netbsd"
+		cmd = "xdg-open"
+	}
+	args = append(args, url)
+	return exec.Command(cmd, args...).Start()
+}
+
 func Close(db *database.Manager) {
 	fmt.Println("Attempting to save and close DB")
 	err := db.Save()
diff --git a/internal/database/database.go b/internal/database/database.go
index 7e0e7ac..f145369 100644
--- a/internal/database/database.go
+++ b/internal/database/database.go
@@ -190,9 +190,11 @@ func (dbMgr *Manager) load() error {
 
 	for rows.Next() {
 		manga := Manga{}
-		if err = rows.Scan(&manga.Id, &manga.Title, &manga.TimeStampUnix, &manga.Thumbnail); err != nil {
+		var thumbnail []byte
+		if err = rows.Scan(&manga.Id, &manga.Title, &manga.TimeStampUnix, &thumbnail); err != nil {
 			return err
 		}
+		manga.Thumbnail = bytes.NewBuffer(thumbnail)
 		dbMgr.Mangas[manga.Id] = &manga
 	}
 
diff --git a/internal/server/favicon.ico b/internal/server/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..4fcd32c26749a3526b90db730b61d1f12e331ab3
GIT binary patch
literal 1406
zcmd6mSx{S59L7J?YU_$yU2v%tYqjngtF_d%wn)iJQj)NRMUp~tAqymdBxE58kc5N~
zk`TgLz_LS-CCXA-sJ66VOAEGdj#G8U>2!2POMUTJAN1W9@0suZzkAP_`JLrEKn!WI
zvAFSwHvpT7+fMY?uPsC|*ht<t%-{82zDuh_H&NJNhErAuN*9EI$A)wGJ6MIO=st55
zkxDbVmw$sRQ;7Jj+aTxiG3l_PZ)F{WtLvzhNnzo0U={G-8(e|SAH`gw4+c>-%4}gI
z?q|T!JcZ`SDqN(Nu;_@ot6`NYF|>Lep}aK0Oo6<j4jyk9YC`}6HWQ33C((QACp1Nt
z(6jh692o+HN=s2Lkz<_nQyeaoECy6WJ?E~$SWH2stj56VADHmCpw;NnVbGzrs1W87
z8(L0Wg^0yOW1$45zzj@6A=)Ham<`s$Czqq&Vg{ctMok(QiTmhqrl+EWQb5j3MvF?0
zkX8+6jtC}uI~<Zj=+Kuz%i|%Kmw`@$9_}J3JVbudr_2<iZQ%-L0(BTLmcb(6BPf*;
zmJhZx9z5!D^x19bTD*elbUrlVVjK?#Fi+GxyaELy2}&lN?AI(=AB*f63!e5UYO^yj
z;j%%?p`-u8b(E*Dpi^1N8fAnn!$5@w_Te93YZyT`lL2$O01>kW^&@NWN6z9{Qv*cY
z474g_gmD1QECFgn>2Q-uak;3f3_;FIMQI8f8V&=N0y(tAJ9<wO1_g^ZLO2u-&wmdQ
zBN-}DJ{0-+sHq!5u|x{HkV|-47%Cbt*W^c6K^9^9VK#WtO}slagwe_hxW|8lIVTq*
zHY=G&GQy>D99jMq6q|?o@EBYsFZ#}}qn~ImZ6`W4YP1^lkmiapXi$@^k-Q0cI2!VS
zlaPQpQvFH=Tw|9JAT>x-L{B2wHIfW=5C)x`BMXyuBiy-}B)h*u!=|IQeF3|7?Lmps
zidJ1YY>rm6O<zQ`&Pnb=0bE4ZA}ve@Q!v%whCyA0E|Uoz^OvF1SHU~Hgf=o})Mh}$
zS_z8DM$ghOP%=m^iJGEoaEY=IAHRbzul;lX{wFTedE(}bytufy&Kmi>3Qq3_uNvAe
z>`{$2KYLgbUET0@r0Ub6FC6bsw9n2o-F4{XSD$Zv{M|?Ip-~i#Mk|o)NEs8{Z+VSI
zyEILsy4O~w+F$tgj@b^1MqQ$1EqPup+?K>W@PIcymW+P>_0r*rQ%OA!JzTqcJNe%7
z@tsHZZ9evvyYJ}5c^b8G`stk??R|pHFzfa|QhomRvgOHJ=F-o8_{sQ-#n0U8I#_c2
zjmAoouT_}%N=w~?&uJTW@$C65-?;?Yz~JK7kBPINWEyAQ(`@?2_SAi9dUBWbw)%Qe
pz_)4Q?l1ZMIDL~oMj3u7<a;wMbtrepAAG+&Cud|qBmJ+(@F!JC#RC8U

literal 0
HcmV?d00001

diff --git a/internal/server/handler.go b/internal/server/handler.go
index ff08f56..b68106a 100644
--- a/internal/server/handler.go
+++ b/internal/server/handler.go
@@ -212,13 +212,20 @@ func (s *Server) HandleNext(w http.ResponseWriter, r *http.Request) {
 		}(*s.PrevViewModel, s)
 	}
 
+	if s.NextViewModel == nil || s.NextSubUrl == "" {
+		http.Redirect(w, r, "/", http.StatusTemporaryRedirect)
+		err := s.DbMgr.Save()
+		if err != nil {
+			fmt.Println(err)
+		}
+		return
+	}
+
 	s.PrevViewModel = s.CurrViewModel
 	s.CurrViewModel = s.NextViewModel
 	s.PrevSubUrl = s.CurrSubUrl
 	s.CurrSubUrl = s.NextSubUrl
 
-	<-s.NextReady
-
 	go s.LoadNext()
 
 	http.Redirect(w, r, "/current/", http.StatusTemporaryRedirect)
@@ -236,13 +243,20 @@ func (s *Server) HandlePrev(w http.ResponseWriter, r *http.Request) {
 		}(*s.NextViewModel, s)
 	}
 
+	if s.PrevViewModel == nil || s.PrevSubUrl == "" {
+		http.Redirect(w, r, "/", http.StatusTemporaryRedirect)
+		err := s.DbMgr.Save()
+		if err != nil {
+			fmt.Println(err)
+		}
+		return
+	}
+
 	s.NextViewModel = s.CurrViewModel
 	s.CurrViewModel = s.PrevViewModel
 	s.NextSubUrl = s.CurrSubUrl
 	s.CurrSubUrl = s.PrevSubUrl
 
-	<-s.PrevReady
-
 	go s.LoadPrev()
 
 	http.Redirect(w, r, "/current/", http.StatusTemporaryRedirect)
diff --git a/internal/server/server.go b/internal/server/server.go
index de89156..02fe085 100644
--- a/internal/server/server.go
+++ b/internal/server/server.go
@@ -2,6 +2,7 @@ package server
 
 import (
 	"bytes"
+	_ "embed"
 	"fmt"
 	"io"
 	"mangaGetter/internal/database"
@@ -32,35 +33,51 @@ type Server struct {
 	IsLast  bool
 
 	DbMgr *database.Manager
+}
 
-	// I'm not even sure if this helps.
-	// If you press next and then prev too fast you still lock yourself out
-	NextReady chan bool
-	PrevReady chan bool
+func New(provider provider.Provider, db *database.Manager) *Server {
+	s := Server{
+		ImageBuffers: make(map[string]*bytes.Buffer),
+		Provider:     provider,
+		DbMgr:        db,
+		Mutex:        &sync.Mutex{},
+	}
+
+	s.AddIco()
+
+	return &s
 }
 
 func (s *Server) LoadNext() {
 	c, err := s.Provider.GetHtml(s.CurrSubUrl)
 	if err != nil {
 		fmt.Println(err)
+		s.NextSubUrl = ""
+		s.NextViewModel = nil
 		return
 	}
 
 	next, err := s.Provider.GetNext(c)
 	if err != nil {
 		fmt.Println(err)
+		s.NextSubUrl = ""
+		s.NextViewModel = nil
 		return
 	}
 
 	html, err := s.Provider.GetHtml(next)
 	if err != nil {
 		fmt.Println(err)
+		s.NextSubUrl = ""
+		s.NextViewModel = nil
 		return
 	}
 
 	imagesNext, err := s.AppendImagesToBuf(html)
 	if err != nil {
 		fmt.Println(err)
+		s.NextSubUrl = ""
+		s.NextViewModel = nil
 		return
 	}
 
@@ -73,32 +90,38 @@ func (s *Server) LoadNext() {
 	full := strings.Replace(title, "-", " ", -1) + " - " + strings.Replace(chapter, "_", " ", -1)
 
 	s.NextViewModel = &view.ImageViewModel{Images: imagesNext, Title: full}
-
 	s.NextSubUrl = next
 	fmt.Println("Loaded next")
-	s.NextReady <- true
 }
 
 func (s *Server) LoadPrev() {
 	c, err := s.Provider.GetHtml(s.CurrSubUrl)
 	if err != nil {
 		fmt.Println(err)
+		s.PrevSubUrl = ""
+		s.PrevViewModel = nil
 		return
 	}
 	prev, err := s.Provider.GetPrev(c)
 	if err != nil {
 		fmt.Println(err)
+		s.PrevSubUrl = ""
+		s.PrevViewModel = nil
 		return
 	}
 	html, err := s.Provider.GetHtml(prev)
 	if err != nil {
 		fmt.Println(err)
+		s.PrevSubUrl = ""
+		s.PrevViewModel = nil
 		return
 	}
 
 	imagesNext, err := s.AppendImagesToBuf(html)
 	if err != nil {
 		fmt.Println(err)
+		s.PrevSubUrl = ""
+		s.PrevViewModel = nil
 		return
 	}
 
@@ -114,7 +137,6 @@ func (s *Server) LoadPrev() {
 
 	s.PrevSubUrl = prev
 	fmt.Println("Loaded prev")
-	s.PrevReady <- true
 }
 
 func (s *Server) LoadCurr() {
@@ -187,6 +209,16 @@ func (s *Server) AppendImagesToBuf(html string) ([]view.Image, error) {
 	return images, nil
 }
 
+//go:embed favicon.ico
+var ico []byte
+
+func (s *Server) AddIco() {
+	buf := bytes.NewBuffer(ico)
+	s.Mutex.Lock()
+	s.ImageBuffers["favicon.ico"] = buf
+	s.Mutex.Unlock()
+}
+
 func addFileToRam(url string) (*bytes.Buffer, error) {
 	// Get the data
 	resp, err := http.Get(url)
diff --git a/internal/view/Views/menu.gohtml b/internal/view/Views/menu.gohtml
index f877e95..9613dbe 100644
--- a/internal/view/Views/menu.gohtml
+++ b/internal/view/Views/menu.gohtml
@@ -3,7 +3,22 @@
 <head>
     <meta charset="UTF-8">
     <title>Main Menu</title>
+
+    <link href="/img/favicon.ico" rel="icon" type="image/x-icon">
+
     <style>
+        body {
+            padding: 25px;
+            background-color: white;
+            color: black;
+            font-size: 25px;
+        }
+
+        .dark-mode {
+            background-color: #171717;
+            color: white;
+        }
+
         .button-36 {
             background-image: linear-gradient(92.88deg, #455EB5 9.16%, #5643CC 43.89%, #673FD7 64.72%);
             border-radius: 8px;
@@ -90,6 +105,12 @@
 
 
     </style>
+    <script>
+        function myFunction() {
+            var element = document.body;
+            element.classList.toggle("dark-mode");
+        }
+    </script>
 
 </head>
 <body>
@@ -100,6 +121,7 @@
         </label>
         <input type="submit" value="Open" class="button-36">
     </form>
+    <button onclick="myFunction()">Toggle dark mode</button>
 
     <table class="table">
         <tr>
diff --git a/internal/view/Views/viewer.gohtml b/internal/view/Views/viewer.gohtml
index 98f98e6..f45fc8e 100644
--- a/internal/view/Views/viewer.gohtml
+++ b/internal/view/Views/viewer.gohtml
@@ -4,6 +4,8 @@
     <meta charset="UTF-8">
     <title>{{.Title}}</title>
 
+    <link href="/img/favicon.ico" rel="icon" type="image/x-icon">
+
     <style>
         body {background-color: #171717}