refactoring forceRefresh => triggerCompletion
Vladimir Bauer
3 years ago
| 185 | 185 | if s.current >= s.total { |
| 186 | 186 | s.current = s.total |
| 187 | 187 | s.completed = true |
| 188 | b.forceRefresh(s.forceAutoRefresh, s.refreshCh) | |
| 188 | b.triggerCompletion(s.forceAutoRefresh, s.refreshCh) | |
| 189 | 189 | } else { |
| 190 | 190 | s.triggerComplete = true |
| 191 | 191 | } |
| 213 | 213 | if triggerCompleteNow { |
| 214 | 214 | s.current = s.total |
| 215 | 215 | s.completed = true |
| 216 | b.forceRefresh(s.forceAutoRefresh, s.refreshCh) | |
| 216 | b.triggerCompletion(s.forceAutoRefresh, s.refreshCh) | |
| 217 | 217 | } |
| 218 | 218 | }: |
| 219 | 219 | case <-b.done: |
| 231 | 231 | if s.triggerComplete && s.current >= s.total { |
| 232 | 232 | s.current = s.total |
| 233 | 233 | s.completed = true |
| 234 | b.forceRefresh(s.forceAutoRefresh, s.refreshCh) | |
| 234 | b.triggerCompletion(s.forceAutoRefresh, s.refreshCh) | |
| 235 | 235 | } |
| 236 | 236 | }: |
| 237 | 237 | case <-b.done: |
| 253 | 253 | if s.triggerComplete && s.current >= s.total { |
| 254 | 254 | s.current = s.total |
| 255 | 255 | s.completed = true |
| 256 | b.forceRefresh(s.forceAutoRefresh, s.refreshCh) | |
| 256 | b.triggerCompletion(s.forceAutoRefresh, s.refreshCh) | |
| 257 | 257 | } |
| 258 | 258 | }: |
| 259 | 259 | case <-b.done: |
| 281 | 281 | if s.triggerComplete && s.current >= s.total { |
| 282 | 282 | s.current = s.total |
| 283 | 283 | s.completed = true |
| 284 | b.forceRefresh(s.forceAutoRefresh, s.refreshCh) | |
| 284 | b.triggerCompletion(s.forceAutoRefresh, s.refreshCh) | |
| 285 | 285 | } |
| 286 | 286 | }: |
| 287 | 287 | case <-b.done: |
| 311 | 311 | if s.triggerComplete && s.current >= s.total { |
| 312 | 312 | s.current = s.total |
| 313 | 313 | s.completed = true |
| 314 | b.forceRefresh(s.forceAutoRefresh, s.refreshCh) | |
| 314 | b.triggerCompletion(s.forceAutoRefresh, s.refreshCh) | |
| 315 | 315 | } |
| 316 | 316 | }: |
| 317 | 317 | case <-b.done: |
| 349 | 349 | } |
| 350 | 350 | s.aborted = true |
| 351 | 351 | s.dropOnComplete = drop |
| 352 | b.forceRefresh(s.forceAutoRefresh, s.refreshCh) | |
| 352 | b.triggerCompletion(s.forceAutoRefresh, s.refreshCh) | |
| 353 | 353 | }: |
| 354 | 354 | case <-b.done: |
| 355 | 355 | } |
| 448 | 448 | } |
| 449 | 449 | } |
| 450 | 450 | |
| 451 | func (b *Bar) forceRefresh(force bool, refreshCh chan<- time.Time) { | |
| 452 | if force { | |
| 451 | func (b *Bar) triggerCompletion(autoRefresh bool, refreshCh chan<- time.Time) { | |
| 452 | if autoRefresh { | |
| 453 | 453 | go b.forceRefreshImpl(refreshCh) |
| 454 | 454 | } else { |
| 455 | 455 | b.cancel() |