From f2c07c194e3a97ef28d6580633ed68fecb71dde2 Mon Sep 17 00:00:00 2001 From: Amolith Date: Sat, 27 Sep 2025 18:04:15 -0600 Subject: [PATCH] chore: resolve revive linter issues Fix 2 superfluous-else issues in cmd/willow.go where if blocks end with os.Exit calls, add comment justifying blank import in db/db.go, and fix 2 var-naming issues in db/posthooks.go. Co-Authored-By: Crush --- cmd/willow.go | 10 +++++----- db/db.go | 1 + db/posthooks.go | 28 ++++++++++++++-------------- 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/cmd/willow.go b/cmd/willow.go index 64f580a34b02dd250096a774168f16e1672a7b9f..c3e7c9168491e1b93166ab4c85b67d25d2641c7a 100644 --- a/cmd/willow.go +++ b/cmd/willow.go @@ -143,10 +143,10 @@ func main() { if err := httpServer.ListenAndServe(); errors.Is(err, http.ErrServerClosed) { fmt.Println("Web server closed") os.Exit(0) - } else { - fmt.Println(err) - os.Exit(1) } + + fmt.Println(err) + os.Exit(1) } func checkConfig() error { @@ -181,9 +181,9 @@ Listen = "%s"`, defaultDBConn, defaultFetchInterval, defaultFetchInterval, defau fmt.Println("Config file created at", *flagConfig) fmt.Println("Please edit it and restart the server") os.Exit(0) - } else { - return fmt.Errorf("failed to open config file: %w", err) } + + return fmt.Errorf("failed to open config file: %w", err) } defer file.Close() diff --git a/db/db.go b/db/db.go index f9ac8226cb211ab27e5445c4e3c8926a5690d0fa..3e0049d0b24f28b0fe61b61eae3302aefd5ef12c 100644 --- a/db/db.go +++ b/db/db.go @@ -11,6 +11,7 @@ import ( "fmt" "sync" + // Import SQLite driver for database connectivity. _ "modernc.org/sqlite" ) diff --git a/db/posthooks.go b/db/posthooks.go index e9823a0d4214af50e1e0bb35d7d45ccacfc2a7cd..52e71a9c923a33ff7e9aeece613e8ee8e45998c6 100644 --- a/db/posthooks.go +++ b/db/posthooks.go @@ -25,17 +25,17 @@ func generateAndInsertProjectIDs(tx *sql.Tx) error { for rows.Next() { var ( - url string - name string - forge string - version string - created_at string + url string + name string + forge string + version string + createdAt string ) - if err := rows.Scan(&url, &name, &forge, &version, &created_at); err != nil { + if err := rows.Scan(&url, &name, &forge, &version, &createdAt); err != nil { return fmt.Errorf("failed to scan row from projects_tmp: %w", err) } - id := fmt.Sprintf("%x", sha256.Sum256([]byte(url+name+forge+created_at))) + id := fmt.Sprintf("%x", sha256.Sum256([]byte(url+name+forge+createdAt))) _, err = tx.Exec( "INSERT INTO projects (id, url, name, forge, version, created_at) VALUES (@id, @url, @name, @forge, @version, @created_at)", @@ -44,7 +44,7 @@ func generateAndInsertProjectIDs(tx *sql.Tx) error { sql.Named("name", name), sql.Named("forge", forge), sql.Named("version", version), - sql.Named("created_at", created_at), + sql.Named("created_at", createdAt), ) if err != nil { return fmt.Errorf("failed to insert project into projects: %w", err) @@ -72,12 +72,12 @@ func correctProjectIDs(tx *sql.Tx) error { for rows.Next() { var ( - old_id string - url string - name string - forge string + oldID string + url string + name string + forge string ) - if err := rows.Scan(&old_id, &url, &name, &forge); err != nil { + if err := rows.Scan(&oldID, &url, &name, &forge); err != nil { return fmt.Errorf("failed to scan row from projects_tmp: %w", err) } @@ -86,7 +86,7 @@ func correctProjectIDs(tx *sql.Tx) error { _, err = tx.Exec( "UPDATE projects SET id = @id WHERE id = @old_id", sql.Named("id", id), - sql.Named("old_id", old_id), + sql.Named("old_id", oldID), ) if err != nil { return fmt.Errorf("failed to insert project into projects: %w", err)