@@ -932,7 +932,7 @@ func NewExistingDataReplaceSelect(state *RunL1NodeState) *ExistingDataReplaceSel
932
932
},
933
933
},
934
934
state : state ,
935
- question : fmt .Sprintf ("Existing %s detected. Would you like to use the current one or replace it" , utils .InitiaDataDirectory ),
935
+ question : fmt .Sprintf ("Existing %s detected. Would you like to use the current one or replace it? " , utils .InitiaDataDirectory ),
936
936
}
937
937
}
938
938
@@ -998,7 +998,8 @@ func (m *SnapshotEndpointInput) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
998
998
input , cmd , done := m .TextInput .Update (msg )
999
999
if done {
1000
1000
m .state .snapshotEndpoint = input .Text
1001
- // m.state.weave.PreviousResponse += styles.RenderPreviousResponse(styles.DotsSeparator, m.GetQuestion(), []string{"snapshot url"}, input.Text)
1001
+ m .state .weave .PushPreviousResponse (styles .RenderPreviousResponse (styles .DotsSeparator , m .GetQuestion (), []string {"snapshot url" }, input .Text ))
1002
+
1002
1003
if snapshotDownload , err := NewSnapshotDownloadLoading (m .state ); err == nil {
1003
1004
return snapshotDownload , snapshotDownload .Init ()
1004
1005
} else {
@@ -1065,8 +1066,7 @@ type SnapshotDownloadLoading struct {
1065
1066
func NewSnapshotDownloadLoading (state * RunL1NodeState ) (* SnapshotDownloadLoading , error ) {
1066
1067
userHome , err := os .UserHomeDir ()
1067
1068
if err != nil {
1068
- fmt .Printf ("[error] Failed to get user home: %v\n " , err )
1069
- return nil , err
1069
+ return nil , fmt .Errorf ("[error] Failed to get user home: %v" , err )
1070
1070
}
1071
1071
1072
1072
return & SnapshotDownloadLoading {
@@ -1087,7 +1087,7 @@ func (m *SnapshotDownloadLoading) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
1087
1087
if err := m .GetError (); err != nil {
1088
1088
model := NewSnapshotEndpointInput (m .state )
1089
1089
model .err = err
1090
- return model , nil
1090
+ return model , model . Init ()
1091
1091
}
1092
1092
1093
1093
if m .GetCompletion () {
@@ -1104,8 +1104,7 @@ func (m *SnapshotDownloadLoading) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
1104
1104
}
1105
1105
1106
1106
func (m * SnapshotDownloadLoading ) View () string {
1107
- view := m .state .weave .Render () + m .Downloader .View ()
1108
- return view
1107
+ return m .state .weave .Render () + m .Downloader .View ()
1109
1108
}
1110
1109
1111
1110
type SnapshotExtractLoading struct {
@@ -1127,6 +1126,15 @@ func (m *SnapshotExtractLoading) Init() tea.Cmd {
1127
1126
func (m * SnapshotExtractLoading ) Update (msg tea.Msg ) (tea.Model , tea.Cmd ) {
1128
1127
loader , cmd := m .Loading .Update (msg )
1129
1128
m .Loading = loader
1129
+ switch msg := msg .(type ) {
1130
+ case utils.ErrorLoading :
1131
+ m .state .weave .PopPreviousResponse ()
1132
+ m .state .weave .PopPreviousResponse ()
1133
+ model := NewSnapshotEndpointInput (m .state )
1134
+ model .err = msg .Err
1135
+ return model , cmd
1136
+ }
1137
+
1130
1138
if m .Loading .Completing {
1131
1139
m .state .weave .PushPreviousResponse (styles .RenderPreviousResponse (styles .NoSeparator , fmt .Sprintf ("Snapshot extracted to %s successfully." , utils .InitiaDataDirectory ), []string {}, "" ))
1132
1140
return m , tea .Quit
@@ -1145,8 +1153,7 @@ func snapshotExtractor() tea.Cmd {
1145
1153
return func () tea.Msg {
1146
1154
userHome , err := os .UserHomeDir ()
1147
1155
if err != nil {
1148
- fmt .Printf ("[error] Failed to get user home: %v\n " , err )
1149
- // TODO: Return error
1156
+ return utils.ErrorLoading {Err : fmt .Errorf ("[error] Failed to get user home: %v" , err )}
1150
1157
}
1151
1158
1152
1159
targetDir := filepath .Join (userHome , utils .InitiaDirectory )
@@ -1156,8 +1163,7 @@ func snapshotExtractor() tea.Cmd {
1156
1163
1157
1164
err = cmd .Run ()
1158
1165
if err != nil {
1159
- fmt .Printf ("[error] Failed to extract snapshot: %v\n " , err )
1160
- // TODO: Return error
1166
+ return utils.ErrorLoading {Err : fmt .Errorf ("[error] Failed to extract snapshot: %v" , err )}
1161
1167
}
1162
1168
return utils.EndLoading {}
1163
1169
}
0 commit comments