Sfoglia il codice sorgente

remove unused code

Bruce MacDonald 1 anno fa
parent
commit
00aaa05901
2 ha cambiato i file con 2 aggiunte e 19 eliminazioni
  1. 2 10
      server/images.go
  2. 0 9
      server/routes.go

+ 2 - 10
server/images.go

@@ -605,22 +605,14 @@ func PullModel(name, username, password string, fn func(api.ProgressResponse)) e
 	}
 
 	var layers []*Layer
-	var total int
-	var completed int
-	for _, layer := range manifest.Layers {
-		layers = append(layers, layer)
-		total += layer.Size
-	}
+	layers = append(layers, manifest.Layers...)
 	layers = append(layers, &manifest.Config)
-	total += manifest.Config.Size
 
 	for _, layer := range layers {
 		if err := downloadBlob(mp, layer.Digest, username, password, fn); err != nil {
 			fn(api.ProgressResponse{Status: fmt.Sprintf("error downloading: %v", err), Digest: layer.Digest})
 			return err
 		}
-
-		completed += layer.Size
 	}
 
 	fn(api.ProgressResponse{Status: "writing manifest"})
@@ -635,7 +627,7 @@ func PullModel(name, username, password string, fn func(api.ProgressResponse)) e
 		return err
 	}
 
-	err = os.WriteFile(fp, manifestJSON, 0644)
+	err = os.WriteFile(fp, manifestJSON, 0o644)
 	if err != nil {
 		log.Printf("couldn't write to %s", fp)
 		return err

+ 0 - 9
server/routes.go

@@ -18,15 +18,6 @@ import (
 	"github.com/jmorganca/ollama/llama"
 )
 
-func cacheDir() string {
-	home, err := os.UserHomeDir()
-	if err != nil {
-		panic(err)
-	}
-
-	return filepath.Join(home, ".ollama")
-}
-
 func generate(c *gin.Context) {
 	start := time.Now()