Added start of db rework, also added Qol changes

This commit is contained in:
Pablu23
2024-04-02 16:35:50 +02:00
parent 1377fd420e
commit ce878efce3
7 changed files with 211 additions and 22 deletions

View File

@@ -0,0 +1,62 @@
package database
import (
"database/sql"
"sync"
)
type Chapter struct {
Id int
Manga *Manga
Url string
Name string
Number int
TimeStampUnix int64
}
type ChapterTable[K comparable] struct {
mutex sync.Mutex
chapters map[K]Chapter
updated map[K]DbStatus
}
func (c *ChapterTable[K]) Get(key K) (Chapter, bool) {
c.mutex.Lock()
defer c.mutex.Unlock()
val, ok := c.chapters[key]
return val, ok
}
func (c *ChapterTable[K]) Set(key K, new Chapter) {
c.mutex.Lock()
defer c.mutex.Unlock()
val, ok := c.updated[key]
if ok && val == Loaded {
c.updated[key] = Updated
} else {
c.updated[key] = New
}
c.chapters[key] = new
}
func (c *ChapterTable[K]) All() []Chapter {
c.mutex.Lock()
defer c.mutex.Unlock()
res := make([]Chapter, len(c.chapters))
counter := 0
for _, chapter := range c.chapters {
res[counter] = chapter
counter++
}
return res
}
func (c *ChapterTable[K]) Save(db *sql.DB) error {
//TODO implement me
panic("implement me")
}
func (c *ChapterTable[K]) Load(db *sql.DB) error {
//TODO implement me
panic("implement me")
}

View File

@@ -10,26 +10,6 @@ import (
_ "github.com/mattn/go-sqlite3" _ "github.com/mattn/go-sqlite3"
) )
type Manga struct {
Id int
Title string
TimeStampUnix int64
Thumbnail *bytes.Buffer
LastChapterNum int
// Not in DB
LatestChapter *Chapter
}
type Chapter struct {
Id int
Manga *Manga
Url string
Name string
Number int
TimeStampUnix int64
}
type Manager struct { type Manager struct {
ConnectionString string ConnectionString string
db *sql.DB db *sql.DB

View File

@@ -0,0 +1,94 @@
package database
import (
"bytes"
"database/sql"
"sync"
)
type Manga struct {
Id int
Title string
TimeStampUnix int64
Thumbnail *bytes.Buffer
LastChapterNum int
// Not in DB
LatestChapter *Chapter
}
type MangaTable[K comparable] struct {
mutex sync.Mutex
mangas map[K]Manga
updated map[K]DbStatus
}
func (m *MangaTable[K]) Get(key K) (Manga, bool) {
m.mutex.Lock()
defer m.mutex.Unlock()
val, ok := m.mangas[key]
return val, ok
}
func (m *MangaTable[K]) Set(key K, new Manga) {
m.mutex.Lock()
defer m.mutex.Unlock()
val, ok := m.updated[key]
if ok && val == Loaded {
m.updated[key] = Updated
} else {
m.updated[key] = New
}
m.mangas[key] = new
}
func (m *MangaTable[K]) All() []Manga {
m.mutex.Lock()
defer m.mutex.Unlock()
res := make([]Manga, len(m.mangas))
counter := 0
for _, manga := range m.mangas {
res[counter] = manga
counter++
}
return res
}
func (m *MangaTable[K]) Save(db *sql.DB) error {
m.mutex.Lock()
defer m.mutex.Unlock()
for k, status := range m.updated {
if status == Loaded {
continue
} else if status == Updated {
manga := m.mangas[k]
err := updateManga(db, &manga)
if err != nil {
return err
}
} else {
manga := m.mangas[k]
err := insertManga(db, &manga)
if err != nil {
return err
}
}
}
return nil
}
func (m *MangaTable[K]) Load(db *sql.DB) error {
panic("")
}
func updateManga(db *sql.DB, m *Manga) error {
const cmd = "UPDATE Manga set Title = ?, TimeStampUnixEpoch = ?, Thumbnail = ?, LatestAvailableChapter = ? WHERE ID = ?"
_, err := db.Exec(cmd, m.Title, m.TimeStampUnix, m.Thumbnail.Bytes(), m.LastChapterNum, m.Id)
return err
}
func insertManga(db *sql.DB, manga *Manga) error {
const cmd = "INSERT INTO Manga(ID, Title, TimeStampUnixEpoch, Thumbnail, LatestAvailableChapter) values(?, ?, ?, ?, ?)"
_, err := db.Exec(cmd, manga.Id, manga.Title, manga.TimeStampUnix, manga.Thumbnail.Bytes(), manga.LastChapterNum)
return err
}

View File

@@ -0,0 +1,20 @@
package database
import "database/sql"
type DbStatus int
const (
New DbStatus = iota
Loaded
Updated
)
// Table TODO: This Could probably be a generic instead of interface / both
type Table[K comparable, T any] interface {
Get(key K) (T, bool)
Set(key K, new T)
All() []T
Save(db *sql.DB) error
Load(db *sql.DB) error
}

View File

@@ -61,6 +61,17 @@ func (s *Server) Start() error {
// Update Latest Chapter every 5 Minutes // Update Latest Chapter every 5 Minutes
go func(s *Server) { go func(s *Server) {
time.AfterFunc(time.Second*10, func() {
s.DbMgr.Rw.Lock()
for _, m := range s.DbMgr.Mangas {
err := s.UpdateLatestAvailableChapter(m)
if err != nil {
fmt.Println(err)
}
}
s.DbMgr.Rw.Unlock()
})
for { for {
select { select {
case <-time.After(time.Minute * 5): case <-time.After(time.Minute * 5):

View File

@@ -141,7 +141,7 @@
<td>{{.Number}} / {{.LastNumber}}</td> <td>{{.Number}} / {{.LastNumber}}</td>
<td>{{.LastTime}}</td> <td>{{.LastTime}}</td>
<td> <td>
<a href="/new/{{.Url}}}"> <a href="/new/{{.Url}}">
<button class="button-36"> <button class="button-36">
To chapter To chapter
</button> </button>

View File

@@ -31,6 +31,12 @@
vertical-align: middle; vertical-align: middle;
} }
@media (max-width: 500px) {
.scroll-container img {
width: 100%;
}
}
/* /*
* I have no clue what css is, jesus christ ... * I have no clue what css is, jesus christ ...
*/ */
@@ -45,6 +51,18 @@
display: flex; display: flex;
} }
.fixed-button {
position: fixed;
bottom: 80px;
right: 15px;
margin-bottom: 40px;
z-index: 999;
}
.text{
color: white;
}
.button-36 { .button-36 {
background-image: linear-gradient(92.88deg, #455EB5 9.16%, #5643CC 43.89%, #673FD7 64.72%); background-image: linear-gradient(92.88deg, #455EB5 9.16%, #5643CC 43.89%, #673FD7 64.72%);
border-radius: 8px; border-radius: 8px;
@@ -79,13 +97,17 @@
</style> </style>
</head> </head>
<body> <body>
<div class="center"> <h1 class="center text">{{.Title}}</h1>
<div class="center" id="top">
<form method="post" action="/prev"> <form method="post" action="/prev">
<input type="submit" name="Prev" value="Prev" class="button-36"> <input type="submit" name="Prev" value="Prev" class="button-36">
<input type="submit" name="Exit" value="Exit" class="button-36" formaction="/exit"> <input type="submit" name="Exit" value="Exit" class="button-36" formaction="/exit">
<input type="submit" name="Next" value="Next" class="button-36" formaction="/next"> <input type="submit" name="Next" value="Next" class="button-36" formaction="/next">
</form> </form>
</div> </div>
<button class="fixed-button">
<a href="#top">TOP</a>
</button>
<div class="scroll-container"> <div class="scroll-container">
{{range .Images}} {{range .Images}}
<img src="/img/{{.Path}}" alt="img_{{.Index}}"/> <img src="/img/{{.Path}}" alt="img_{{.Index}}"/>