jprdonnelly/steampipe
1
0
Fork 0
mirror of https://github.com/turbot/steampipe.git synced 2026-03-06 06:35:52 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use ellipsis char instead of 3 dots in plugin update/install when cutting off the plugin name. Closes #2355

Browse Source
This commit is contained in:
Puskar Basu
2022-09-02 18:18:37 +05:30
committed by GitHub
parent 7db5b3fa5c
commit 1ea9a7edfe
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/plugin.go
View File

@@ -8,7 +8,6 @@ import (
"time"
"github.com/gosuri/uiprogress"
"github.com/gosuri/uiprogress/util/strutil"
"github.com/spf13/cobra"
"github.com/spf13/viper"
"github.com/turbot/go-kit/helpers"
@@ -254,7 +253,7 @@ func doPluginInstall(ctx context.Context, bar *uiprogress.Bar, pluginName string
bar.Set(len(pluginInstallSteps))
// let the bar append itself with "Already Installed"
bar.AppendFunc(func(b *uiprogress.Bar) string {
return strutil.Resize(constants.PluginAlreadyInstalled, 20)
return helpers.TruncateString(constants.PluginAlreadyInstalled, 20)
})
report = &display.PluginInstallReport{
Plugin: pluginName,
@@ -266,13 +265,13 @@ func doPluginInstall(ctx context.Context, bar *uiprogress.Bar, pluginName string
// let the bar append itself with the current installation step
bar.AppendFunc(func(b *uiprogress.Bar) string {
if report != nil && report.SkipReason == constants.PluginNotFound {
return strutil.Resize(constants.PluginNotFound, 20)
return helpers.TruncateString(constants.PluginNotFound, 20)
} else {
if b.Current() == 0 {
// no install step to display yet
return ""
}
return strutil.Resize(pluginInstallSteps[b.Current()-1], 20)
return helpers.TruncateString(pluginInstallSteps[b.Current()-1], 20)
}
})
report = installPlugin(ctx, pluginName, false, bar)
@@ -420,7 +419,7 @@ func doPluginUpdate(ctx context.Context, bar *uiprogress.Bar, pvr plugin.Version
if skip, skipReason := plugin.SkipUpdate(pvr); skip {
bar.AppendFunc(func(b *uiprogress.Bar) string {
// set the progress bar to append itself with "Already Installed"
return strutil.Resize(skipReason, 30)
return helpers.TruncateString(skipReason, 30)
})
// set the progress bar to the maximum
bar.Set(len(pluginInstallSteps))
@@ -437,7 +436,7 @@ func doPluginUpdate(ctx context.Context, bar *uiprogress.Bar, pvr plugin.Version
// no install step to display yet
return ""
}
return strutil.Resize(pluginInstallSteps[b.Current()-1], 20)
return helpers.TruncateString(pluginInstallSteps[b.Current()-1], 20)
})
report = installPlugin(ctx, pvr.Plugin.Name, true, bar)
}
@@ -448,7 +447,7 @@ func doPluginUpdate(ctx context.Context, bar *uiprogress.Bar, pvr plugin.Version
func createProgressBar(plugin string, parentProgressBars *uiprogress.Progress) *uiprogress.Bar {
bar := parentProgressBars.AddBar(len(pluginInstallSteps))
bar.PrependFunc(func(b *uiprogress.Bar) string {
return strutil.Resize(plugin, 20)
return helpers.TruncateString(plugin, 20)
})
return bar
}