cleanup

Author: LeMikaelF

internal/turso/databases.go

@@ -15,6 +15,8 @@ import (
 	"github.com/tursodatabase/turso-cli/internal/prompt"
 )
 
+const multipartUploadThresholdBytes = 100 * 1024 * 1024 // 100MB
+
 type Database struct {
 	ID            string `json:"dbId" mapstructure:"dbId"`
 	Name          string
@@ -240,8 +242,13 @@ func (d *DatabasesClient) UploadDatabaseAWS(resp *CreateDatabaseResponse, group
 	// Upload the database file
 	spinner.Text(fmt.Sprintf("Uploading database %s in group %s, this may take a while...", internal.Emph(resp.Database.Name), internal.Emph(group)))
 
-	uploadFunc := tursoServerClient.UploadFile
-	if useMultipart {
+	stat, err := os.Stat(uploadFilepath)
+	if err != nil {
+		return nil, fmt.Errorf("failed to stat file %s: %w", uploadFilepath, err)
+	}
+
+	uploadFunc := tursoServerClient.UploadFileSinglePart
+	if useMultipart || stat.Size() > multipartUploadThresholdBytes {
 		uploadFunc = tursoServerClient.UploadFileMultipart
 	}
 

internal/turso/tursoServer.go

@@ -56,26 +56,10 @@ func NewTursoServerClient(baseURL *url.URL, token string, cliVersion string, org
 	}, nil
 }
 
-const multipartThresholdBytes = 100 * 1024 * 1024 // 100MB
-
-// UploadFile uploads a file to the turso server
-func (i *TursoServerClient) UploadFile(filepath string, onUploadProgress func(progressPct int, uploadedBytes int64, totalBytes int64, elapsedTime time.Duration, done bool)) error {
-	stat, err := os.Stat(filepath)
-	if err != nil {
-		return fmt.Errorf("failed to stat file %s: %w", filepath, err)
-	}
-
-	if stat.Size() > multipartThresholdBytes {
-		return i.UploadFileMultipart(filepath, onUploadProgress)
-	}
-
-	return i.uploadFileSinglePart(filepath, onUploadProgress)
-}
-
-// uploadFileSinglePart uploads a database file to the Turso server using a single request.
+// UploadFileSinglePart uploads a database file to the Turso server using a single request.
 // it assumes a SQLite file exists at 'filepath'.
 // it streams the file to the server, and calls the onProgress callback with the progress of the upload.
-func (i *TursoServerClient) uploadFileSinglePart(filepath string, onUploadProgress func(progressPct int, uploadedBytes int64, totalBytes int64, elapsedTime time.Duration, done bool)) error {
+func (i *TursoServerClient) UploadFileSinglePart(filepath string, onUploadProgress func(progressPct int, uploadedBytes int64, totalBytes int64, elapsedTime time.Duration, done bool)) error {
 	file, err := os.Open(filepath)
 	if err != nil {
 		return fmt.Errorf("failed to open file %s: %w", filepath, err)