From db9629a6180f618ce975b18d493309d5324ba23b Mon Sep 17 00:00:00 2001 From: Evan Reichard Date: Sun, 26 May 2024 19:56:59 -0400 Subject: [PATCH] chore(lint): address linter --- api/api.go | 2 +- api/app-admin-routes.go | 2 +- api/app-routes.go | 6 +++--- database/manager.go | 6 ++++-- graph/graph.go | 2 +- metadata/gbooks.go | 2 +- metadata/gbooks_test.go | 4 ++-- metadata/metadata.go | 3 +++ search/anna.go | 2 +- search/libgen.go | 2 +- 10 files changed, 18 insertions(+), 13 deletions(-) diff --git a/api/api.go b/api/api.go index 4beba6b..213a533 100644 --- a/api/api.go +++ b/api/api.go @@ -300,7 +300,7 @@ func loggingMiddleware(c *gin.Context) { logData := log.Fields{ "type": "access", "ip": c.ClientIP(), - "latency": fmt.Sprintf("%s", latency), + "latency": latency.String(), "status": c.Writer.Status(), "method": c.Request.Method, "path": c.Request.URL.Path, diff --git a/api/app-admin-routes.go b/api/app-admin-routes.go index 5fe41a9..6d107d1 100644 --- a/api/app-admin-routes.go +++ b/api/app-admin-routes.go @@ -206,7 +206,7 @@ func (api *API) appGetAdminLogs(c *gin.Context) { rawLog := scanner.Text() // Attempt JSON Pretty - var jsonMap map[string]interface{} + var jsonMap map[string]any err := json.Unmarshal([]byte(rawLog), &jsonMap) if err != nil { logLines = append(logLines, scanner.Text()) diff --git a/api/app-routes.go b/api/app-routes.go index 3cb9182..9e24a08 100644 --- a/api/app-routes.go +++ b/api/app-routes.go @@ -1057,11 +1057,11 @@ func appErrorPage(c *gin.Context, errorCode int, errorMessage string) { func arrangeUserStatistics(userStatistics []database.GetUserStatisticsRow) gin.H { // Item Sorter - sortItem := func(userStatistics []database.GetUserStatisticsRow, key string, less func(i int, j int) bool) []map[string]interface{} { + sortItem := func(userStatistics []database.GetUserStatisticsRow, key string, less func(i int, j int) bool) []map[string]any { sortedData := append([]database.GetUserStatisticsRow(nil), userStatistics...) sort.SliceStable(sortedData, less) - newData := make([]map[string]interface{}, 0) + newData := make([]map[string]any, 0) for _, item := range sortedData { v := reflect.Indirect(reflect.ValueOf(item)) @@ -1077,7 +1077,7 @@ func arrangeUserStatistics(userStatistics []database.GetUserStatisticsRow) gin.H value = niceNumbers(rawVal) } - newData = append(newData, map[string]interface{}{ + newData = append(newData, map[string]any{ "UserID": item.UserID, "Value": value, }) diff --git a/database/manager.go b/database/manager.go index e2bb13b..a355ea9 100644 --- a/database/manager.go +++ b/database/manager.go @@ -118,7 +118,9 @@ func (dbm *DBManager) init() error { } // Cache tables - go dbm.CacheTempTables() + if err := dbm.CacheTempTables(); err != nil { + log.Warn("Refreshing temp table cache failed: ", err) + } return nil } @@ -188,7 +190,7 @@ func (dbm *DBManager) updateSettings() error { func (dbm *DBManager) performMigrations(isNew bool) error { // Create context - ctx := context.WithValue(context.Background(), "isNew", isNew) + ctx := context.WithValue(context.Background(), "isNew", isNew) // nolint // Set DB migration goose.SetBaseFS(migrations) diff --git a/graph/graph.go b/graph/graph.go index c52aabd..d53af7d 100644 --- a/graph/graph.go +++ b/graph/graph.go @@ -115,7 +115,7 @@ func getSVGBezierControlPoint(currentPoint *SVGGraphPoint, prevPoint *SVGGraphPo // Modifiers var smoothingRatio float64 = 0.2 var directionModifier float64 = 0 - if isReverse == true { + if isReverse { directionModifier = math.Pi } diff --git a/metadata/gbooks.go b/metadata/gbooks.go index adbe87d..92f9153 100644 --- a/metadata/gbooks.go +++ b/metadata/gbooks.go @@ -121,7 +121,7 @@ func getGBooksMetadata(metadataSearch MetadataInfo) ([]MetadataInfo, error) { func saveGBooksCover(gbid string, coverFilePath string, overwrite bool) error { // Validate File Doesn't Exists _, err := os.Stat(coverFilePath) - if err == nil && overwrite == false { + if err == nil && !overwrite { log.Warn("File Alreads Exists") return nil } diff --git a/metadata/gbooks_test.go b/metadata/gbooks_test.go index 6733c74..183e781 100644 --- a/metadata/gbooks_test.go +++ b/metadata/gbooks_test.go @@ -49,8 +49,8 @@ func hookAPI() *details { } // Convert to JSON Response - var responseData map[string]interface{} - json.Unmarshal([]byte(rawResp), &responseData) + var responseData map[string]any + _ = json.Unmarshal([]byte(rawResp), &responseData) // Return Response return httpmock.NewJsonResponse(200, responseData) diff --git a/metadata/metadata.go b/metadata/metadata.go index 6806cea..641b78a 100644 --- a/metadata/metadata.go +++ b/metadata/metadata.go @@ -109,6 +109,9 @@ func GetMetadata(filepath string) (*MetadataInfo, error) { // Acquire Metadata metadataInfo, err := handler(filepath) + if err != nil { + return nil, fmt.Errorf("unable to acquire metadata") + } // Calculate MD5 & Partial MD5 partialMD5, err := utils.CalculatePartialMD5(filepath) diff --git a/search/anna.go b/search/anna.go index 9d941a3..c0a9eb2 100644 --- a/search/anna.go +++ b/search/anna.go @@ -15,7 +15,7 @@ func parseAnnasArchiveDownloadURL(body io.ReadCloser) (string, error) { // Return Download URL downloadURL, exists := doc.Find("body > table > tbody > tr > td > a").Attr("href") - if exists == false { + if !exists { return "", fmt.Errorf("Download URL not found") } diff --git a/search/libgen.go b/search/libgen.go index 7a9243d..048a04b 100644 --- a/search/libgen.go +++ b/search/libgen.go @@ -115,7 +115,7 @@ func parseLibGenDownloadURL(body io.ReadCloser) (string, error) { // Return Download URL // downloadURL, _ := doc.Find("#download [href*=cloudflare]").Attr("href") downloadURL, exists := doc.Find("#download h2 a").Attr("href") - if exists == false { + if !exists { return "", fmt.Errorf("Download URL not found") }