diff --git a/internal/database/manga.go b/internal/database/manga.go index d96a22a..ffc3bbc 100644 --- a/internal/database/manga.go +++ b/internal/database/manga.go @@ -7,6 +7,7 @@ type Manga struct { Thumbnail []byte LastChapterNum string Chapters []Chapter + Enabled bool //`gorm:"foreignkey:MangaID"` } @@ -16,6 +17,7 @@ func NewManga(id int, title string, timeStampUnix int64) Manga { Title: title, TimeStampUnix: timeStampUnix, LastChapterNum: "", + Enabled: true, } } diff --git a/internal/server/handler.go b/internal/server/handler.go index 93f3f98..365b454 100644 --- a/internal/server/handler.go +++ b/internal/server/handler.go @@ -20,6 +20,21 @@ import ( "gorm.io/gorm" ) +func (s *Server) HandleDisable(w http.ResponseWriter, r *http.Request) { + id := r.PostFormValue("mangaId") + var manga database.Manga + s.DbMgr.Db.Where("id = ?", id).First(&manga) + + if manga.Enabled { + http.Redirect(w, r, "/", http.StatusFound) + } else { + http.Redirect(w, r, "/archive", http.StatusFound) + } + + manga.Enabled = !manga.Enabled + s.DbMgr.Db.Save(&manga) +} + func (s *Server) HandleUpdate(w http.ResponseWriter, r *http.Request) { s.UpdateMangaList() http.Redirect(w, r, "/", http.StatusFound) @@ -64,13 +79,9 @@ func (s *Server) HandleNew(w http.ResponseWriter, r *http.Request) { http.Redirect(w, r, "/current/", http.StatusFound) } -func (s *Server) HandleMenu(w http.ResponseWriter, _ *http.Request) { - tmpl := template.Must(view.GetViewTemplate(view.Menu)) +func (s *Server) HandleArchive(w http.ResponseWriter, r *http.Request) { var all []*database.Manga - _ = s.DbMgr.Db.Preload("Chapters").Find(&all) - l := len(all) - mangaViewModels := make([]view.MangaViewModel, l) - counter := 0 + _ = s.DbMgr.Db.Preload("Chapters").Where("enabled = 0").Find(&all) var tmp []database.Setting s.DbMgr.Db.Find(&tmp) @@ -79,8 +90,32 @@ func (s *Server) HandleMenu(w http.ResponseWriter, _ *http.Request) { settings[m.Name] = m } + s.ViewMenu(w, all, settings, true) +} + +func (s *Server) HandleMenu(w http.ResponseWriter, _ *http.Request) { + var all []*database.Manga + _ = s.DbMgr.Db.Preload("Chapters").Where("enabled = 1").Find(&all) + + var tmp []database.Setting + s.DbMgr.Db.Find(&tmp) + settings := make(map[string]database.Setting) + for _, m := range tmp { + settings[m.Name] = m + } + + s.ViewMenu(w, all, settings, false) +} + +func (s *Server) ViewMenu(w http.ResponseWriter, mangas []*database.Manga, settings map[string]database.Setting, archive bool) { + tmpl := template.Must(view.GetViewTemplate(view.Menu)) + + l := len(mangas) + mangaViewModels := make([]view.MangaViewModel, l) + counter := 0 + //TODO: Change all this to be more performant - for _, manga := range all { + for _, manga := range mangas { title := cases.Title(language.English, cases.Compact).String(strings.Replace(manga.Title, "-", " ", -1)) thumbnail, updated, err := s.LoadThumbnail(manga) @@ -117,6 +152,7 @@ func (s *Server) HandleMenu(w http.ResponseWriter, _ *http.Request) { LastTime: time.Unix(manga.TimeStampUnix, 0).Format("15:04 (02-01-06)"), Url: latestChapter.Url, ThumbnailUrl: thumbnail, + Enabled: manga.Enabled, } counter++ } @@ -147,6 +183,7 @@ func (s *Server) HandleMenu(w http.ResponseWriter, _ *http.Request) { menuViewModel := view.MenuViewModel{ Settings: settings, Mangas: mangaViewModels, + Archive: archive, } err := tmpl.Execute(w, menuViewModel) diff --git a/internal/server/server.go b/internal/server/server.go index 4c776d1..e2db322 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -78,6 +78,8 @@ func (s *Server) RegisterRoutes() { s.mux.HandleFunc("POST /setting/", s.HandleSetting) s.mux.HandleFunc("GET /setting/set/{setting}/{value}", s.HandleSettingSet) s.mux.HandleFunc("GET /update", s.HandleUpdate) + s.mux.HandleFunc("POST /disable", s.HandleDisable) + s.mux.HandleFunc("GET /archive", s.HandleArchive) } func (s *Server) Start() error { @@ -116,7 +118,7 @@ func (s *Server) Start() error { func (s *Server) UpdateMangaList() { var all []*database.Manga - s.DbMgr.Db.Find(&all) + s.DbMgr.Db.Where("enabled = 1").Find(&all) for _, m := range all { err, updated := s.UpdateLatestAvailableChapter(m) if err != nil { diff --git a/internal/view/Views/menu.gohtml b/internal/view/Views/menu.gohtml index 28ee3e8..f59b2c9 100644 --- a/internal/view/Views/menu.gohtml +++ b/internal/view/Views/menu.gohtml @@ -4,7 +4,7 @@ - Main Menu + {{if .Archive}}Archive{{else}}Main Menu{{end}} - +