Merge remote-tracking branch 'origin/main' into feature/css-fixes

Author: benbusby

backend/db/cron.go

@@ -1,6 +1,7 @@
 package db
 
 import (
+	"database/sql"
 	"fmt"
 	"github.com/robfig/cron/v3"
 	"hash/fnv"
@@ -116,7 +117,7 @@ func (task CronTask) getCronString() string {
 func (task CronTask) isLocked() bool {
 	var lockedUntil time.Time
 
-	s := `SELECT locked_until FROM cron WHERE task_name=$1`
+	s := `SELECT locked_until FROM cron WHERE task_name::text=$1`
 	err := db.QueryRow(s, task.Name).Scan(&lockedUntil)
 	if err != nil {
 		log.Printf("Error checking locked_until for task '%s': %v\n", task.Name, err)
@@ -137,7 +138,7 @@ func (task CronTask) runCronTask() {
 	lockUntil := time.Now().UTC().Add(-time.Second).Add(lockDuration)
 
 	err := db.QueryRow("SELECT pg_try_advisory_lock($1)", lockID).Scan(&lockAcquired)
-	if err != nil {
+	if err != nil && err != sql.ErrNoRows {
 		log.Printf("Error acquiring advisory lock: %v\n", err)
 		return
 	}

backend/server/misc/handlers.go

@@ -20,6 +20,7 @@ import (
 // UpHandler is used as the health check endpoint for load balancing, docker, etc.
 func UpHandler(w http.ResponseWriter, _ *http.Request) {
 	w.WriteHeader(http.StatusOK)
+	_, _ = w.Write([]byte("OK"))
 }
 
 // InfoHandler returns information about the current instance

backend/server/router.go

@@ -62,7 +62,10 @@ func (r *router) AddRoutes(routes []RouteDef) {
 func (r *router) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 	for el, handler := range r.routes {
 		if r.matchPath(el.Path, req.URL.Path) && el.Method == req.Method {
-			log.Printf("%s %s\n", req.Method, req.URL)
+			if req.URL.Path != string(endpoints.Up) {
+				log.Printf("%s %s\n", req.Method, req.URL)
+			}
+
 			handler(w, req)
 			return
 		}

cli/commands/auth/login/view.go

@@ -154,7 +154,7 @@ func showTwoFactorPrompt() string {
 		huh.NewConfirm().Affirmative("Submit").Negative(""),
 	)).WithTheme(styles.Theme).Run()
 
-	return code
+	return strings.TrimSpace(code)
 }
 
 func showCLISessionNote(sessionKey string) {

cli/commands/auth/signup/view.go

@@ -253,8 +253,11 @@ func showCaptchaModel(captchaStr string, errorMessages ...string) string {
 	converter := convert.NewImageConverter()
 	options := convert.DefaultOptions
 	options.Colored = false
+	options.FixedHeight = 40
+	options.FixedWidth = 80
 
 	codeStr := converter.Image2ASCIIString(img, &options)
+	codeStr = shared.TrimEmptyLines(codeStr)
 
 	var code string
 
@@ -276,7 +279,7 @@ func showCaptchaModel(captchaStr string, errorMessages ...string) string {
 	).WithTheme(styles.Theme).Run()
 	utils.HandleCLIError("", err)
 
-	return code
+	return strings.TrimSpace(code)
 }
 
 // showAccountConfirmationModel displays the user's new account ID to the user

cli/commands/download/view.go

@@ -178,6 +178,7 @@ func showDownloadFileModel(prep PreparedDownload, filename string) {
 			progress := int((float32(chunk) / float32(p.NumChunks)) * 100)
 			msg := fmt.Sprintf("Downloading file... (%d%%)", progress)
 			downloadSpinner.Title(msg)
+			chunk++
 		})
 	}).Run()
 

shared/utils.go

@@ -220,3 +220,19 @@ func ObscureEmail(email string) (string, error) {
 
 	return hiddenEmail, nil
 }
+
+func TrimEmptyLines(s string) string {
+	lines := strings.Split(s, "\n")
+
+	start := 0
+	for start < len(lines) && strings.TrimSpace(lines[start]) == "" {
+		start++
+	}
+
+	end := len(lines)
+	for end > start && strings.TrimSpace(lines[end-1]) == "" {
+		end--
+	}
+
+	return strings.Join(lines[start:end], "\n")
+}