diff --git a/go.sum b/go.sum
index b83ff16..e69de29 100644
--- a/go.sum
+++ b/go.sum
@@ -1,35 +0,0 @@
-github.com/PuerkitoBio/goquery v1.8.1 h1:uQxhNlArOIdbrH1tr0UXwdVFgDcZDrZVdcpygAcwmWM=
-github.com/PuerkitoBio/goquery v1.8.1/go.mod h1:Q8ICL1kNUJ2sXGoAhPGUdYDJvgQgHzJsnnd3H7Ho5jQ=
-github.com/andybalholm/cascadia v1.3.1 h1:nhxRkql1kdYCc8Snf7D5/D3spOX+dBgjA6u8x004T2c=
-github.com/andybalholm/cascadia v1.3.1/go.mod h1:R4bJ1UQfqADjvDa4P6HZHLh/3OxWWEqc0Sk8XGwHqvA=
-github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210916014120-12bc252f5db8/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
-golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
diff --git a/main.go b/main.go
index 0f1b37f..5fc8cf1 100644
--- a/main.go
+++ b/main.go
@@ -9,15 +9,25 @@ import (
"net/http"
"path/filepath"
"regexp"
+ "strings"
"sync"
)
+type NoMoreError struct {
+ Err error
+}
+
+func (e *NoMoreError) Error() string {
+ return "no more images available"
+}
+
type Image struct {
Path string
Index int
}
type ImageViewModel struct {
+ Title string
Images []Image
}
@@ -29,6 +39,14 @@ type Server struct {
NextSubUrl string
CurrSubUrl string
PrevSubUrl string
+
+ IsFirst bool
+ IsLast bool
+
+ // 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 getImageList(html string) ([]string, error) {
@@ -39,7 +57,7 @@ func getImageList(html string) ([]string, error) {
m := reg.FindStringSubmatch(html)
if len(m) <= 0 {
- return nil, errors.New("no new images")
+ return nil, &NoMoreError{Err: errors.New("no more content")}
}
match := m[1]
@@ -125,76 +143,26 @@ func appendImagesToBuf(html string, imageBuffs map[string]*bytes.Buffer) ([]Imag
func main() {
curr := "/title/143267-blooming-love/2636103-ch_20"
- h, err := getHtmlFor(curr)
- if err != nil {
- panic(err)
- }
-
- n, err := getNext(h)
- if err != nil {
- panic(err)
- }
-
- p, err := getPrev(h)
- if err != nil {
- panic(err)
- }
server := Server{
- PrevViewModel: nil,
- CurrViewModel: nil,
- NextViewModel: nil,
- ImageBuffers: make(map[string]*bytes.Buffer),
- // Weird error IDK why this is, but it works like this, so it is what it is
- NextSubUrl: n, //"/title/143267-blooming-love/2636103-ch_20",
- PrevSubUrl: p,
- CurrSubUrl: curr,
+ ImageBuffers: make(map[string]*bytes.Buffer),
+ CurrSubUrl: curr,
+ NextReady: make(chan bool),
+ PrevReady: make(chan bool),
}
- go func(s *Server) {
- html, err := getHtmlFor(s.PrevSubUrl)
- if err != nil {
- fmt.Println(err)
- return
- }
-
- imagesNext, err := appendImagesToBuf(html, s.ImageBuffers)
- if err != nil {
- fmt.Println(err)
- return
- }
-
- s.PrevViewModel = &ImageViewModel{Images: imagesNext}
- fmt.Println("Finished loading prev")
- }(&server)
-
- go func(s *Server) {
- html, err := getHtmlFor(s.NextSubUrl)
- if err != nil {
- fmt.Println(err)
- return
- }
-
- imagesNext, err := appendImagesToBuf(html, s.ImageBuffers)
- if err != nil {
- fmt.Println(err)
- return
- }
- s.NextViewModel = &ImageViewModel{Images: imagesNext}
- fmt.Println("Finished loading next")
- }(&server)
-
- imagesCurr, err := appendImagesToBuf(h, server.ImageBuffers)
-
- server.CurrViewModel = &ImageViewModel{Images: imagesCurr}
+ server.loadCurr()
+ go server.loadPrev()
+ go server.loadNext()
http.HandleFunc("/", server.HandleCurrent)
http.HandleFunc("/img/{url}/", server.HandleImage)
http.HandleFunc("POST /next", server.handleNext)
http.HandleFunc("POST /prev", server.handlePrev)
+ http.HandleFunc("/new/{title}/{chapter}", server.HandleNew)
fmt.Println("Server running")
- err = http.ListenAndServe(":8000", nil)
+ err := http.ListenAndServe(":8000", nil)
if err != nil {
fmt.Println(err)
return
@@ -234,40 +202,109 @@ func (s *Server) handleNext(w http.ResponseWriter, r *http.Request) {
s.PrevSubUrl = s.CurrSubUrl
s.CurrSubUrl = s.NextSubUrl
- go func(s *Server) {
- c, err := getHtmlFor(s.CurrSubUrl)
- if err != nil {
- fmt.Println(err)
- return
- }
+ <-s.NextReady
- next, err := getNext(c)
- if err != nil {
- fmt.Println(err)
- return
- }
-
- html, err := getHtmlFor(next)
- if err != nil {
- fmt.Println(err)
- return
- }
-
- imagesNext, err := appendImagesToBuf(html, s.ImageBuffers)
- if err != nil {
- fmt.Println(err)
- return
- }
-
- s.NextViewModel = &ImageViewModel{Images: imagesNext}
-
- s.NextSubUrl = next
- fmt.Println("Loaded next")
- }(s)
+ go s.loadNext()
http.Redirect(w, r, "/", http.StatusTemporaryRedirect)
}
+func (s *Server) loadNext() {
+ c, err := getHtmlFor(s.CurrSubUrl)
+ if err != nil {
+ fmt.Println(err)
+ return
+ }
+
+ next, err := getNext(c)
+ if err != nil {
+ fmt.Println(err)
+ return
+ }
+
+ html, err := getHtmlFor(next)
+ if err != nil {
+ fmt.Println(err)
+ return
+ }
+
+ imagesNext, err := appendImagesToBuf(html, s.ImageBuffers)
+ //if err != nil && errors.Is(err, &NoMoreError{}) {
+ // fmt.Println(err)
+ // return
+ //} else
+ if err != nil {
+ fmt.Println(err)
+ return
+ }
+
+ title, chapter, err := getTitleAndChapter(next)
+ if err != nil {
+ title = "Unknown"
+ chapter = "ch_?"
+ }
+
+ full := strings.Replace(title, "-", " ", -1) + " - " + strings.Replace(chapter, "_", " ", -1)
+
+ s.NextViewModel = &ImageViewModel{Images: imagesNext, Title: full}
+
+ s.NextSubUrl = next
+ fmt.Println("Loaded next")
+ s.NextReady <- true
+}
+
+func getTitleAndChapter(url string) (title string, chapter string, err error) {
+ reg, err := regexp.Compile(`/title/\d*-(.*?)/\d*-(.*)`)
+ if err != nil {
+ return "", "", err
+ }
+
+ matches := reg.FindAllStringSubmatch(url, -1)
+ if len(matches) <= 0 {
+ return "", "", errors.New("no title or chapter found")
+ }
+
+ return matches[0][1], matches[0][2], nil
+}
+
+func (s *Server) loadPrev() {
+ c, err := getHtmlFor(s.CurrSubUrl)
+ if err != nil {
+ fmt.Println(err)
+ return
+ }
+ prev, err := getPrev(c)
+ if err != nil {
+ fmt.Println(err)
+ return
+ }
+ html, err := getHtmlFor(prev)
+ if err != nil {
+ fmt.Println(err)
+ return
+ }
+
+ imagesNext, err := appendImagesToBuf(html, s.ImageBuffers)
+ if err != nil {
+ fmt.Println(err)
+ return
+ }
+
+ title, chapter, err := getTitleAndChapter(prev)
+ if err != nil {
+ title = "Unknown"
+ chapter = "ch_?"
+ }
+
+ full := strings.Replace(title, "-", " ", -1) + " - " + strings.Replace(chapter, "_", " ", -1)
+
+ s.PrevViewModel = &ImageViewModel{Images: imagesNext, Title: full}
+
+ s.PrevSubUrl = prev
+ fmt.Println("Loaded prev")
+ s.PrevReady <- true
+}
+
func (s *Server) handlePrev(w http.ResponseWriter, r *http.Request) {
fmt.Println("Received Prev")
if s.NextViewModel != nil {
@@ -284,34 +321,9 @@ func (s *Server) handlePrev(w http.ResponseWriter, r *http.Request) {
s.NextSubUrl = s.CurrSubUrl
s.CurrSubUrl = s.PrevSubUrl
- go func(s *Server) {
- c, err := getHtmlFor(s.CurrSubUrl)
- if err != nil {
- fmt.Println(err)
- return
- }
- prev, err := getPrev(c)
- if err != nil {
- fmt.Println(err)
- return
- }
- html, err := getHtmlFor(prev)
- if err != nil {
- fmt.Println(err)
- return
- }
+ <-s.PrevReady
- imagesNext, err := appendImagesToBuf(html, s.ImageBuffers)
- if err != nil {
- fmt.Println(err)
- return
- }
-
- s.PrevViewModel = &ImageViewModel{Images: imagesNext}
-
- s.PrevSubUrl = prev
- fmt.Println("Loaded prev")
- }(s)
+ go s.loadPrev()
http.Redirect(w, r, "/", http.StatusTemporaryRedirect)
}
@@ -324,6 +336,44 @@ func (s *Server) HandleCurrent(w http.ResponseWriter, _ *http.Request) {
}
}
+func (s *Server) HandleNew(w http.ResponseWriter, r *http.Request) {
+ title := r.PathValue("title")
+ chapter := r.PathValue("chapter")
+
+ url := fmt.Sprintf("/title/%s/%s", title, chapter)
+
+ s.ImageBuffers = make(map[string]*bytes.Buffer)
+ s.CurrSubUrl = url
+ s.PrevSubUrl = ""
+ s.NextSubUrl = ""
+ s.loadCurr()
+
+ go s.loadNext()
+ go s.loadPrev()
+
+ http.Redirect(w, r, "/", http.StatusTemporaryRedirect)
+}
+
+func (s *Server) loadCurr() {
+ html, err := getHtmlFor(s.CurrSubUrl)
+ if err != nil {
+ panic(err)
+ }
+
+ imagesCurr, err := appendImagesToBuf(html, s.ImageBuffers)
+
+ title, chapter, err := getTitleAndChapter(s.CurrSubUrl)
+ if err != nil {
+ title = "Unknown"
+ chapter = "ch_?"
+ }
+
+ full := strings.Replace(title, "-", " ", -1) + " - " + strings.Replace(chapter, "_", " ", -1)
+
+ s.CurrViewModel = &ImageViewModel{Images: imagesCurr, Title: full}
+ fmt.Println("Loaded current")
+}
+
func addFileToRam(url string) (*bytes.Buffer, error) {
// Get the data
resp, err := http.Get(url)
diff --git a/test.gohtml b/test.gohtml
index 6a9ab2b..32e15cc 100644
--- a/test.gohtml
+++ b/test.gohtml
@@ -2,9 +2,11 @@
- Title
+ {{.Title}}
+
+
+
- 
{{end}}