Add remote download progress #371
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,6 +5,7 @@ go 1.26 | |
| toolchain go1.26.0 | ||
|
|
||
| require ( | ||
| charm.land/bubbles/v2 v2.1.0 | ||
| charm.land/lipgloss/v2 v2.0.2 | ||
| github.com/charmbracelet/colorprofile v0.4.2 | ||
| github.com/charmbracelet/x/ansi v0.11.6 | ||
|
|
@@ -27,7 +28,6 @@ require ( | |
| ) | ||
|
|
||
| require ( | ||
| charm.land/bubbletea/v2 v2.0.2 // indirect | ||
| github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect | ||
| github.com/aymanbagabas/go-udiff v0.4.1 // indirect | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,8 +2,6 @@ charm.land/bubbles/v2 v2.1.0 h1:YSnNh5cPYlYjPxRrzs5VEn3vwhtEn3jVGRBT3M7/I0g= | |
| charm.land/bubbles/v2 v2.1.0/go.mod h1:l97h4hym2hvWBVfmJDtrEHHCtkIKeTEb3TTJ4ZOB3wY= | ||
| charm.land/bubbletea/v2 v2.0.2 h1:4CRtRnuZOdFDTWSff9r8QFt/9+z6Emubz3aDMnf/dx0= | ||
| charm.land/bubbletea/v2 v2.0.2/go.mod h1:3LRff2U4WIYXy7MTxfbAQ+AdfM3D8Xuvz2wbsOD9OHQ= | ||
| charm.land/lipgloss/v2 v2.0.2 h1:xFolbF8JdpNkM2cEPTfXEcW1p6NRzOWTSamRfYEw8cs= | ||
| charm.land/lipgloss/v2 v2.0.2/go.mod h1:KjPle2Qd3YmvP1KL5OMHiHysGcNwq6u83MUjYkFvEkM= | ||
| github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k= | ||
|
|
@@ -106,8 +104,6 @@ github.com/mattn/go-isatty v0.0.0-20160806122752-66b8e73f3f5c/go.mod h1:M+lRXTBq | |
| github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= | ||
| github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= | ||
| github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= | ||
| github.com/mattn/go-runewidth v0.0.21 h1:jJKAZiQH+2mIinzCJIaIG9Be1+0NR+5sz/lYEEjdM8w= | ||
| github.com/mattn/go-runewidth v0.0.21/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs= | ||
| github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA= | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,8 +12,9 @@ import ( | |
|
|
||
| "github.com/lets-cli/fang" | ||
| "github.com/lets-cli/lets/internal/cmd" | ||
| loader "github.com/lets-cli/lets/internal/config" | ||
| "github.com/lets-cli/lets/internal/config/config" | ||
| "github.com/lets-cli/lets/internal/downloadprogress" | ||
| "github.com/lets-cli/lets/internal/env" | ||
| "github.com/lets-cli/lets/internal/logging" | ||
| "github.com/lets-cli/lets/internal/set" | ||
|
|
@@ -79,15 +80,26 @@ func Main(version string, buildDate string) int { | |
| } | ||
|
|
||
| var cfg *config.Config | ||
|
|
||
| loadOptions := []loader.LoadOption{} | ||
| if isInteractiveStderr() { | ||
| loadOptions = append(loadOptions, loader.WithProgress(downloadprogress.New( | ||
| os.Stderr, | ||
| downloadprogress.WithNoColor(appSettings.NoColor), | ||
| downloadprogress.WithTheme(appSettings.Theme), | ||
| ))) | ||
| } | ||
|
|
||
| if isRemoteURL(rootFlags.config) { | ||
| if configDir != "" { | ||
| log.Warnf("LETS_CONFIG_DIR is ignored when using a remote config URL") | ||
| } | ||
|
|
||
| cfg, err = loader.LoadRemote(ctx, rootFlags.config, rootFlags.noCache, version, loadOptions...) | ||
| } else { | ||
| cfg, err = loader.LoadWithContext(ctx, rootFlags.config, configDir, version, loadOptions...) | ||
| } | ||
|
|
||
| if err != nil { | ||
| if failOnConfigError(rootCmd, command, rootFlags) { | ||
| log.Errorf("config error: %s", err) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -136,7 +136,7 @@ func promptSkillScope(in io.Reader, out io.Writer, localDir string, globalDir st | |
| _, _ = fmt.Fprint(out, "Select [1/2]: ") | ||
|
|
||
| line, err := bufio.NewReader(in).ReadString('\n') | ||
| if err != nil && (!errors.Is(err, io.EOF) || line == "") { | ||
| return "", fmt.Errorf("reading install scope: %w", err) | ||
| } | ||
|
|
||
|
|
@@ -180,6 +180,7 @@ func validateSkillNameArg(args []string) error { | |
|
|
||
| func installLetsSkill(out io.Writer, targetDir string, force bool) error { | ||
| skillDir := filepath.Join(targetDir, skillpkg.LetsName) | ||
|
|
||
| skillPath := filepath.Join(skillDir, skillpkg.SkillFile) | ||
| if _, err := os.Stat(skillPath); err == nil && !force { | ||
| _, _ = fmt.Fprintf(out, "%s already exists. Use --force to overwrite.\n", skillPath) | ||
|
|
@@ -193,6 +194,7 @@ func installLetsSkill(out io.Writer, targetDir string, force bool) error { | |
| } | ||
|
|
||
| _, _ = fmt.Fprintf(out, "Installed %s\n", skillDir) | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
|
|
@@ -203,19 +205,23 @@ func updateLetsSkill(out io.Writer) error { | |
| } | ||
|
|
||
| updated := 0 | ||
|
|
||
| for _, skillDir := range dirs { | ||
| skillPath := filepath.Join(skillDir, skillpkg.SkillFile) | ||
|
|
||
| current, err := os.ReadFile(skillPath) | ||
| if errors.Is(err, os.ErrNotExist) { | ||
| continue | ||
| } | ||
|
|
||
| if err != nil { | ||
| return fmt.Errorf("reading %s: %w", skillPath, err) | ||
| } | ||
|
|
||
| if bytes.Equal(current, skillpkg.LetsSkill()) { | ||
| _, _ = fmt.Fprintf(out, "%s already up to date.\n", skillDir) | ||
| updated++ | ||
|
|
||
| continue | ||
| } | ||
|
|
||
|
|
@@ -257,6 +263,7 @@ func knownLetsSkillDirs() ([]string, error) { | |
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| dirs = append(dirs, filepath.Join(globalDir, skillpkg.LetsName)) | ||
|
|
||
| return dirs, nil | ||
|
|
@@ -302,6 +309,7 @@ func findGitRoot(start string) (string, error) { | |
| if parent == dir { | ||
| return "", errors.New("not in a Git repository. Use --global or --path to specify a target") | ||
| } | ||
|
|
||
| dir = parent | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,6 +2,7 @@ package config | |
|
|
||
| import ( | ||
| "bytes" | ||
| "context" | ||
| "errors" | ||
| "fmt" | ||
| "maps" | ||
|
|
@@ -10,6 +11,7 @@ import ( | |
| "strings" | ||
|
|
||
| "github.com/lets-cli/lets/internal/config/path" | ||
| "github.com/lets-cli/lets/internal/fetch" | ||
| "github.com/lets-cli/lets/internal/set" | ||
| "github.com/lets-cli/lets/internal/util" | ||
| "gopkg.in/yaml.v3" | ||
|
|
@@ -52,8 +54,23 @@ type Config struct { | |
| RemoteSource string | ||
|
|
||
| // cached env after config.SetupEnv, used in config.GetEnv | ||
| cachedEnv map[string]string | ||
| downloadContext context.Context | ||
| downloadProgress fetch.ProgressObserver | ||
| isMixin bool // if true, we consider config as mixin and apply different parsing and validation | ||
| } | ||
|
|
||
| func (c *Config) SetDownloadOptions(ctx context.Context, progress fetch.ProgressObserver) { | ||
| c.downloadContext = ctx | ||
| c.downloadProgress = progress | ||
| } | ||
|
|
||
| func (c *Config) context() context.Context { | ||
| if c.downloadContext == nil { | ||
| return context.Background() | ||
| } | ||
|
|
||
| return c.downloadContext | ||
| } | ||
|
|
||
| func (c *Config) UnmarshalYAML(unmarshal func(any) error) error { | ||
|
|
@@ -225,7 +242,7 @@ func (c *Config) readMixin(mixin *Mixin) error { | |
| } | ||
|
|
||
| if data == nil { | ||
| data, err = rm.download(c.context(), c.downloadProgress) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
@@ -356,6 +373,7 @@ func NewConfig(workDir string, configAbsPath string, dotLetsDir string) *Config | |
| func NewMixinConfig(cfg *Config, configAbsPath string) *Config { | ||
| mixin := NewConfig(cfg.WorkDir, configAbsPath, cfg.DotLetsDir) | ||
| mixin.isMixin = true | ||
| mixin.SetDownloadOptions(cfg.context(), cfg.downloadProgress) | ||
|
|
||
| return mixin | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -77,8 +77,8 @@ func (rm *RemoteMixin) tryRead() ([]byte, error) { | |
| return data, nil | ||
| } | ||
|
|
||
| func (rm *RemoteMixin) download(ctx context.Context, progress fetch.ProgressObserver) ([]byte, error) { | ||
| return fetch.Download(ctx, rm.URL, fetch.WithProgress(fetch.SourceRemoteMixin, progress)) | ||
| } | ||
|
|
||
| // Trim `-` prefix. | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
suggestion (typo): Capitalize URL and consider adding missing articles in the mixin URL sentence.
For example, you could write: “It is possible to specify a mixin as a URL. lets will download it and load it as a mixin.”