From 42a3292bcf5857ee5d7e7aa10b524bdfef5860d4 Mon Sep 17 00:00:00 2001 From: Michael Eischer Date: Sun, 12 Jan 2020 14:31:48 +0100 Subject: [PATCH] Better name for jsonstatus package internal/ui/jsonstatus and termstatus sound similar but are not related in any way. Instead `internal/ui/backup` and `internal/ui/jsonstatus/status` are the counterparts. Rename the latter to `internal/ui/json/backup` to make this clear. --- cmd/restic/cmd_backup.go | 4 ++-- internal/ui/{jsonstatus/status.go => json/backup.go} | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename internal/ui/{jsonstatus/status.go => json/backup.go} (99%) diff --git a/cmd/restic/cmd_backup.go b/cmd/restic/cmd_backup.go index 25984b623..72fdd8bb5 100644 --- a/cmd/restic/cmd_backup.go +++ b/cmd/restic/cmd_backup.go @@ -25,7 +25,7 @@ import ( "github.com/restic/restic/internal/restic" "github.com/restic/restic/internal/textfile" "github.com/restic/restic/internal/ui" - "github.com/restic/restic/internal/ui/jsonstatus" + "github.com/restic/restic/internal/ui/json" "github.com/restic/restic/internal/ui/termstatus" ) @@ -447,7 +447,7 @@ func runBackup(opts BackupOptions, gopts GlobalOptions, term *termstatus.Termina var p ArchiveProgressReporter if gopts.JSON { - p = jsonstatus.NewBackup(term, gopts.verbosity) + p = json.NewBackup(term, gopts.verbosity) } else { p = ui.NewBackup(term, gopts.verbosity) } diff --git a/internal/ui/jsonstatus/status.go b/internal/ui/json/backup.go similarity index 99% rename from internal/ui/jsonstatus/status.go rename to internal/ui/json/backup.go index bf4d78460..ff7af18c4 100644 --- a/internal/ui/jsonstatus/status.go +++ b/internal/ui/json/backup.go @@ -1,4 +1,4 @@ -package jsonstatus +package json import ( "bytes"