evan/AnthoLume
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

feat(logging): improve logging & migrate to json logger
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Evan Reichard
2024-01-26 20:45:07 -05:00
parent 0bbd5986cb
commit fd8b6bcdc1
18 changed files with 529 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
api/api.go
View File

@@ -46,23 +46,32 @@ func NewApi(db *database.DBManager, c *config.Config, assets *embed.FS) *API {
assetsDir, _ := fs.Sub(assets, "assets")
api.Router.StaticFS("/assets", http.FS(assetsDir))
// Generate Secure Token
// Generate Auth Token
var newToken []byte
var err error
if c.CookieSessionKey != "" {
log.Info("[NewApi] Utilizing Environment Cookie Session Key")
newToken = []byte(c.CookieSessionKey)
if c.CookieAuthKey != "" {
log.Info("Utilizing environment cookie auth key")
newToken = []byte(c.CookieAuthKey)
} else {
log.Info("[NewApi] Generating Cookie Session Key")
log.Info("Generating cookie auth key")
newToken, err = generateToken(64)
if err != nil {
panic("Unable to generate secure token")
log.Panic("Unable to generate cookie auth key")
}
}
// Set Enc Token
store := cookie.NewStore(newToken)
if c.CookieEncKey != "" {
if len(c.CookieEncKey) == 16 || len(c.CookieEncKey) == 32 {
log.Info("Utilizing environment cookie encryption key")
store = cookie.NewStore(newToken, []byte(c.CookieEncKey))
} else {
log.Panic("Invalid cookie encryption key (must be 16 or 32 bytes)")
}
}
// Configure Cookie Session Store
store := cookie.NewStore(newToken)
store.Options(sessions.Options{
MaxAge: 60 * 60 * 24 * 7,
Secure: c.CookieSecure,
@@ -251,26 +260,29 @@ func apiLogger() gin.HandlerFunc {
endTime := time.Now()
latency := endTime.Sub(startTime).Round(time.Microsecond)
// Log Data
logData := log.Fields{
"type": "access",
"ip": c.ClientIP(),
"latency": fmt.Sprintf("%s", latency),
"status": c.Writer.Status(),
"method": c.Request.Method,
"path": c.Request.URL.Path,
}
// Get Username
var auth authData
if data, _ := c.Get("Authorization"); data != nil {
auth = data.(authData)
}
username := auth.UserName
if username != "" {
username = " (" + username + ")"
// Log User
if auth.UserName != "" {
logData["user"] = auth.UserName
}
// Log Result
log.Infof("[HTTPRouter] %-15s (%10s) %d %7s %s%s",
c.ClientIP(),
latency,
c.Writer.Status(),
c.Request.Method,
c.Request.URL.Path,
username,
)
log.WithFields(logData).Info(fmt.Sprintf("%s %s", c.Request.Method, c.Request.URL.Path))
}
}

403
api/app-routes.go
View File

@@ -5,6 +5,7 @@ import (
"bufio"
"crypto/md5"
"database/sql"
"encoding/json"
"fmt"
"io"
"io/fs"
@@ -152,20 +153,20 @@ func (api *API) appGetDocuments(c *gin.Context) {
Limit: *qParams.Limit,
})
if err != nil {
log.Error("[appGetDocuments] GetDocumentsWithStats DB Error: ", err)
log.Error("GetDocumentsWithStats DB Error: ", err)
errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetDocumentsWithStats DB Error: %v", err))
return
}
length, err := api.DB.Queries.GetDocumentsSize(api.DB.Ctx, query)
if err != nil {
log.Error("[appGetDocuments] GetDocumentsSize DB Error: ", err)
log.Error("GetDocumentsSize DB Error: ", err)
errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetDocumentsSize DB Error: %v", err))
return
}
if err = api.getDocumentsWordCount(documents); err != nil {
log.Error("[appGetDocuments] Unable to Get Word Counts: ", err)
log.Error("Unable to Get Word Counts: ", err)
}
totalPages := int64(math.Ceil(float64(length) / float64(*qParams.Limit)))
@@ -191,7 +192,7 @@ func (api *API) appGetDocument(c *gin.Context) {
var rDocID requestDocumentID
if err := c.ShouldBindUri(&rDocID); err != nil {
log.Error("[appGetDocument] Invalid URI Bind")
log.Error("Invalid URI Bind")
errorPage(c, http.StatusNotFound, "Invalid document.")
return
}
@@ -201,7 +202,7 @@ func (api *API) appGetDocument(c *gin.Context) {
DocumentID: rDocID.DocumentID,
})
if err != nil {
log.Error("[appGetDocument] GetDocumentWithStats DB Error: ", err)
log.Error("GetDocumentWithStats DB Error: ", err)
errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetDocumentsWithStats DB Error: %v", err))
return
}
@@ -230,7 +231,7 @@ func (api *API) appGetProgress(c *gin.Context) {
progress, err := api.DB.Queries.GetProgress(api.DB.Ctx, progressFilter)
if err != nil {
log.Error("[appGetProgress] GetProgress DB Error: ", err)
log.Error("GetProgress DB Error: ", err)
errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetActivity DB Error: %v", err))
return
}
@@ -257,7 +258,7 @@ func (api *API) appGetActivity(c *gin.Context) {
activity, err := api.DB.Queries.GetActivity(api.DB.Ctx, activityFilter)
if err != nil {
log.Error("[appGetActivity] GetActivity DB Error: ", err)
log.Error("GetActivity DB Error: ", err)
errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetActivity DB Error: %v", err))
return
}
@@ -273,38 +274,38 @@ func (api *API) appGetHome(c *gin.Context) {
start := time.Now()
graphData, err := api.DB.Queries.GetDailyReadStats(api.DB.Ctx, auth.UserName)
if err != nil {
log.Error("[appGetHome] GetDailyReadStats DB Error: ", err)
log.Error("GetDailyReadStats DB Error: ", err)
errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetDailyReadStats DB Error: %v", err))
return
}
log.Debug("[appGetHome] GetDailyReadStats DB Performance: ", time.Since(start))
log.Debug("GetDailyReadStats DB Performance: ", time.Since(start))
start = time.Now()
databaseInfo, err := api.DB.Queries.GetDatabaseInfo(api.DB.Ctx, auth.UserName)
if err != nil {
log.Error("[appGetHome] GetDatabaseInfo DB Error: ", err)
log.Error("GetDatabaseInfo DB Error: ", err)
errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetDatabaseInfo DB Error: %v", err))
return
}
log.Debug("[appGetHome] GetDatabaseInfo DB Performance: ", time.Since(start))
log.Debug("GetDatabaseInfo DB Performance: ", time.Since(start))
start = time.Now()
streaks, err := api.DB.Queries.GetUserStreaks(api.DB.Ctx, auth.UserName)
if err != nil {
log.Error("[appGetHome] GetUserStreaks DB Error: ", err)
log.Error("GetUserStreaks DB Error: ", err)
errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetUserStreaks DB Error: %v", err))
return
}
log.Debug("[appGetHome] GetUserStreaks DB Performance: ", time.Since(start))
log.Debug("GetUserStreaks DB Performance: ", time.Since(start))
start = time.Now()
userStatistics, err := api.DB.Queries.GetUserStatistics(api.DB.Ctx)
if err != nil {
log.Error("[appGetHome] GetUserStatistics DB Error: ", err)
log.Error("GetUserStatistics DB Error: ", err)
errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetUserStatistics DB Error: %v", err))
return
}
log.Debug("[appGetHome] GetUserStatistics DB Performance: ", time.Since(start))
log.Debug("GetUserStatistics DB Performance: ", time.Since(start))
templateVars["Data"] = gin.H{
"Streaks": streaks,
@@ -321,14 +322,14 @@ func (api *API) appGetSettings(c *gin.Context) {
user, err := api.DB.Queries.GetUser(api.DB.Ctx, auth.UserName)
if err != nil {
log.Error("[appGetSettings] GetUser DB Error: ", err)
log.Error("GetUser DB Error: ", err)
errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetUser DB Error: %v", err))
return
}
devices, err := api.DB.Queries.GetDevices(api.DB.Ctx, auth.UserName)
if err != nil {
log.Error("[appGetSettings] GetDevices DB Error: ", err)
log.Error("GetDevices DB Error: ", err)
errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetDevices DB Error: %v", err))
return
}
@@ -362,7 +363,23 @@ func (api *API) appGetAdminLogs(c *gin.Context) {
var logLines []string
scanner := bufio.NewScanner(logFile)
for scanner.Scan() {
logLines = append(logLines, scanner.Text())
rawLog := scanner.Text()
// Attempt JSON Pretty
var jsonMap map[string]interface{}
err := json.Unmarshal([]byte(rawLog), &jsonMap)
if err != nil {
logLines = append(logLines, scanner.Text())
continue
}
prettyJSON, err := json.MarshalIndent(jsonMap, "", " ")
if err != nil {
logLines = append(logLines, scanner.Text())
continue
}
logLines = append(logLines, string(prettyJSON))
}
templateVars["Data"] = logLines
@@ -374,7 +391,7 @@ func (api *API) appGetAdminUsers(c *gin.Context) {
users, err := api.DB.Queries.GetUsers(api.DB.Ctx)
if err != nil {
log.Error("[appGetAdminUsers] GetUsers DB Error: ", err)
log.Error("GetUsers DB Error: ", err)
errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetUsers DB Error: %v", err))
return
}
@@ -393,7 +410,7 @@ func (api *API) appPerformAdminAction(c *gin.Context) {
var rAdminAction requestAdminAction
if err := c.ShouldBind(&rAdminAction); err != nil {
log.Error("[appPerformAdminAction] Invalid Form Bind")
log.Error("Invalid Form Bind: ", err)
errorPage(c, http.StatusBadRequest, "Invalid or missing form values.")
return
}
@@ -401,81 +418,33 @@ func (api *API) appPerformAdminAction(c *gin.Context) {
switch rAdminAction.Action {
case adminImport:
// TODO
case adminCacheTables:
go api.DB.CacheTempTables()
case adminMetadataMatch:
// TODO
// 1. Documents xref most recent metadata table?
// 2. Select all / deselect?
case adminCacheTables:
go api.DB.CacheTempTables()
case adminRestore:
// TODO
// 1. Consume backup ZIP
// 2. Move existing to "backup" folder (db, wal, shm, covers, documents)
// 3. Extract backup zip
// 4. Invalidate cookies (see in auth.go logout)
// 5. Restart server?
api.processRestoreFile(rAdminAction, c)
case adminBackup:
// Get File Paths
fileName := fmt.Sprintf("%s.db", api.Config.DBName)
dbLocation := path.Join(api.Config.ConfigPath, fileName)
c.Header("Content-type", "application/octet-stream")
c.Header("Content-Disposition", fmt.Sprintf("attachment; filename=\"AnthoLumeExport_%s.zip\"", time.Now().Format("20060102")))
c.Header("Content-Disposition", fmt.Sprintf("attachment; filename=\"AnthoLumeBackup_%s.zip\"", time.Now().Format("20060102")))
// Stream Backup ZIP Archive
c.Stream(func(w io.Writer) bool {
ar := zip.NewWriter(w)
exportWalker := func(currentPath string, f fs.DirEntry, err error) error {
if err != nil {
return err
}
if f.IsDir() {
return nil
}
// Open File on Disk
file, err := os.Open(currentPath)
if err != nil {
return err
}
defer file.Close()
// Derive Export Structure
fileName := filepath.Base(currentPath)
folderName := filepath.Base(filepath.Dir(currentPath))
// Create File in Export
newF, err := ar.Create(path.Join(folderName, fileName))
if err != nil {
return err
}
// Copy File in Export
_, err = io.Copy(newF, file)
if err != nil {
return err
}
return nil
}
// Copy Database File
dbFile, _ := os.Open(dbLocation)
newDbFile, _ := ar.Create(fileName)
io.Copy(newDbFile, dbFile)
// Backup Covers & Documents
var directories []string
for _, item := range rAdminAction.BackupTypes {
if item == backupCovers {
filepath.WalkDir(path.Join(api.Config.DataPath, "covers"), exportWalker)
directories = append(directories, "covers")
} else if item == backupDocuments {
filepath.WalkDir(path.Join(api.Config.DataPath, "documents"), exportWalker)
directories = append(directories, "documents")
}
}
ar.Close()
err := api.createBackup(w, directories)
if err != nil {
log.Error("Backup Error: ", err)
}
return false
})
@@ -535,7 +504,7 @@ func (api *API) appGetDocumentProgress(c *gin.Context) {
var rDoc requestDocumentID
if err := c.ShouldBindUri(&rDoc); err != nil {
log.Error("[appGetDocumentProgress] Invalid URI Bind")
log.Error("Invalid URI Bind")
errorPage(c, http.StatusNotFound, "Invalid document.")
return
}
@@ -546,7 +515,7 @@ func (api *API) appGetDocumentProgress(c *gin.Context) {
})
if err != nil && err != sql.ErrNoRows {
log.Error("[appGetDocumentProgress] UpsertDocument DB Error: ", err)
log.Error("UpsertDocument DB Error: ", err)
errorPage(c, http.StatusInternalServerError, fmt.Sprintf("UpsertDocument DB Error: %v", err))
return
}
@@ -556,7 +525,7 @@ func (api *API) appGetDocumentProgress(c *gin.Context) {
DocumentID: rDoc.DocumentID,
})
if err != nil {
log.Error("[appGetDocumentProgress] GetDocumentWithStats DB Error: ", err)
log.Error("GetDocumentWithStats DB Error: ", err)
errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetDocumentWithStats DB Error: %v", err))
return
}
@@ -580,7 +549,7 @@ func (api *API) appGetDevices(c *gin.Context) {
devices, err := api.DB.Queries.GetDevices(api.DB.Ctx, auth.UserName)
if err != nil && err != sql.ErrNoRows {
log.Error("[appGetDevices] GetDevices DB Error: ", err)
log.Error("GetDevices DB Error: ", err)
errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetDevices DB Error: %v", err))
return
}
@@ -591,7 +560,7 @@ func (api *API) appGetDevices(c *gin.Context) {
func (api *API) appUploadNewDocument(c *gin.Context) {
var rDocUpload requestDocumentUpload
if err := c.ShouldBind(&rDocUpload); err != nil {
log.Error("[appUploadNewDocument] Invalid Form Bind")
log.Error("Invalid Form Bind")
errorPage(c, http.StatusBadRequest, "Invalid or missing form values.")
return
}
@@ -604,14 +573,14 @@ func (api *API) appUploadNewDocument(c *gin.Context) {
// Validate Type & Derive Extension on MIME
uploadedFile, err := rDocUpload.DocumentFile.Open()
if err != nil {
log.Error("[appUploadNewDocument] File Error: ", err)
log.Error("File Error: ", err)
errorPage(c, http.StatusInternalServerError, "Unable to open file.")
return
}
fileMime, err := mimetype.DetectReader(uploadedFile)
if err != nil {
log.Error("[appUploadNewDocument] MIME Error")
log.Error("MIME Error")
errorPage(c, http.StatusInternalServerError, "Unable to detect filetype.")
return
}
@@ -619,7 +588,7 @@ func (api *API) appUploadNewDocument(c *gin.Context) {
// Validate Extension
if !slices.Contains([]string{".epub"}, fileExtension) {
log.Error("[appUploadNewDocument] Invalid FileType: ", fileExtension)
log.Error("Invalid FileType: ", fileExtension)
errorPage(c, http.StatusBadRequest, "Invalid filetype.")
return
}
@@ -627,7 +596,7 @@ func (api *API) appUploadNewDocument(c *gin.Context) {
// Create Temp File
tempFile, err := os.CreateTemp("", "book")
if err != nil {
log.Warn("[appUploadNewDocument] Temp File Create Error: ", err)
log.Warn("Temp File Create Error: ", err)
errorPage(c, http.StatusInternalServerError, "Unable to create temp file.")
return
}
@@ -637,7 +606,7 @@ func (api *API) appUploadNewDocument(c *gin.Context) {
// Save Temp
err = c.SaveUploadedFile(rDocUpload.DocumentFile, tempFile.Name())
if err != nil {
log.Error("[appUploadNewDocument] File Error: ", err)
log.Error("File Error: ", err)
errorPage(c, http.StatusInternalServerError, "Unable to save file.")
return
}
@@ -645,7 +614,7 @@ func (api *API) appUploadNewDocument(c *gin.Context) {
// Get Metadata
metadataInfo, err := metadata.GetMetadata(tempFile.Name())
if err != nil {
log.Warn("[appUploadNewDocument] GetMetadata Error: ", err)
log.Warn("GetMetadata Error: ", err)
errorPage(c, http.StatusInternalServerError, "Unable to acquire file metadata.")
return
}
@@ -653,7 +622,7 @@ func (api *API) appUploadNewDocument(c *gin.Context) {
// Calculate Partial MD5 ID
partialMD5, err := utils.CalculatePartialMD5(tempFile.Name())
if err != nil {
log.Warn("[appUploadNewDocument] Partial MD5 Error: ", err)
log.Warn("Partial MD5 Error: ", err)
errorPage(c, http.StatusInternalServerError, "Unable to calculate partial MD5.")
return
}
@@ -668,7 +637,7 @@ func (api *API) appUploadNewDocument(c *gin.Context) {
// Calculate Actual MD5
fileHash, err := getFileMD5(tempFile.Name())
if err != nil {
log.Error("[appUploadNewDocument] MD5 Hash Failure: ", err)
log.Error("MD5 Hash Failure: ", err)
errorPage(c, http.StatusInternalServerError, "Unable to calculate MD5.")
return
}
@@ -676,7 +645,7 @@ func (api *API) appUploadNewDocument(c *gin.Context) {
// Get Word Count
wordCount, err := metadata.GetWordCount(tempFile.Name())
if err != nil {
log.Error("[appUploadNewDocument] Word Count Failure: ", err)
log.Error("Word Count Failure: ", err)
errorPage(c, http.StatusInternalServerError, "Unable to calculate word count.")
return
}
@@ -705,7 +674,7 @@ func (api *API) appUploadNewDocument(c *gin.Context) {
safePath := filepath.Join(api.Config.DataPath, "documents", fileName)
destFile, err := os.Create(safePath)
if err != nil {
log.Error("[appUploadNewDocument] Dest File Error: ", err)
log.Error("Dest File Error: ", err)
errorPage(c, http.StatusInternalServerError, "Unable to save file.")
return
}
@@ -713,7 +682,7 @@ func (api *API) appUploadNewDocument(c *gin.Context) {
// Copy File
if _, err = io.Copy(destFile, tempFile); err != nil {
log.Error("[appUploadNewDocument] Copy Temp File Error: ", err)
log.Error("Copy Temp File Error: ", err)
errorPage(c, http.StatusInternalServerError, "Unable to save file.")
return
}
@@ -728,7 +697,7 @@ func (api *API) appUploadNewDocument(c *gin.Context) {
Md5: fileHash,
Filepath: &fileName,
}); err != nil {
log.Error("[appUploadNewDocument] UpsertDocument DB Error: ", err)
log.Error("UpsertDocument DB Error: ", err)
errorPage(c, http.StatusInternalServerError, fmt.Sprintf("UpsertDocument DB Error: %v", err))
return
}
@@ -739,14 +708,14 @@ func (api *API) appUploadNewDocument(c *gin.Context) {
func (api *API) appEditDocument(c *gin.Context) {
var rDocID requestDocumentID
if err := c.ShouldBindUri(&rDocID); err != nil {
log.Error("[appEditDocument] Invalid URI Bind")
log.Error("Invalid URI Bind")
errorPage(c, http.StatusNotFound, "Invalid document.")
return
}
var rDocEdit requestDocumentEdit
if err := c.ShouldBind(&rDocEdit); err != nil {
log.Error("[appEditDocument] Invalid Form Bind")
log.Error("Invalid Form Bind")
errorPage(c, http.StatusBadRequest, "Invalid or missing form values.")
return
}
@@ -760,7 +729,7 @@ func (api *API) appEditDocument(c *gin.Context) {
rDocEdit.RemoveCover == nil &&
rDocEdit.CoverGBID == nil &&
rDocEdit.CoverFile == nil {
log.Error("[appEditDocument] Missing Form Values")
log.Error("Missing Form Values")
errorPage(c, http.StatusBadRequest, "Invalid or missing form values.")
return
}
@@ -774,14 +743,14 @@ func (api *API) appEditDocument(c *gin.Context) {
// Validate Type & Derive Extension on MIME
uploadedFile, err := rDocEdit.CoverFile.Open()
if err != nil {
log.Error("[appEditDocument] File Error")
log.Error("File Error")
errorPage(c, http.StatusInternalServerError, "Unable to open file.")
return
}
fileMime, err := mimetype.DetectReader(uploadedFile)
if err != nil {
log.Error("[appEditDocument] MIME Error")
log.Error("MIME Error")
errorPage(c, http.StatusInternalServerError, "Unable to detect filetype.")
return
}
@@ -789,7 +758,7 @@ func (api *API) appEditDocument(c *gin.Context) {
// Validate Extension
if !slices.Contains([]string{".jpg", ".png"}, fileExtension) {
log.Error("[appEditDocument] Invalid FileType: ", fileExtension)
log.Error("Invalid FileType: ", fileExtension)
errorPage(c, http.StatusBadRequest, "Invalid filetype.")
return
}
@@ -801,7 +770,7 @@ func (api *API) appEditDocument(c *gin.Context) {
// Save
err = c.SaveUploadedFile(rDocEdit.CoverFile, safePath)
if err != nil {
log.Error("[appEditDocument] File Error: ", err)
log.Error("File Error: ", err)
errorPage(c, http.StatusInternalServerError, "Unable to save file.")
return
}
@@ -825,7 +794,7 @@ func (api *API) appEditDocument(c *gin.Context) {
Isbn13: api.sanitizeInput(rDocEdit.ISBN13),
Coverfile: coverFileName,
}); err != nil {
log.Error("[appEditDocument] UpsertDocument DB Error: ", err)
log.Error("UpsertDocument DB Error: ", err)
errorPage(c, http.StatusInternalServerError, fmt.Sprintf("UpsertDocument DB Error: %v", err))
return
}
@@ -837,18 +806,18 @@ func (api *API) appEditDocument(c *gin.Context) {
func (api *API) appDeleteDocument(c *gin.Context) {
var rDocID requestDocumentID
if err := c.ShouldBindUri(&rDocID); err != nil {
log.Error("[appDeleteDocument] Invalid URI Bind")
log.Error("Invalid URI Bind")
errorPage(c, http.StatusNotFound, "Invalid document.")
return
}
changed, err := api.DB.Queries.DeleteDocument(api.DB.Ctx, rDocID.DocumentID)
if err != nil {
log.Error("[appDeleteDocument] DeleteDocument DB Error")
log.Error("DeleteDocument DB Error")
errorPage(c, http.StatusInternalServerError, fmt.Sprintf("DeleteDocument DB Error: %v", err))
return
}
if changed == 0 {
log.Error("[appDeleteDocument] DeleteDocument DB Error")
log.Error("DeleteDocument DB Error")
errorPage(c, http.StatusNotFound, "Invalid document.")
return
}
@@ -859,14 +828,14 @@ func (api *API) appDeleteDocument(c *gin.Context) {
func (api *API) appIdentifyDocument(c *gin.Context) {
var rDocID requestDocumentID
if err := c.ShouldBindUri(&rDocID); err != nil {
log.Error("[appIdentifyDocument] Invalid URI Bind")
log.Error("Invalid URI Bind")
errorPage(c, http.StatusNotFound, "Invalid document.")
return
}
var rDocIdentify requestDocumentIdentify
if err := c.ShouldBind(&rDocIdentify); err != nil {
log.Error("[appIdentifyDocument] Invalid Form Bind")
log.Error("Invalid Form Bind")
errorPage(c, http.StatusBadRequest, "Invalid or missing form values.")
return
}
@@ -884,7 +853,7 @@ func (api *API) appIdentifyDocument(c *gin.Context) {
// Validate Values
if rDocIdentify.ISBN == nil && rDocIdentify.Title == nil && rDocIdentify.Author == nil {
log.Error("[appIdentifyDocument] Invalid Form")
log.Error("Invalid Form")
errorPage(c, http.StatusBadRequest, "Invalid or missing form values.")
return
}
@@ -913,12 +882,12 @@ func (api *API) appIdentifyDocument(c *gin.Context) {
Isbn10: firstResult.ISBN10,
Isbn13: firstResult.ISBN13,
}); err != nil {
log.Error("[appIdentifyDocument] AddMetadata DB Error: ", err)
log.Error("AddMetadata DB Error: ", err)
}
templateVars["Metadata"] = firstResult
} else {
log.Warn("[appIdentifyDocument] Metadata Error")
log.Warn("Metadata Error")
templateVars["MetadataError"] = "No Metadata Found"
}
@@ -927,7 +896,7 @@ func (api *API) appIdentifyDocument(c *gin.Context) {
DocumentID: rDocID.DocumentID,
})
if err != nil {
log.Error("[appIdentifyDocument] GetDocumentWithStats DB Error: ", err)
log.Error("GetDocumentWithStats DB Error: ", err)
errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetDocumentWithStats DB Error: %v", err))
return
}
@@ -941,7 +910,7 @@ func (api *API) appIdentifyDocument(c *gin.Context) {
func (api *API) appSaveNewDocument(c *gin.Context) {
var rDocAdd requestDocumentAdd
if err := c.ShouldBind(&rDocAdd); err != nil {
log.Error("[appSaveNewDocument] Invalid Form Bind")
log.Error("Invalid Form Bind")
errorPage(c, http.StatusBadRequest, "Invalid or missing form values.")
return
}
@@ -980,7 +949,7 @@ func (api *API) appSaveNewDocument(c *gin.Context) {
// Save Book
tempFilePath, err := search.SaveBook(rDocAdd.ID, rDocAdd.Source)
if err != nil {
log.Warn("[appSaveNewDocument] Temp File Error: ", err)
log.Warn("Temp File Error: ", err)
sendDownloadMessage("Unable to download file", gin.H{"Error": true})
return
}
@@ -991,7 +960,7 @@ func (api *API) appSaveNewDocument(c *gin.Context) {
// Calculate Partial MD5 ID
partialMD5, err := utils.CalculatePartialMD5(tempFilePath)
if err != nil {
log.Warn("[appSaveNewDocument] Partial MD5 Error: ", err)
log.Warn("Partial MD5 Error: ", err)
sendDownloadMessage("Unable to calculate partial MD5", gin.H{"Error": true})
}
@@ -1025,7 +994,7 @@ func (api *API) appSaveNewDocument(c *gin.Context) {
// Open Source File
sourceFile, err := os.Open(tempFilePath)
if err != nil {
log.Error("[appSaveNewDocument] Source File Error: ", err)
log.Error("Source File Error: ", err)
sendDownloadMessage("Unable to open file", gin.H{"Error": true})
return
}
@@ -1036,7 +1005,7 @@ func (api *API) appSaveNewDocument(c *gin.Context) {
safePath := filepath.Join(api.Config.DataPath, "documents", fileName)
destFile, err := os.Create(safePath)
if err != nil {
log.Error("[appSaveNewDocument] Dest File Error: ", err)
log.Error("Dest File Error: ", err)
sendDownloadMessage("Unable to create file", gin.H{"Error": true})
return
}
@@ -1044,7 +1013,7 @@ func (api *API) appSaveNewDocument(c *gin.Context) {
// Copy File
if _, err = io.Copy(destFile, sourceFile); err != nil {
log.Error("[appSaveNewDocument] Copy Temp File Error: ", err)
log.Error("Copy Temp File Error: ", err)
sendDownloadMessage("Unable to save file", gin.H{"Error": true})
return
}
@@ -1055,7 +1024,7 @@ func (api *API) appSaveNewDocument(c *gin.Context) {
// Get MD5 Hash
fileHash, err := getFileMD5(safePath)
if err != nil {
log.Error("[appSaveNewDocument] Hash Failure: ", err)
log.Error("Hash Failure: ", err)
sendDownloadMessage("Unable to calculate MD5", gin.H{"Error": true})
return
}
@@ -1066,7 +1035,7 @@ func (api *API) appSaveNewDocument(c *gin.Context) {
// Get Word Count
wordCount, err := metadata.GetWordCount(safePath)
if err != nil {
log.Error("[appSaveNewDocument] Word Count Failure: ", err)
log.Error("Word Count Failure: ", err)
sendDownloadMessage("Unable to calculate word count", gin.H{"Error": true})
return
}
@@ -1083,7 +1052,7 @@ func (api *API) appSaveNewDocument(c *gin.Context) {
Filepath: &fileName,
Words: &wordCount,
}); err != nil {
log.Error("[appSaveNewDocument] UpsertDocument DB Error: ", err)
log.Error("UpsertDocument DB Error: ", err)
sendDownloadMessage("Unable to save to database", gin.H{"Error": true})
return
}
@@ -1099,14 +1068,14 @@ func (api *API) appSaveNewDocument(c *gin.Context) {
func (api *API) appEditSettings(c *gin.Context) {
var rUserSettings requestSettingsEdit
if err := c.ShouldBind(&rUserSettings); err != nil {
log.Error("[appEditSettings] Invalid Form Bind")
log.Error("Invalid Form Bind")
errorPage(c, http.StatusBadRequest, "Invalid or missing form values.")
return
}
// Validate Something Exists
if rUserSettings.Password == nil && rUserSettings.NewPassword == nil && rUserSettings.TimeOffset == nil {
log.Error("[appEditSettings] Missing Form Values")
log.Error("Missing Form Values")
errorPage(c, http.StatusBadRequest, "Invalid or missing form values.")
return
}
@@ -1144,7 +1113,7 @@ func (api *API) appEditSettings(c *gin.Context) {
// Update User
_, err := api.DB.Queries.UpdateUser(api.DB.Ctx, newUserSettings)
if err != nil {
log.Error("[appEditSettings] UpdateUser DB Error: ", err)
log.Error("UpdateUser DB Error: ", err)
errorPage(c, http.StatusInternalServerError, fmt.Sprintf("UpdateUser DB Error: %v", err))
return
}
@@ -1152,7 +1121,7 @@ func (api *API) appEditSettings(c *gin.Context) {
// Get User
user, err := api.DB.Queries.GetUser(api.DB.Ctx, auth.UserName)
if err != nil {
log.Error("[appEditSettings] GetUser DB Error: ", err)
log.Error("GetUser DB Error: ", err)
errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetUser DB Error: %v", err))
return
}
@@ -1160,7 +1129,7 @@ func (api *API) appEditSettings(c *gin.Context) {
// Get Devices
devices, err := api.DB.Queries.GetDevices(api.DB.Ctx, auth.UserName)
if err != nil {
log.Error("[appEditSettings] GetDevices DB Error: ", err)
log.Error("GetDevices DB Error: ", err)
errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetDevices DB Error: %v", err))
return
}
@@ -1181,7 +1150,7 @@ func (api *API) getDocumentsWordCount(documents []database.GetDocumentsWithStats
// Do Transaction
tx, err := api.DB.DB.Begin()
if err != nil {
log.Error("[getDocumentsWordCount] Transaction Begin DB Error: ", err)
log.Error("Transaction Begin DB Error: ", err)
return err
}
@@ -1194,13 +1163,13 @@ func (api *API) getDocumentsWordCount(documents []database.GetDocumentsWithStats
filePath := filepath.Join(api.Config.DataPath, "documents", *item.Filepath)
wordCount, err := metadata.GetWordCount(filePath)
if err != nil {
log.Warn("[getDocumentsWordCount] Word Count Error: ", err)
log.Warn("Word Count Error: ", err)
} else {
if _, err := qtx.UpsertDocument(api.DB.Ctx, database.UpsertDocumentParams{
ID: item.ID,
Words: &wordCount,
}); err != nil {
log.Error("[getDocumentsWordCount] UpsertDocument DB Error: ", err)
log.Error("UpsertDocument DB Error: ", err)
return err
}
}
@@ -1209,7 +1178,7 @@ func (api *API) getDocumentsWordCount(documents []database.GetDocumentsWithStats
// Commit Transaction
if err := tx.Commit(); err != nil {
log.Error("[getDocumentsWordCount] Transaction Commit DB Error: ", err)
log.Error("Transaction Commit DB Error: ", err)
return err
}
@@ -1349,3 +1318,175 @@ func arrangeUserStatistics(userStatistics []database.GetUserStatisticsRow) gin.H
},
}
}
func (api *API) processRestoreFile(rAdminAction requestAdminAction, c *gin.Context) {
// Validate Type & Derive Extension on MIME
uploadedFile, err := rAdminAction.RestoreFile.Open()
if err != nil {
log.Error("File Error: ", err)
errorPage(c, http.StatusInternalServerError, "Unable to open file.")
return
}
fileMime, err := mimetype.DetectReader(uploadedFile)
if err != nil {
log.Error("MIME Error")
errorPage(c, http.StatusInternalServerError, "Unable to detect filetype.")
return
}
fileExtension := fileMime.Extension()
// Validate Extension
if !slices.Contains([]string{".zip"}, fileExtension) {
log.Error("Invalid FileType: ", fileExtension)
errorPage(c, http.StatusBadRequest, "Invalid filetype.")
return
}
// Create Temp File
tempFile, err := os.CreateTemp("", "restore")
if err != nil {
log.Warn("Temp File Create Error: ", err)
errorPage(c, http.StatusInternalServerError, "Unable to create temp file.")
return
}
defer os.Remove(tempFile.Name())
defer tempFile.Close()
// Save Temp
err = c.SaveUploadedFile(rAdminAction.RestoreFile, tempFile.Name())
if err != nil {
log.Error("File Error: ", err)
errorPage(c, http.StatusInternalServerError, "Unable to save file.")
return
}
// ZIP Info
fileInfo, err := tempFile.Stat()
if err != nil {
log.Error("File Error: ", err)
errorPage(c, http.StatusInternalServerError, "Unable to read file.")
return
}
// Create ZIP Reader
r, err := zip.NewReader(tempFile, fileInfo.Size())
if err != nil {
log.Error("ZIP Error: ", err)
errorPage(c, http.StatusInternalServerError, "Unable to read zip.")
return
}
// Validate ZIP Contents
hasDBFile := false
hasUnknownFile := false
for _, f := range r.File {
fileName := strings.TrimPrefix(f.Name, "/")
if fileName == "antholume.db" {
hasDBFile = true
break
} else if !strings.HasPrefix(fileName, "covers/") && !strings.HasPrefix(fileName, "documents/") {
hasUnknownFile = true
break
}
}
// Invalid ZIP
if !hasDBFile {
log.Error("Invalid ZIP File - Missing DB")
errorPage(c, http.StatusInternalServerError, "Invalid Restore ZIP - Missing DB")
return
} else if hasUnknownFile {
log.Error("Invalid ZIP File - Invalid File(s)")
errorPage(c, http.StatusInternalServerError, "Invalid Restore ZIP - Invalid File(s)")
return
}
// Create Backup File
backupFilePath := path.Join(api.Config.ConfigPath, fmt.Sprintf("backup/AnthoLumeBackup_%s.zip", time.Now().Format("20060102")))
backupFile, err := os.Create(backupFilePath)
if err != nil {
log.Error("Unable to create backup file: ", err)
errorPage(c, http.StatusInternalServerError, "Unable to create backup file.")
return
}
defer backupFile.Close()
// Save Backup File
w := bufio.NewWriter(backupFile)
err = api.createBackup(w, []string{"covers", "documents"})
if err != nil {
log.Error("Unable to save backup file: ", err)
errorPage(c, http.StatusInternalServerError, "Unable to save backup file.")
return
}
// TODO:
// - Extract from temp directory
}
func (api *API) createBackup(w io.Writer, directories []string) error {
ar := zip.NewWriter(w)
exportWalker := func(currentPath string, f fs.DirEntry, err error) error {
if err != nil {
return err
}
if f.IsDir() {
return nil
}
// Open File on Disk
file, err := os.Open(currentPath)
if err != nil {
return err
}
defer file.Close()
// Derive Export Structure
fileName := filepath.Base(currentPath)
folderName := filepath.Base(filepath.Dir(currentPath))
// Create File in Export
newF, err := ar.Create(path.Join(folderName, fileName))
if err != nil {
return err
}
// Copy File in Export
_, err = io.Copy(newF, file)
if err != nil {
return err
}
return nil
}
// Get DB Path
fileName := fmt.Sprintf("%s.db", api.Config.DBName)
dbLocation := path.Join(api.Config.ConfigPath, fileName)
// Copy Database File
dbFile, err := os.Open(dbLocation)
if err != nil {
return err
}
defer dbFile.Close()
newDbFile, err := ar.Create(fileName)
if err != nil {
return err
}
io.Copy(newDbFile, dbFile)
// Backup Covers & Documents
for _, dir := range directories {
err = filepath.WalkDir(path.Join(api.Config.DataPath, dir), exportWalker)
if err != nil {
return err
}
}
ar.Close()
return nil
}

8
api/auth.go
View File

@@ -206,7 +206,7 @@ func (api *API) appAuthFormRegister(c *gin.Context) {
// SQL Error
if err != nil {
log.Error("[appAuthFormRegister] CreateUser DB Error:", err)
log.Error("CreateUser DB Error:", err)
templateVars["Error"] = "Registration Disabled or User Already Exists"
c.HTML(http.StatusBadRequest, "page/login", templateVars)
return
@@ -214,7 +214,7 @@ func (api *API) appAuthFormRegister(c *gin.Context) {
// User Already Exists
if rows == 0 {
log.Warn("[appAuthFormRegister] User Already Exists:", username)
log.Warn("User Already Exists:", username)
templateVars["Error"] = "Registration Disabled or User Already Exists"
c.HTML(http.StatusBadRequest, "page/login", templateVars)
return
@@ -223,7 +223,7 @@ func (api *API) appAuthFormRegister(c *gin.Context) {
// Get User
user, err := api.DB.Queries.GetUser(api.DB.Ctx, username)
if err != nil {
log.Error("[appAuthFormRegister] GetUser DB Error:", err)
log.Error("GetUser DB Error:", err)
templateVars["Error"] = "Registration Disabled or User Already Exists"
c.HTML(http.StatusBadRequest, "page/login", templateVars)
return
@@ -268,7 +268,7 @@ func getSession(session sessions.Session) (auth authData, ok bool) {
// Refresh
if expiresAt.(int64)-time.Now().Unix() < 60*60*24 {
log.Info("[getSession] Refreshing Session")
log.Info("Refreshing Session")
setSession(session, auth)
}

18
api/common.go
View File

@@ -14,7 +14,7 @@ import (
func (api *API) downloadDocument(c *gin.Context) {
var rDoc requestDocumentID
if err := c.ShouldBindUri(&rDoc); err != nil {
log.Error("[downloadDocument] Invalid URI Bind")
log.Error("Invalid URI Bind")
c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Invalid Request"})
return
}
@@ -22,13 +22,13 @@ func (api *API) downloadDocument(c *gin.Context) {
// Get Document
document, err := api.DB.Queries.GetDocument(api.DB.Ctx, rDoc.DocumentID)
if err != nil {
log.Error("[downloadDocument] GetDocument DB Error:", err)
log.Error("GetDocument DB Error:", err)
c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Unknown Document"})
return
}
if document.Filepath == nil {
log.Error("[downloadDocument] Document Doesn't Have File:", rDoc.DocumentID)
log.Error("Document Doesn't Have File:", rDoc.DocumentID)
c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Document Doesn't Exist"})
return
}
@@ -39,7 +39,7 @@ func (api *API) downloadDocument(c *gin.Context) {
// Validate File Exists
_, err = os.Stat(filePath)
if os.IsNotExist(err) {
log.Error("[downloadDocument] File Doesn't Exist:", rDoc.DocumentID)
log.Error("File Doesn't Exist:", rDoc.DocumentID)
c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Document Doesn't Exists"})
return
}
@@ -52,7 +52,7 @@ func (api *API) downloadDocument(c *gin.Context) {
func (api *API) getDocumentCover(c *gin.Context) {
var rDoc requestDocumentID
if err := c.ShouldBindUri(&rDoc); err != nil {
log.Error("[getDocumentCover] Invalid URI Bind")
log.Error("Invalid URI Bind")
errorPage(c, http.StatusNotFound, "Invalid cover.")
return
}
@@ -60,7 +60,7 @@ func (api *API) getDocumentCover(c *gin.Context) {
// Validate Document Exists in DB
document, err := api.DB.Queries.GetDocument(api.DB.Ctx, rDoc.DocumentID)
if err != nil {
log.Error("[getDocumentCover] GetDocument DB Error:", err)
log.Error("GetDocument DB Error:", err)
errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetDocument DB Error: %v", err))
return
}
@@ -78,7 +78,7 @@ func (api *API) getDocumentCover(c *gin.Context) {
// Validate File Exists
_, err = os.Stat(safePath)
if err != nil {
log.Error("[getDocumentCover] File Should But Doesn't Exist:", err)
log.Error("File Should But Doesn't Exist:", err)
c.FileFromFS("assets/images/no-cover.jpg", http.FS(api.Assets))
return
}
@@ -117,7 +117,7 @@ func (api *API) getDocumentCover(c *gin.Context) {
Isbn10: firstResult.ISBN10,
Isbn13: firstResult.ISBN13,
}); err != nil {
log.Error("[getDocumentCover] AddMetadata DB Error:", err)
log.Error("AddMetadata DB Error:", err)
}
}
@@ -126,7 +126,7 @@ func (api *API) getDocumentCover(c *gin.Context) {
ID: document.ID,
Coverfile: &coverFile,
}); err != nil {
log.Warn("[getDocumentCover] UpsertDocument DB Error:", err)
log.Warn("UpsertDocument DB Error:", err)
}
// Return Unknown Cover

76
api/ko-routes.go
View File

@@ -89,20 +89,20 @@ func (api *API) koCreateUser(c *gin.Context) {
var rUser requestUser
if err := c.ShouldBindJSON(&rUser); err != nil {
log.Error("[koCreateUser] Invalid JSON Bind")
log.Error("Invalid JSON Bind")
c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Invalid User Data"})
return
}
if rUser.Username == "" || rUser.Password == "" {
log.Error("[koCreateUser] Invalid User - Empty Username or Password")
log.Error("Invalid User - Empty Username or Password")
c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Invalid User Data"})
return
}
hashedPassword, err := argon2.CreateHash(rUser.Password, argon2.DefaultParams)
if err != nil {
log.Error("[koCreateUser] Argon2 Hash Failure:", err)
log.Error("Argon2 Hash Failure:", err)
c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Unknown Error"})
return
}
@@ -112,7 +112,7 @@ func (api *API) koCreateUser(c *gin.Context) {
Pass: &hashedPassword,
})
if err != nil {
log.Error("[koCreateUser] CreateUser DB Error:", err)
log.Error("CreateUser DB Error:", err)
c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Invalid User Data"})
return
}
@@ -136,7 +136,7 @@ func (api *API) koSetProgress(c *gin.Context) {
var rPosition requestPosition
if err := c.ShouldBindJSON(&rPosition); err != nil {
log.Error("[koSetProgress] Invalid JSON Bind")
log.Error("Invalid JSON Bind")
c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Invalid Progress Data"})
return
}
@@ -148,14 +148,14 @@ func (api *API) koSetProgress(c *gin.Context) {
DeviceName: rPosition.Device,
LastSynced: time.Now().UTC().Format(time.RFC3339),
}); err != nil {
log.Error("[koSetProgress] UpsertDevice DB Error:", err)
log.Error("UpsertDevice DB Error:", err)
}
// Upsert Document
if _, err := api.DB.Queries.UpsertDocument(api.DB.Ctx, database.UpsertDocumentParams{
ID: rPosition.DocumentID,
}); err != nil {
log.Error("[koSetProgress] UpsertDocument DB Error:", err)
log.Error("UpsertDocument DB Error:", err)
}
// Create or Replace Progress
@@ -167,7 +167,7 @@ func (api *API) koSetProgress(c *gin.Context) {
Progress: rPosition.Progress,
})
if err != nil {
log.Error("[koSetProgress] UpdateProgress DB Error:", err)
log.Error("UpdateProgress DB Error:", err)
c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Invalid Request"})
return
}
@@ -186,7 +186,7 @@ func (api *API) koGetProgress(c *gin.Context) {
var rDocID requestDocumentID
if err := c.ShouldBindUri(&rDocID); err != nil {
log.Error("[koGetProgress] Invalid URI Bind")
log.Error("Invalid URI Bind")
c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Invalid Request"})
return
}
@@ -201,7 +201,7 @@ func (api *API) koGetProgress(c *gin.Context) {
c.JSON(http.StatusOK, gin.H{})
return
} else if err != nil {
log.Error("[koGetProgress] GetDocumentProgress DB Error:", err)
log.Error("GetDocumentProgress DB Error:", err)
c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Invalid Document"})
return
}
@@ -223,7 +223,7 @@ func (api *API) koAddActivities(c *gin.Context) {
var rActivity requestActivity
if err := c.ShouldBindJSON(&rActivity); err != nil {
log.Error("[koAddActivities] Invalid JSON Bind")
log.Error("Invalid JSON Bind")
c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Invalid Activity"})
return
}
@@ -231,7 +231,7 @@ func (api *API) koAddActivities(c *gin.Context) {
// Do Transaction
tx, err := api.DB.DB.Begin()
if err != nil {
log.Error("[koAddActivities] Transaction Begin DB Error:", err)
log.Error("Transaction Begin DB Error:", err)
c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Unknown Error"})
return
}
@@ -252,7 +252,7 @@ func (api *API) koAddActivities(c *gin.Context) {
if _, err := qtx.UpsertDocument(api.DB.Ctx, database.UpsertDocumentParams{
ID: doc,
}); err != nil {
log.Error("[koAddActivities] UpsertDocument DB Error:", err)
log.Error("UpsertDocument DB Error:", err)
c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Invalid Document"})
return
}
@@ -265,7 +265,7 @@ func (api *API) koAddActivities(c *gin.Context) {
DeviceName: rActivity.Device,
LastSynced: time.Now().UTC().Format(time.RFC3339),
}); err != nil {
log.Error("[koAddActivities] UpsertDevice DB Error:", err)
log.Error("UpsertDevice DB Error:", err)
c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Invalid Device"})
return
}
@@ -281,7 +281,7 @@ func (api *API) koAddActivities(c *gin.Context) {
StartPercentage: float64(item.Page) / float64(item.Pages),
EndPercentage: float64(item.Page+1) / float64(item.Pages),
}); err != nil {
log.Error("[koAddActivities] AddActivity DB Error:", err)
log.Error("AddActivity DB Error:", err)
c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Invalid Activity"})
return
}
@@ -289,7 +289,7 @@ func (api *API) koAddActivities(c *gin.Context) {
// Commit Transaction
if err := tx.Commit(); err != nil {
log.Error("[koAddActivities] Transaction Commit DB Error:", err)
log.Error("Transaction Commit DB Error:", err)
c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Unknown Error"})
return
}
@@ -307,7 +307,7 @@ func (api *API) koCheckActivitySync(c *gin.Context) {
var rCheckActivity requestCheckActivitySync
if err := c.ShouldBindJSON(&rCheckActivity); err != nil {
log.Error("[koCheckActivitySync] Invalid JSON Bind")
log.Error("Invalid JSON Bind")
c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Invalid Request"})
return
}
@@ -319,7 +319,7 @@ func (api *API) koCheckActivitySync(c *gin.Context) {
DeviceName: rCheckActivity.Device,
LastSynced: time.Now().UTC().Format(time.RFC3339),
}); err != nil {
log.Error("[koCheckActivitySync] UpsertDevice DB Error", err)
log.Error("UpsertDevice DB Error", err)
c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Invalid Device"})
return
}
@@ -332,7 +332,7 @@ func (api *API) koCheckActivitySync(c *gin.Context) {
if err == sql.ErrNoRows {
lastActivity = time.UnixMilli(0).Format(time.RFC3339)
} else if err != nil {
log.Error("[koCheckActivitySync] GetLastActivity DB Error:", err)
log.Error("GetLastActivity DB Error:", err)
c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Unknown Error"})
return
}
@@ -340,7 +340,7 @@ func (api *API) koCheckActivitySync(c *gin.Context) {
// Parse Time
parsedTime, err := time.Parse(time.RFC3339, lastActivity)
if err != nil {
log.Error("[koCheckActivitySync] Time Parse Error:", err)
log.Error("Time Parse Error:", err)
c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Unknown Error"})
return
}
@@ -353,7 +353,7 @@ func (api *API) koCheckActivitySync(c *gin.Context) {
func (api *API) koAddDocuments(c *gin.Context) {
var rNewDocs requestDocument
if err := c.ShouldBindJSON(&rNewDocs); err != nil {
log.Error("[koAddDocuments] Invalid JSON Bind")
log.Error("Invalid JSON Bind")
c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Invalid Document(s)"})
return
}
@@ -361,7 +361,7 @@ func (api *API) koAddDocuments(c *gin.Context) {
// Do Transaction
tx, err := api.DB.DB.Begin()
if err != nil {
log.Error("[koAddDocuments] Transaction Begin DB Error:", err)
log.Error("Transaction Begin DB Error:", err)
c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Unknown Error"})
return
}
@@ -382,7 +382,7 @@ func (api *API) koAddDocuments(c *gin.Context) {
Description: api.sanitizeInput(doc.Description),
})
if err != nil {
log.Error("[koAddDocuments] UpsertDocument DB Error:", err)
log.Error("UpsertDocument DB Error:", err)
c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Invalid Document"})
return
}
@@ -390,7 +390,7 @@ func (api *API) koAddDocuments(c *gin.Context) {
// Commit Transaction
if err := tx.Commit(); err != nil {
log.Error("[koAddDocuments] Transaction Commit DB Error:", err)
log.Error("Transaction Commit DB Error:", err)
c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Unknown Error"})
return
}
@@ -408,7 +408,7 @@ func (api *API) koCheckDocumentsSync(c *gin.Context) {
var rCheckDocs requestCheckDocumentSync
if err := c.ShouldBindJSON(&rCheckDocs); err != nil {
log.Error("[koCheckDocumentsSync] Invalid JSON Bind")
log.Error("Invalid JSON Bind")
c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Invalid Request"})
return
}
@@ -421,7 +421,7 @@ func (api *API) koCheckDocumentsSync(c *gin.Context) {
LastSynced: time.Now().UTC().Format(time.RFC3339),
})
if err != nil {
log.Error("[koCheckDocumentsSync] UpsertDevice DB Error", err)
log.Error("UpsertDevice DB Error", err)
c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Invalid Device"})
return
}
@@ -432,7 +432,7 @@ func (api *API) koCheckDocumentsSync(c *gin.Context) {
// Get Missing Documents
missingDocs, err = api.DB.Queries.GetMissingDocuments(api.DB.Ctx, rCheckDocs.Have)
if err != nil {
log.Error("[koCheckDocumentsSync] GetMissingDocuments DB Error", err)
log.Error("GetMissingDocuments DB Error", err)
c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Invalid Request"})
return
}
@@ -440,7 +440,7 @@ func (api *API) koCheckDocumentsSync(c *gin.Context) {
// Get Deleted Documents
deletedDocIDs, err = api.DB.Queries.GetDeletedDocuments(api.DB.Ctx, rCheckDocs.Have)
if err != nil {
log.Error("[koCheckDocumentsSync] GetDeletedDocuments DB Error", err)
log.Error("GetDeletedDocuments DB Error", err)
c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Invalid Request"})
return
}
@@ -448,14 +448,14 @@ func (api *API) koCheckDocumentsSync(c *gin.Context) {
// Get Wanted Documents
jsonHaves, err := json.Marshal(rCheckDocs.Have)
if err != nil {
log.Error("[koCheckDocumentsSync] JSON Marshal Error", err)
log.Error("JSON Marshal Error", err)
c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Invalid Request"})
return
}
wantedDocs, err := api.DB.Queries.GetWantedDocuments(api.DB.Ctx, string(jsonHaves))
if err != nil {
log.Error("[koCheckDocumentsSync] GetWantedDocuments DB Error", err)
log.Error("GetWantedDocuments DB Error", err)
c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Invalid Request"})
return
}
@@ -499,14 +499,14 @@ func (api *API) koCheckDocumentsSync(c *gin.Context) {
func (api *API) koUploadExistingDocument(c *gin.Context) {
var rDoc requestDocumentID
if err := c.ShouldBindUri(&rDoc); err != nil {
log.Error("[koUploadExistingDocument] Invalid URI Bind")
log.Error("Invalid URI Bind")
c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Invalid Request"})
return
}
fileData, err := c.FormFile("file")
if err != nil {
log.Error("[koUploadExistingDocument] File Error:", err)
log.Error("File Error:", err)
c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "File Error"})
return
}
@@ -517,7 +517,7 @@ func (api *API) koUploadExistingDocument(c *gin.Context) {
fileExtension := fileMime.Extension()
if !slices.Contains([]string{".epub", ".html"}, fileExtension) {
log.Error("[koUploadExistingDocument] Invalid FileType:", fileExtension)
log.Error("Invalid FileType:", fileExtension)
c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Invalid Filetype"})
return
}
@@ -525,7 +525,7 @@ func (api *API) koUploadExistingDocument(c *gin.Context) {
// Validate Document Exists in DB
document, err := api.DB.Queries.GetDocument(api.DB.Ctx, rDoc.DocumentID)
if err != nil {
log.Error("[koUploadExistingDocument] GetDocument DB Error:", err)
log.Error("GetDocument DB Error:", err)
c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Unknown Document"})
return
}
@@ -558,7 +558,7 @@ func (api *API) koUploadExistingDocument(c *gin.Context) {
if os.IsNotExist(err) {
err = c.SaveUploadedFile(fileData, safePath)
if err != nil {
log.Error("[koUploadExistingDocument] Save Failure:", err)
log.Error("Save Failure:", err)
c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "File Error"})
return
}
@@ -567,7 +567,7 @@ func (api *API) koUploadExistingDocument(c *gin.Context) {
// Get MD5 Hash
fileHash, err := getFileMD5(safePath)
if err != nil {
log.Error("[koUploadExistingDocument] Hash Failure:", err)
log.Error("Hash Failure:", err)
c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "File Error"})
return
}
@@ -575,7 +575,7 @@ func (api *API) koUploadExistingDocument(c *gin.Context) {
// Get Word Count
wordCount, err := metadata.GetWordCount(safePath)
if err != nil {
log.Error("[koUploadExistingDocument] Word Count Failure:", err)
log.Error("Word Count Failure:", err)
c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "File Error"})
return
}
@@ -587,7 +587,7 @@ func (api *API) koUploadExistingDocument(c *gin.Context) {
Filepath: &fileName,
Words: &wordCount,
}); err != nil {
log.Error("[koUploadExistingDocument] UpsertDocument DB Error:", err)
log.Error("UpsertDocument DB Error:", err)
c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Document Error"})
return
}

2
api/opds-routes.go
View File

@@ -84,7 +84,7 @@ func (api *API) opdsDocuments(c *gin.Context) {
Limit: *qParams.Limit,
})
if err != nil {
log.Error("[opdsDocuments] GetDocumentsWithStats DB Error:", err)
log.Error("GetDocumentsWithStats DB Error:", err)
c.AbortWithStatus(http.StatusBadRequest)
return
}