[add] basic epub reader, [fix] empty device synced bug

api/api.go

@@ -53,7 +53,7 @@ func NewApi(db *database.DBManager, c *config.Config) *API {
 	// Configure Cookie Session Store
 	store := cookie.NewStore(newToken)
 	store.Options(sessions.Options{
-		MaxAge:   60 * 60 * 24 * 7,
+		MaxAge: 60 * 60 * 24 * 7,
 		Secure:   true,
 		HttpOnly: true,
 		SameSite: http.SameSiteStrictMode,
@@ -81,6 +81,7 @@ func (api *API) registerWebAppRoutes() {
 	}
 
 	render.AddFromFilesFuncs("login", helperFuncs, "templates/login.html")
+	render.AddFromFilesFuncs("reader", helperFuncs, "templates/reader-base.html", "templates/reader.html")
 	render.AddFromFilesFuncs("home", helperFuncs, "templates/base.html", "templates/home.html")
 	render.AddFromFilesFuncs("search", helperFuncs, "templates/base.html", "templates/search.html")
 	render.AddFromFilesFuncs("settings", helperFuncs, "templates/base.html", "templates/settings.html")
@@ -103,6 +104,7 @@ func (api *API) registerWebAppRoutes() {
 	api.Router.GET("/activity", api.authWebAppMiddleware, api.createAppResourcesRoute("activity"))
 	api.Router.GET("/documents", api.authWebAppMiddleware, api.createAppResourcesRoute("documents"))
 	api.Router.GET("/documents/:document", api.authWebAppMiddleware, api.createAppResourcesRoute("document"))
+	api.Router.GET("/documents/:document/reader", api.authWebAppMiddleware, api.documentReader)
 	api.Router.GET("/documents/:document/file", api.authWebAppMiddleware, api.downloadDocumentFile)
 	api.Router.GET("/documents/:document/cover", api.authWebAppMiddleware, api.getDocumentCover)
 	api.Router.POST("/documents/:document/edit", api.authWebAppMiddleware, api.editDocument)

api/app-routes.go

@@ -2,6 +2,7 @@ package api
 
 import (
 	"crypto/md5"
+	"database/sql"
 	"fmt"
 	"mime/multipart"
 	"net/http"
@@ -308,6 +309,45 @@ func (api *API) getDocumentCover(c *gin.Context) {
 	c.File(coverFilePath)
 }
 
+func (api *API) documentReader(c *gin.Context) {
+	rUser, _ := c.Get("AuthorizedUser")
+
+	var rDoc requestDocumentID
+	if err := c.ShouldBindUri(&rDoc); err != nil {
+		log.Error("[documentReader] Invalid URI Bind")
+		c.AbortWithStatus(http.StatusBadRequest)
+		return
+	}
+
+	progress, err := api.DB.Queries.GetProgress(api.DB.Ctx, database.GetProgressParams{
+		DocumentID: rDoc.DocumentID,
+		UserID:     rUser.(string),
+	})
+
+	if err != nil && err != sql.ErrNoRows {
+		log.Error("[documentReader] UpsertDocument DB Error:", err)
+		c.AbortWithStatus(http.StatusBadRequest)
+		return
+	}
+
+	document, err := api.DB.Queries.GetDocumentWithStats(api.DB.Ctx, database.GetDocumentWithStatsParams{
+		UserID:     rUser.(string),
+		DocumentID: rDoc.DocumentID,
+	})
+	if err != nil {
+		log.Error("[documentReader] GetDocumentWithStats DB Error:", err)
+		c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Invalid Request"})
+		return
+	}
+
+	c.HTML(http.StatusOK, "reader", gin.H{
+		"SearchEnabled": api.Config.SearchEnabled,
+		"Progress":      progress.Progress,
+		"Data":          document,
+		"RelBase":       "../../",
+	})
+}
+
 func (api *API) editDocument(c *gin.Context) {
 	var rDocID requestDocumentID
 	if err := c.ShouldBindUri(&rDocID); err != nil {

api/ko-routes.go

@@ -142,6 +142,7 @@ func (api *API) setProgress(c *gin.Context) {
 		ID:         rPosition.DeviceID,
 		UserID:     rUser.(string),
 		DeviceName: rPosition.Device,
+		LastSynced: time.Now().UTC().Format(time.RFC3339),
 	}); err != nil {
 		log.Error("[setProgress] UpsertDevice DB Error:", err)
 	}
@@ -188,7 +189,11 @@ func (api *API) getProgress(c *gin.Context) {
 		UserID:     rUser.(string),
 	})
 
-	if err != nil {
+	if err == sql.ErrNoRows {
+		// Not Found
+		c.JSON(http.StatusOK, gin.H{})
+		return
+	} else if err != nil {
 		log.Error("[getProgress] GetProgress DB Error:", err)
 		c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Invalid Document"})
 		return
@@ -248,6 +253,7 @@ func (api *API) addActivities(c *gin.Context) {
 		ID:         rActivity.DeviceID,
 		UserID:     rUser.(string),
 		DeviceName: rActivity.Device,
+		LastSynced: time.Now().UTC().Format(time.RFC3339),
 	}); err != nil {
 		log.Error("[addActivities] UpsertDevice DB Error:", err)
 		c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Invalid Device"})