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

fix: downloads, fix: logging space
Some checks failed
continuous-integration/drone/push Build is failing
Details

Browse Source
This commit is contained in:
Evan Reichard 2024-01-22 17:43:47 -05:00
parent c9edcd8f5a
commit b49e0d19e9
3 changed files with 60 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
api/app-routes.go
View File

@ -150,14 +150,14 @@ func (api *API) appGetDocuments(c *gin.Context) {
Limit: *qParams.Limit, Limit: *qParams.Limit,
}) })
if err != nil { if err != nil {
log.Error("[appGetDocuments] GetDocumentsWithStats DB Error:", err) log.Error("[appGetDocuments] GetDocumentsWithStats DB Error: ", err)
errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetDocumentsWithStats DB Error: %v", err)) errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetDocumentsWithStats DB Error: %v", err))
return return
} }
length, err := api.DB.Queries.GetDocumentsSize(api.DB.Ctx, query) length, err := api.DB.Queries.GetDocumentsSize(api.DB.Ctx, query)
if err != nil { if err != nil {
log.Error("[appGetDocuments] GetDocumentsSize DB Error:", err) log.Error("[appGetDocuments] GetDocumentsSize DB Error: ", err)
errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetDocumentsSize DB Error: %v", err)) errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetDocumentsSize DB Error: %v", err))
return return
} }
@ -199,7 +199,7 @@ func (api *API) appGetDocument(c *gin.Context) {
DocumentID: rDocID.DocumentID, DocumentID: rDocID.DocumentID,
}) })
if err != nil { if err != nil {
log.Error("[appGetDocument] GetDocumentWithStats DB Error:", err) log.Error("[appGetDocument] GetDocumentWithStats DB Error: ", err)
errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetDocumentsWithStats DB Error: %v", err)) errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetDocumentsWithStats DB Error: %v", err))
return return
} }
@ -228,7 +228,7 @@ func (api *API) appGetProgress(c *gin.Context) {
progress, err := api.DB.Queries.GetProgress(api.DB.Ctx, progressFilter) progress, err := api.DB.Queries.GetProgress(api.DB.Ctx, progressFilter)
if err != nil { if err != nil {
log.Error("[appGetProgress] GetProgress DB Error:", err) log.Error("[appGetProgress] GetProgress DB Error: ", err)
errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetActivity DB Error: %v", err)) errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetActivity DB Error: %v", err))
return return
} }
@ -255,7 +255,7 @@ func (api *API) appGetActivity(c *gin.Context) {
activity, err := api.DB.Queries.GetActivity(api.DB.Ctx, activityFilter) activity, err := api.DB.Queries.GetActivity(api.DB.Ctx, activityFilter)
if err != nil { if err != nil {
log.Error("[appGetActivity] GetActivity DB Error:", err) log.Error("[appGetActivity] GetActivity DB Error: ", err)
errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetActivity DB Error: %v", err)) errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetActivity DB Error: %v", err))
return return
} }
@ -294,14 +294,14 @@ func (api *API) appGetSettings(c *gin.Context) {
user, err := api.DB.Queries.GetUser(api.DB.Ctx, auth.UserName) user, err := api.DB.Queries.GetUser(api.DB.Ctx, auth.UserName)
if err != nil { if err != nil {
log.Error("[appGetSettings] GetUser DB Error:", err) log.Error("[appGetSettings] GetUser DB Error: ", err)
errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetUser DB Error: %v", err)) errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetUser DB Error: %v", err))
return return
} }
devices, err := api.DB.Queries.GetDevices(api.DB.Ctx, auth.UserName) devices, err := api.DB.Queries.GetDevices(api.DB.Ctx, auth.UserName)
if err != nil { if err != nil {
log.Error("[appGetSettings] GetDevices DB Error:", err) log.Error("[appGetSettings] GetDevices DB Error: ", err)
errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetDevices DB Error: %v", err)) errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetDevices DB Error: %v", err))
return return
} }
@ -347,7 +347,7 @@ func (api *API) appGetAdminUsers(c *gin.Context) {
users, err := api.DB.Queries.GetUsers(api.DB.Ctx) users, err := api.DB.Queries.GetUsers(api.DB.Ctx)
if err != nil { if err != nil {
log.Error("[appGetAdminUsers] GetUsers DB Error:", err) log.Error("[appGetAdminUsers] GetUsers DB Error: ", err)
errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetUsers DB Error: %v", err)) errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetUsers DB Error: %v", err))
return return
} }
@ -518,7 +518,7 @@ func (api *API) appGetDocumentProgress(c *gin.Context) {
}) })
if err != nil && err != sql.ErrNoRows { if err != nil && err != sql.ErrNoRows {
log.Error("[appGetDocumentProgress] UpsertDocument DB Error:", err) log.Error("[appGetDocumentProgress] UpsertDocument DB Error: ", err)
errorPage(c, http.StatusInternalServerError, fmt.Sprintf("UpsertDocument DB Error: %v", err)) errorPage(c, http.StatusInternalServerError, fmt.Sprintf("UpsertDocument DB Error: %v", err))
return return
} }
@ -528,7 +528,7 @@ func (api *API) appGetDocumentProgress(c *gin.Context) {
DocumentID: rDoc.DocumentID, DocumentID: rDoc.DocumentID,
}) })
if err != nil { if err != nil {
log.Error("[appGetDocumentProgress] GetDocumentWithStats DB Error:", err) log.Error("[appGetDocumentProgress] GetDocumentWithStats DB Error: ", err)
errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetDocumentWithStats DB Error: %v", err)) errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetDocumentWithStats DB Error: %v", err))
return return
} }
@ -552,7 +552,7 @@ func (api *API) appGetDevices(c *gin.Context) {
devices, err := api.DB.Queries.GetDevices(api.DB.Ctx, auth.UserName) devices, err := api.DB.Queries.GetDevices(api.DB.Ctx, auth.UserName)
if err != nil && err != sql.ErrNoRows { if err != nil && err != sql.ErrNoRows {
log.Error("[appGetDevices] GetDevices DB Error:", err) log.Error("[appGetDevices] GetDevices DB Error: ", err)
errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetDevices DB Error: %v", err)) errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetDevices DB Error: %v", err))
return return
} }
@ -640,7 +640,7 @@ func (api *API) appUploadNewDocument(c *gin.Context) {
// Calculate Actual MD5 // Calculate Actual MD5
fileHash, err := getFileMD5(tempFile.Name()) fileHash, err := getFileMD5(tempFile.Name())
if err != nil { if err != nil {
log.Error("[appUploadNewDocument] MD5 Hash Failure:", err) log.Error("[appUploadNewDocument] MD5 Hash Failure: ", err)
errorPage(c, http.StatusInternalServerError, "Unable to calculate MD5.") errorPage(c, http.StatusInternalServerError, "Unable to calculate MD5.")
return return
} }
@ -648,7 +648,7 @@ func (api *API) appUploadNewDocument(c *gin.Context) {
// Get Word Count // Get Word Count
wordCount, err := metadata.GetWordCount(tempFile.Name()) wordCount, err := metadata.GetWordCount(tempFile.Name())
if err != nil { if err != nil {
log.Error("[appUploadNewDocument] Word Count Failure:", err) log.Error("[appUploadNewDocument] Word Count Failure: ", err)
errorPage(c, http.StatusInternalServerError, "Unable to calculate word count.") errorPage(c, http.StatusInternalServerError, "Unable to calculate word count.")
return return
} }
@ -677,7 +677,7 @@ func (api *API) appUploadNewDocument(c *gin.Context) {
safePath := filepath.Join(api.Config.DataPath, "documents", fileName) safePath := filepath.Join(api.Config.DataPath, "documents", fileName)
destFile, err := os.Create(safePath) destFile, err := os.Create(safePath)
if err != nil { if err != nil {
log.Error("[appUploadNewDocument] Dest File Error:", err) log.Error("[appUploadNewDocument] Dest File Error: ", err)
errorPage(c, http.StatusInternalServerError, "Unable to save file.") errorPage(c, http.StatusInternalServerError, "Unable to save file.")
return return
} }
@ -685,7 +685,7 @@ func (api *API) appUploadNewDocument(c *gin.Context) {
// Copy File // Copy File
if _, err = io.Copy(destFile, tempFile); err != nil { if _, err = io.Copy(destFile, tempFile); err != nil {
log.Error("[appUploadNewDocument] Copy Temp File Error:", err) log.Error("[appUploadNewDocument] Copy Temp File Error: ", err)
errorPage(c, http.StatusInternalServerError, "Unable to save file.") errorPage(c, http.StatusInternalServerError, "Unable to save file.")
return return
} }
@ -700,7 +700,7 @@ func (api *API) appUploadNewDocument(c *gin.Context) {
Md5: fileHash, Md5: fileHash,
Filepath: &fileName, Filepath: &fileName,
}); err != nil { }); err != nil {
log.Error("[appUploadNewDocument] UpsertDocument DB Error:", err) log.Error("[appUploadNewDocument] UpsertDocument DB Error: ", err)
errorPage(c, http.StatusInternalServerError, fmt.Sprintf("UpsertDocument DB Error: %v", err)) errorPage(c, http.StatusInternalServerError, fmt.Sprintf("UpsertDocument DB Error: %v", err))
return return
} }
@ -797,7 +797,7 @@ func (api *API) appEditDocument(c *gin.Context) {
Isbn13: api.sanitizeInput(rDocEdit.ISBN13), Isbn13: api.sanitizeInput(rDocEdit.ISBN13),
Coverfile: coverFileName, Coverfile: coverFileName,
}); err != nil { }); err != nil {
log.Error("[appEditDocument] UpsertDocument DB Error:", err) log.Error("[appEditDocument] UpsertDocument DB Error: ", err)
errorPage(c, http.StatusInternalServerError, fmt.Sprintf("UpsertDocument DB Error: %v", err)) errorPage(c, http.StatusInternalServerError, fmt.Sprintf("UpsertDocument DB Error: %v", err))
return return
} }
@ -885,7 +885,7 @@ func (api *API) appIdentifyDocument(c *gin.Context) {
Isbn10: firstResult.ISBN10, Isbn10: firstResult.ISBN10,
Isbn13: firstResult.ISBN13, Isbn13: firstResult.ISBN13,
}); err != nil { }); err != nil {
log.Error("[appIdentifyDocument] AddMetadata DB Error:", err) log.Error("[appIdentifyDocument] AddMetadata DB Error: ", err)
} }
templateVars["Metadata"] = firstResult templateVars["Metadata"] = firstResult
@ -899,7 +899,7 @@ func (api *API) appIdentifyDocument(c *gin.Context) {
DocumentID: rDocID.DocumentID, DocumentID: rDocID.DocumentID,
}) })
if err != nil { if err != nil {
log.Error("[appIdentifyDocument] GetDocumentWithStats DB Error:", err) log.Error("[appIdentifyDocument] GetDocumentWithStats DB Error: ", err)
errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetDocumentWithStats DB Error: %v", err)) errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetDocumentWithStats DB Error: %v", err))
return return
} }
@ -997,7 +997,7 @@ func (api *API) appSaveNewDocument(c *gin.Context) {
// Open Source File // Open Source File
sourceFile, err := os.Open(tempFilePath) sourceFile, err := os.Open(tempFilePath)
if err != nil { if err != nil {
log.Error("[appSaveNewDocument] Source File Error:", err) log.Error("[appSaveNewDocument] Source File Error: ", err)
sendDownloadMessage("Unable to open file", gin.H{"Error": true}) sendDownloadMessage("Unable to open file", gin.H{"Error": true})
return return
} }
@ -1008,7 +1008,7 @@ func (api *API) appSaveNewDocument(c *gin.Context) {
safePath := filepath.Join(api.Config.DataPath, "documents", fileName) safePath := filepath.Join(api.Config.DataPath, "documents", fileName)
destFile, err := os.Create(safePath) destFile, err := os.Create(safePath)
if err != nil { if err != nil {
log.Error("[appSaveNewDocument] Dest File Error:", err) log.Error("[appSaveNewDocument] Dest File Error: ", err)
sendDownloadMessage("Unable to create file", gin.H{"Error": true}) sendDownloadMessage("Unable to create file", gin.H{"Error": true})
return return
} }
@ -1016,7 +1016,7 @@ func (api *API) appSaveNewDocument(c *gin.Context) {
// Copy File // Copy File
if _, err = io.Copy(destFile, sourceFile); err != nil { if _, err = io.Copy(destFile, sourceFile); err != nil {
log.Error("[appSaveNewDocument] Copy Temp File Error:", err) log.Error("[appSaveNewDocument] Copy Temp File Error: ", err)
sendDownloadMessage("Unable to save file", gin.H{"Error": true}) sendDownloadMessage("Unable to save file", gin.H{"Error": true})
return return
} }
@ -1027,7 +1027,7 @@ func (api *API) appSaveNewDocument(c *gin.Context) {
// Get MD5 Hash // Get MD5 Hash
fileHash, err := getFileMD5(safePath) fileHash, err := getFileMD5(safePath)
if err != nil { if err != nil {
log.Error("[appSaveNewDocument] Hash Failure:", err) log.Error("[appSaveNewDocument] Hash Failure: ", err)
sendDownloadMessage("Unable to calculate MD5", gin.H{"Error": true}) sendDownloadMessage("Unable to calculate MD5", gin.H{"Error": true})
return return
} }
@ -1038,7 +1038,7 @@ func (api *API) appSaveNewDocument(c *gin.Context) {
// Get Word Count // Get Word Count
wordCount, err := metadata.GetWordCount(safePath) wordCount, err := metadata.GetWordCount(safePath)
if err != nil { if err != nil {
log.Error("[appSaveNewDocument] Word Count Failure:", err) log.Error("[appSaveNewDocument] Word Count Failure: ", err)
sendDownloadMessage("Unable to calculate word count", gin.H{"Error": true}) sendDownloadMessage("Unable to calculate word count", gin.H{"Error": true})
return return
} }
@ -1055,7 +1055,7 @@ func (api *API) appSaveNewDocument(c *gin.Context) {
Filepath: &fileName, Filepath: &fileName,
Words: &wordCount, Words: &wordCount,
}); err != nil { }); err != nil {
log.Error("[appSaveNewDocument] UpsertDocument DB Error:", err) log.Error("[appSaveNewDocument] UpsertDocument DB Error: ", err)
sendDownloadMessage("Unable to save to database", gin.H{"Error": true}) sendDownloadMessage("Unable to save to database", gin.H{"Error": true})
return return
} }
@ -1116,7 +1116,7 @@ func (api *API) appEditSettings(c *gin.Context) {
// Update User // Update User
_, err := api.DB.Queries.UpdateUser(api.DB.Ctx, newUserSettings) _, err := api.DB.Queries.UpdateUser(api.DB.Ctx, newUserSettings)
if err != nil { if err != nil {
log.Error("[appEditSettings] UpdateUser DB Error:", err) log.Error("[appEditSettings] UpdateUser DB Error: ", err)
errorPage(c, http.StatusInternalServerError, fmt.Sprintf("UpdateUser DB Error: %v", err)) errorPage(c, http.StatusInternalServerError, fmt.Sprintf("UpdateUser DB Error: %v", err))
return return
} }
@ -1124,7 +1124,7 @@ func (api *API) appEditSettings(c *gin.Context) {
// Get User // Get User
user, err := api.DB.Queries.GetUser(api.DB.Ctx, auth.UserName) user, err := api.DB.Queries.GetUser(api.DB.Ctx, auth.UserName)
if err != nil { if err != nil {
log.Error("[appEditSettings] GetUser DB Error:", err) log.Error("[appEditSettings] GetUser DB Error: ", err)
errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetUser DB Error: %v", err)) errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetUser DB Error: %v", err))
return return
} }
@ -1132,7 +1132,7 @@ func (api *API) appEditSettings(c *gin.Context) {
// Get Devices // Get Devices
devices, err := api.DB.Queries.GetDevices(api.DB.Ctx, auth.UserName) devices, err := api.DB.Queries.GetDevices(api.DB.Ctx, auth.UserName)
if err != nil { if err != nil {
log.Error("[appEditSettings] GetDevices DB Error:", err) log.Error("[appEditSettings] GetDevices DB Error: ", err)
errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetDevices DB Error: %v", err)) errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetDevices DB Error: %v", err))
return return
} }
@ -1153,7 +1153,7 @@ func (api *API) getDocumentsWordCount(documents []database.GetDocumentsWithStats
// Do Transaction // Do Transaction
tx, err := api.DB.DB.Begin() tx, err := api.DB.DB.Begin()
if err != nil { if err != nil {
log.Error("[getDocumentsWordCount] Transaction Begin DB Error:", err) log.Error("[getDocumentsWordCount] Transaction Begin DB Error: ", err)
return err return err
} }
@ -1166,13 +1166,13 @@ func (api *API) getDocumentsWordCount(documents []database.GetDocumentsWithStats
filePath := filepath.Join(api.Config.DataPath, "documents", *item.Filepath) filePath := filepath.Join(api.Config.DataPath, "documents", *item.Filepath)
wordCount, err := metadata.GetWordCount(filePath) wordCount, err := metadata.GetWordCount(filePath)
if err != nil { if err != nil {
log.Warn("[getDocumentsWordCount] Word Count Error - ", err) log.Warn("[getDocumentsWordCount] Word Count Error: ", err)
} else { } else {
if _, err := qtx.UpsertDocument(api.DB.Ctx, database.UpsertDocumentParams{ if _, err := qtx.UpsertDocument(api.DB.Ctx, database.UpsertDocumentParams{
ID: item.ID, ID: item.ID,
Words: &wordCount, Words: &wordCount,
}); err != nil { }); err != nil {
log.Error("[getDocumentsWordCount] UpsertDocument DB Error - ", err) log.Error("[getDocumentsWordCount] UpsertDocument DB Error: ", err)
return err return err
} }
} }
@ -1181,7 +1181,7 @@ func (api *API) getDocumentsWordCount(documents []database.GetDocumentsWithStats
// Commit Transaction // Commit Transaction
if err := tx.Commit(); err != nil { if err := tx.Commit(); err != nil {
log.Error("[getDocumentsWordCount] Transaction Commit DB Error:", err) log.Error("[getDocumentsWordCount] Transaction Commit DB Error: ", err)
return err return err
} }

8
api/ko-routes.go
View File

@ -141,7 +141,6 @@ func (api *API) koSetProgress(c *gin.Context) {
return return
} }
start := time.Now()
// Upsert Device // Upsert Device
if _, err := api.DB.Queries.UpsertDevice(api.DB.Ctx, database.UpsertDeviceParams{ if _, err := api.DB.Queries.UpsertDevice(api.DB.Ctx, database.UpsertDeviceParams{
ID: rPosition.DeviceID, ID: rPosition.DeviceID,
@ -151,18 +150,14 @@ func (api *API) koSetProgress(c *gin.Context) {
}); err != nil { }); err != nil {
log.Error("[koSetProgress] UpsertDevice DB Error:", err) log.Error("[koSetProgress] UpsertDevice DB Error:", err)
} }
log.Debug("[koSetProgress] UpsertDevice Performance: ", time.Since(start))
start = time.Now()
// Upsert Document // Upsert Document
if _, err := api.DB.Queries.UpsertDocument(api.DB.Ctx, database.UpsertDocumentParams{ if _, err := api.DB.Queries.UpsertDocument(api.DB.Ctx, database.UpsertDocumentParams{
ID: rPosition.DocumentID, ID: rPosition.DocumentID,
}); err != nil { }); err != nil {
log.Error("[koSetProgress] UpsertDocument DB Error:", err) log.Error("[koSetProgress] UpsertDocument DB Error:", err)
} }
log.Debug("[koSetProgress] UpsertDocument Performance: ", time.Since(start))
start = time.Now()
// Create or Replace Progress // Create or Replace Progress
progress, err := api.DB.Queries.UpdateProgress(api.DB.Ctx, database.UpdateProgressParams{ progress, err := api.DB.Queries.UpdateProgress(api.DB.Ctx, database.UpdateProgressParams{
Percentage: rPosition.Percentage, Percentage: rPosition.Percentage,
@ -176,7 +171,6 @@ func (api *API) koSetProgress(c *gin.Context) {
c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Invalid Request"}) c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Invalid Request"})
return return
} }
log.Debug("[koSetProgress] UpdateProgress Performance: ", time.Since(start))
c.JSON(http.StatusOK, gin.H{ c.JSON(http.StatusOK, gin.H{
"document": progress.DocumentID, "document": progress.DocumentID,
@ -197,12 +191,10 @@ func (api *API) koGetProgress(c *gin.Context) {
return return
} }
start := time.Now()
progress, err := api.DB.Queries.GetDocumentProgress(api.DB.Ctx, database.GetDocumentProgressParams{ progress, err := api.DB.Queries.GetDocumentProgress(api.DB.Ctx, database.GetDocumentProgressParams{
DocumentID: rDocID.DocumentID, DocumentID: rDocID.DocumentID,
UserID: auth.UserName, UserID: auth.UserName,
}) })
log.Debug("[koGetProgress] GetDocumentProgress Performance: ", time.Since(start))
if err == sql.ErrNoRows { if err == sql.ErrNoRows {
// Not Found // Not Found

32
search/search.go
View File

@ -1,6 +1,7 @@
package search package search
import ( import (
"crypto/tls"
"errors" "errors"
"fmt" "fmt"
"io" "io"
@ -14,6 +15,8 @@ import (
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
) )
const userAgent string = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:121.0) Gecko/20100101 Firefox/121.0"
type Cadence string type Cadence string
const ( const (
@ -112,10 +115,10 @@ func SaveBook(id string, source Source) (string, error) {
// Download File // Download File
log.Info("[SaveBook] Downloading Book: ", bookURL) log.Info("[SaveBook] Downloading Book: ", bookURL)
resp, err := http.Get(bookURL) resp, err := downloadBook(bookURL)
if err != nil { if err != nil {
os.Remove(tempFile.Name()) os.Remove(tempFile.Name())
log.Error("[SaveBook] Cover URL API Failure") log.Error("[SaveBook] Book URL API Failure: ", err)
return "", errors.New("API Failure") return "", errors.New("API Failure")
} }
defer resp.Body.Close() defer resp.Body.Close()
@ -125,7 +128,7 @@ func SaveBook(id string, source Source) (string, error) {
_, err = io.Copy(tempFile, resp.Body) _, err = io.Copy(tempFile, resp.Body)
if err != nil { if err != nil {
os.Remove(tempFile.Name()) os.Remove(tempFile.Name())
log.Error("[SaveBook] File Copy Error") log.Error("[SaveBook] File Copy Error: ", err)
return "", errors.New("File Failure") return "", errors.New("File Failure")
} }
@ -328,7 +331,10 @@ func parseAnnasArchiveDownloadURL(body io.ReadCloser) (string, error) {
return "", errors.New("Download URL not found") return "", errors.New("Download URL not found")
} }
return "http://libgen.li/" + downloadURL, nil // Possible Funky URL
downloadURL = strings.ReplaceAll(downloadURL, "\\", "/")
return downloadURL, nil
} }
func parseAnnasArchive(body io.ReadCloser) ([]SearchItem, error) { func parseAnnasArchive(body io.ReadCloser) ([]SearchItem, error) {
@ -379,3 +385,21 @@ func parseAnnasArchive(body io.ReadCloser) ([]SearchItem, error) {
// Return Results // Return Results
return allEntries, nil return allEntries, nil
} }
func downloadBook(bookURL string) (*http.Response, error) {
// Allow Insecure
client := &http.Client{Transport: &http.Transport{
TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
}}
// Start Request
req, err := http.NewRequest("GET", bookURL, nil)
if err != nil {
return nil, err
}
// Set UserAgent
req.Header.Set("User-Agent", userAgent)
return client.Do(req)
}