Skip to content

Commit 15c86ec

Browse files
committed
fix: comments
1 parent ec10000 commit 15c86ec

File tree

6 files changed

+19
-15
lines changed

6 files changed

+19
-15
lines changed

src/internal/file_operations.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,15 +210,15 @@ func pasteDir(src, dst string, p *processbar.Process, cut bool, processBarModel
210210

211211
if err != nil {
212212
p.State = processbar.Failed
213-
pSendErr := processBarModel.SendUpdateProcessNameMsg(*p, true)
213+
pSendErr := processBarModel.SendUpdateProcessMsg(*p, true)
214214
if pSendErr != nil {
215215
slog.Error("Error sending process udpate", "error", pSendErr)
216216
}
217217
return err
218218
}
219219

220220
p.Done++
221-
processBarModel.TrySendingUpdateProcessNameMsg(*p)
221+
processBarModel.TrySendingUpdateProcessMsg(*p)
222222
return nil
223223
})
224224

src/internal/file_operations_compress.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func zipSources(sources []string, target string, processBar *processbar.Model) e
3838
p.Name = icon.CompressFile + icon.Space + "File already exist"
3939
p.State = processbar.Cancelled
4040
p.DoneTime = time.Now()
41-
pSendErr := processBar.SendUpdateProcessNameMsg(p, true)
41+
pSendErr := processBar.SendUpdateProcessMsg(p, true)
4242
if pSendErr != nil {
4343
slog.Error("Error sending process udpate", "error", pSendErr)
4444
}
@@ -90,7 +90,7 @@ func zipSources(sources []string, target string, processBar *processbar.Model) e
9090
return err
9191
}
9292
p.Done++
93-
processBar.TrySendingUpdateProcessNameMsg(p)
93+
processBar.TrySendingUpdateProcessMsg(p)
9494
return nil
9595
})
9696
if err != nil {
@@ -105,7 +105,7 @@ func zipSources(sources []string, target string, processBar *processbar.Model) e
105105
p.Done = totalFiles
106106
}
107107
p.DoneTime = time.Now()
108-
pSendErr := processBar.SendUpdateProcessNameMsg(p, true)
108+
pSendErr := processBar.SendUpdateProcessMsg(p, true)
109109
if pSendErr != nil {
110110
slog.Error("Error sending process udpate", "error", pSendErr)
111111
}

src/internal/file_operations_extract.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ func extractCompressFile(src, dest string, processBar *processbar.Model) error {
3434
}
3535

3636
p.DoneTime = time.Now()
37-
pSendErr := processBar.SendUpdateProcessNameMsg(p, true)
37+
pSendErr := processBar.SendUpdateProcessMsg(p, true)
3838
if pSendErr != nil {
3939
slog.Error("Error sending process udpate", "error", pSendErr)
4040
}

src/internal/handle_file_operations.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -142,14 +142,14 @@ func deleteOperation(processBarModel *processbar.Model, items []string, useTrash
142142
}
143143
p.Name = icon.Delete + icon.Space + filepath.Base(item)
144144
p.Done++
145-
processBarModel.TrySendingUpdateProcessNameMsg(p)
145+
processBarModel.TrySendingUpdateProcessMsg(p)
146146
}
147147

148148
if p.State != processbar.Failed {
149149
p.State = processbar.Successful
150150
}
151151
p.DoneTime = time.Now()
152-
processBarModel.TrySendingUpdateProcessNameMsg(p)
152+
processBarModel.TrySendingUpdateProcessMsg(p)
153153
return p.State
154154
}
155155

@@ -339,14 +339,14 @@ func executePasteOperation(processBarModel *processbar.Model,
339339
}
340340

341341
p.Done++
342-
processBarModel.TrySendingUpdateProcessNameMsg(p)
342+
processBarModel.TrySendingUpdateProcessMsg(p)
343343
}
344344

345345
if p.State != processbar.Failed {
346346
p.State = processbar.Successful
347347
}
348348
p.DoneTime = time.Now()
349-
err = processBarModel.SendUpdateProcessNameMsg(p, true)
349+
err = processBarModel.SendUpdateProcessMsg(p, true)
350350
if err != nil {
351351
slog.Error("Could not send final update for process Bar", "error", err)
352352
}

src/internal/ui/processbar/model_update.go

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@ func (m *Model) ListenForChannelUpdates() {
99
// A goroutine running forever
1010
go func() {
1111
for {
12-
msg := <-m.msgChan
12+
msg, ok := <-m.msgChan
13+
if !ok {
14+
slog.Debug("Channel closed, stopping listener")
15+
return
16+
}
1317
slog.Debug("Received message", "id", msg.GetReqID())
1418
if _, ok := msg.(stopListeningMsg); ok {
1519
return
@@ -67,13 +71,13 @@ func (m *Model) SendAddProcessMsg(name string, total int, blockingSend bool) (Pr
6771
return p, nil
6872
}
6973

70-
func (m *Model) SendUpdateProcessNameMsg(p Process, blockingSend bool) error {
74+
func (m *Model) SendUpdateProcessMsg(p Process, blockingSend bool) error {
7175
msg := updateProcessMsg{NewProcess: p, BaseMsg: BaseMsg{reqID: m.newReqCnt()}}
7276
return m.sendMsgToChannel(msg, blockingSend)
7377
}
7478

7579
// Non Blocking and can fail
76-
func (m *Model) TrySendingUpdateProcessNameMsg(p Process) {
80+
func (m *Model) TrySendingUpdateProcessMsg(p Process) {
7781
msg := updateProcessMsg{NewProcess: p, BaseMsg: BaseMsg{reqID: m.newReqCnt()}}
7882
err := m.sendMsgToChannel(msg, false)
7983
if err != nil {

src/internal/ui/processbar/model_utils.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ func (m *Model) getSortedProcesses() []Process {
4141
}
4242
// sort by the process
4343
sort.Slice(processes, func(i, j int) bool {
44-
doneI := (processes[i].State == Successful)
45-
doneJ := (processes[j].State == Successful)
44+
doneI := (processes[i].State == Successful || processes[i].State == Failed)
45+
doneJ := (processes[j].State == Successful || processes[j].State == Failed)
4646

4747
// sort by done or not
4848
if doneI != doneJ {

0 commit comments

Comments
 (0)