Commit d436d51c authored by Bruce MacDonald's avatar Bruce MacDonald Committed by Jeffrey Morgan
Browse files

clean up model pull

parent 350aec77
...@@ -35,7 +35,6 @@ func pull(model string, progressCh chan<- api.PullProgress) error { ...@@ -35,7 +35,6 @@ func pull(model string, progressCh chan<- api.PullProgress) error {
if err != nil { if err != nil {
return fmt.Errorf("failed to pull model: %w", err) return fmt.Errorf("failed to pull model: %w", err)
} }
return saveModel(remote, progressCh) return saveModel(remote, progressCh)
} }
...@@ -76,7 +75,7 @@ func saveModel(model *Model, progressCh chan<- api.PullProgress) error { ...@@ -76,7 +75,7 @@ func saveModel(model *Model, progressCh chan<- api.PullProgress) error {
client := &http.Client{} client := &http.Client{}
req, err := http.NewRequest("GET", model.URL, nil) req, err := http.NewRequest("GET", model.URL, nil)
if err != nil { if err != nil {
panic(err) return fmt.Errorf("failed to download model: %w", err)
} }
// check for resume // check for resume
alreadyDownloaded := 0 alreadyDownloaded := 0
...@@ -126,19 +125,15 @@ func saveModel(model *Model, progressCh chan<- api.PullProgress) error { ...@@ -126,19 +125,15 @@ func saveModel(model *Model, progressCh chan<- api.PullProgress) error {
for { for {
n, err := resp.Body.Read(buf) n, err := resp.Body.Read(buf)
if err != nil && err != io.EOF { if err != nil && err != io.EOF {
return err return err
} }
if n == 0 { if n == 0 {
break break
} }
if _, err := out.Write(buf[:n]); err != nil { if _, err := out.Write(buf[:n]); err != nil {
return err return err
} }
totalBytes += n totalBytes += n
// send progress updates // send progress updates
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment