Pablu/mangaGetter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Significantly simplified adding new Database Tables

Browse Source
This commit is contained in:
Pablu23
2024-04-02 18:22:54 +02:00
parent ce878efce3
commit c83a10823d
7 changed files with 291 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
internal/server/handler.go
View File

@@ -35,15 +35,7 @@ func (s *Server) HandleNew(w http.ResponseWriter, r *http.Request) {
func (s *Server) HandleMenu(w http.ResponseWriter, r *http.Request) {
tmpl := template.Must(view.GetViewTemplate(view.Menu))
fmt.Println("Locking Rw in handler.go:43")
s.DbMgr.Rw.Lock()
defer func() {
fmt.Println("Unlocking Rw in handler.go:46")
s.DbMgr.Rw.Unlock()
}()
all := s.DbMgr.Mangas
all := s.DbMgr.Mangas.All()
l := len(all)
mangaViewModels := make([]view.MangaViewModel, l)
counter := 0
@@ -59,12 +51,14 @@ func (s *Server) HandleMenu(w http.ResponseWriter, r *http.Request) {
t1 := time.Now().UnixNano()
thumbnail, err := s.LoadThumbnail(manga)
thumbnail, updated, err := s.LoadThumbnail(&manga)
//TODO: Add default picture instead of not showing Manga at all
if err != nil {
continue
}
manga.Thumbnail = s.ImageBuffers[thumbnail]
if updated {
s.DbMgr.Mangas.Set(manga.Id, manga)
}
t2 := time.Now().UnixNano()
@@ -75,24 +69,32 @@ func (s *Server) HandleMenu(w http.ResponseWriter, r *http.Request) {
// This is very slow
// TODO: put this into own Method
if manga.LastChapterNum == 0 {
err := s.UpdateLatestAvailableChapter(manga)
err, updated := s.UpdateLatestAvailableChapter(&manga)
if err != nil {
fmt.Println(err)
}
if updated {
s.DbMgr.Mangas.Set(manga.Id, manga)
}
}
t2 = time.Now().UnixNano()
titNs += t2 - t1
latestChapter, ok := manga.GetLatestChapter(&s.DbMgr.Chapters)
if !ok {
continue
}
mangaViewModels[counter] = view.MangaViewModel{
ID: manga.Id,
Title: title,
Number: manga.LatestChapter.Number,
Number: latestChapter.Number,
LastNumber: manga.LastChapterNum,
// I Hate this time Format... 15 = hh, 04 = mm, 02 = DD, 01 = MM, 06 == YY
LastTime: time.Unix(manga.TimeStampUnix, 0).Format("15:04 (02-01-06)"),
Url: manga.LatestChapter.Url,
Url: latestChapter.Url,
ThumbnailUrl: thumbnail,
}
counter++
@@ -201,56 +203,37 @@ func (s *Server) HandleExit(w http.ResponseWriter, r *http.Request) {
func (s *Server) HandleCurrent(w http.ResponseWriter, _ *http.Request) {
tmpl := template.Must(view.GetViewTemplate(view.Viewer))
fmt.Println("Locking Rw in handler.go:125")
s.DbMgr.Rw.Lock()
defer func() {
fmt.Println("Unlocking Rw in handler.go:128")
s.DbMgr.Rw.Unlock()
}()
mangaId, chapterId, err := s.Provider.GetTitleIdAndChapterId(s.CurrSubUrl)
if err != nil {
fmt.Println(err)
} else {
title, chapter, err := s.Provider.GetTitleAndChapter(s.CurrSubUrl)
title, chapterName, err := s.Provider.GetTitleAndChapter(s.CurrSubUrl)
if err != nil {
fmt.Println(err)
} else {
var manga *database.Manga
if s.DbMgr.Mangas[mangaId] == nil {
manga = &database.Manga{
Id: mangaId,
Title: title,
TimeStampUnix: time.Now().Unix(),
}
s.DbMgr.Mangas[mangaId] = manga
manga, ok := s.DbMgr.Mangas.Get(mangaId)
if !ok {
manga = database.NewManga(mangaId, title, time.Now().Unix())
} else {
manga = s.DbMgr.Mangas[mangaId]
s.DbMgr.Mangas[mangaId].TimeStampUnix = time.Now().Unix()
manga.TimeStampUnix = time.Now().Unix()
}
if s.DbMgr.Chapters[chapterId] == nil {
chapterNumberStr := strings.Replace(chapter, "ch_", "", 1)
chapter, ok := s.DbMgr.Chapters.Get(chapterId)
if !ok {
chapterNumberStr := strings.Replace(chapterName, "ch_", "", 1)
number, err := strconv.Atoi(chapterNumberStr)
if err != nil {
fmt.Println(err)
number = 0
}
s.DbMgr.Chapters[chapterId] = &database.Chapter{
Id: chapterId,
Manga: manga,
Url: s.CurrSubUrl,
Name: chapter,
Number: number,
TimeStampUnix: time.Now().Unix(),
}
chapter = database.NewChapter(chapterId, manga.Id, s.CurrSubUrl, chapterName, number, time.Now().Unix())
} else {
s.DbMgr.Chapters[chapterId].TimeStampUnix = time.Now().Unix()
chapter.TimeStampUnix = time.Now().Unix()
}
s.DbMgr.Mangas[mangaId].LatestChapter = s.DbMgr.Chapters[chapterId]
s.DbMgr.Chapters.Set(chapterId, chapter)
s.DbMgr.Mangas.Set(mangaId, manga)
}
}

50
internal/server/server.go
View File

@@ -47,7 +47,7 @@ func New(provider provider.Provider, db *database.Manager) *Server {
return &s
}
func (s *Server) Start() error {
func (s *Server) Start(port int) error {
http.HandleFunc("/", s.HandleMenu)
http.HandleFunc("/new/", s.HandleNewQuery)
http.HandleFunc("/new/title/{title}/{chapter}", s.HandleNew)
@@ -62,33 +62,35 @@ func (s *Server) Start() error {
// Update Latest Chapter every 5 Minutes
go func(s *Server) {
time.AfterFunc(time.Second*10, func() {
s.DbMgr.Rw.Lock()
for _, m := range s.DbMgr.Mangas {
err := s.UpdateLatestAvailableChapter(m)
for _, m := range s.DbMgr.Mangas.All() {
err, updated := s.UpdateLatestAvailableChapter(&m)
if err != nil {
fmt.Println(err)
}
if updated {
s.DbMgr.Mangas.Set(m.Id, m)
}
}
s.DbMgr.Rw.Unlock()
})
for {
select {
case <-time.After(time.Minute * 5):
s.DbMgr.Rw.Lock()
for _, m := range s.DbMgr.Mangas {
err := s.UpdateLatestAvailableChapter(m)
for _, m := range s.DbMgr.Mangas.All() {
err, updated := s.UpdateLatestAvailableChapter(&m)
if err != nil {
fmt.Println(err)
}
if updated {
s.DbMgr.Mangas.Set(m.Id, m)
}
}
s.DbMgr.Rw.Unlock()
}
}
}(s)
fmt.Println("Server starting...")
err := http.ListenAndServe(":8000", nil)
err := http.ListenAndServe(fmt.Sprintf(":%d", port), nil)
return err
}
@@ -203,56 +205,60 @@ func (s *Server) LoadCurr() {
fmt.Println("Loaded current")
}
func (s *Server) UpdateLatestAvailableChapter(manga *database.Manga) error {
func (s *Server) UpdateLatestAvailableChapter(manga *database.Manga) (error, bool) {
fmt.Printf("Updating Manga: %s\n", manga.Title)
l, err := s.Provider.GetChapterList("/title/" + strconv.Itoa(manga.Id))
if err != nil {
return err
return err, false
}
le := len(l)
_, c, err := s.Provider.GetTitleAndChapter(l[le-1])
if err != nil {
return err
return err, false
}
chapterNumberStr := strings.Replace(c, "ch_", "", 1)
i, err := strconv.Atoi(chapterNumberStr)
if err != nil {
return err
return err, false
}
manga.LastChapterNum = i
return nil
if manga.LastChapterNum == i {
return nil, false
} else {
manga.LastChapterNum = i
return nil, true
}
}
func (s *Server) LoadThumbnail(manga *database.Manga) (path string, err error) {
func (s *Server) LoadThumbnail(manga *database.Manga) (path string, updated bool, err error) {
strId := strconv.Itoa(manga.Id)
s.Mutex.Lock()
defer s.Mutex.Unlock()
if s.ImageBuffers[strId] != nil {
return strId, nil
return strId, false, nil
}
if manga.Thumbnail != nil {
s.ImageBuffers[strId] = manga.Thumbnail
return strId, nil
return strId, false, nil
}
url, err := s.Provider.GetThumbnail(strId)
if err != nil {
return "", err
return "", false, err
}
ram, err := addFileToRam(url)
if err != nil {
return "", err
return "", false, err
}
manga.Thumbnail = ram
s.ImageBuffers[strId] = ram
return strId, nil
return strId, true, nil
}
func (s *Server) AppendImagesToBuf(html string) ([]view.Image, error) {