Bläddra i källkod

add .golangci.yaml

Michael Yang 1 år sedan
förälder
incheckning
acfc376efd
7 ändrade filer med 37 tillägg och 10 borttagningar
  1. 27 0
      .golangci.yaml
  2. 2 2
      readline/history.go
  3. 3 3
      server/download.go
  4. 2 2
      server/manifests.go
  5. 2 1
      server/routes.go
  6. 0 1
      server/routes_test.go
  7. 1 1
      server/upload.go

+ 27 - 0
.golangci.yaml

@@ -0,0 +1,27 @@
+run:
+  timeout: 5m
+linters:
+  enable:
+    - asasalint
+    - bidichk
+    - bodyclose
+    - containedctx
+    - contextcheck
+    - exportloopref
+    - gocheckcompilerdirectives
+    # FIXME: for some reason this errors on windows
+    # - gofmt
+    # - goimports
+    - misspell
+    - nilerr
+    - unused
+linters-settings:
+  errcheck:
+    # exclude the following functions since we don't generally
+    # need to be concerned with the returned errors
+    exclude-functions:
+      - encoding/binary.Read
+      - (*os.File).Seek
+      - (*bufio.Writer).WriteString
+      - (*github.com/spf13/pflag.FlagSet).Set
+      - (*github.com/jmorganca/ollama/llm.readSeekOffset).Seek

+ 2 - 2
readline/history.go

@@ -49,7 +49,7 @@ func (h *History) Init() error {
 
 
 	h.Filename = path
 	h.Filename = path
 
 
-	f, err := os.OpenFile(path, os.O_CREATE|os.O_RDONLY, 0600)
+	f, err := os.OpenFile(path, os.O_CREATE|os.O_RDONLY, 0o600)
 	if err != nil {
 	if err != nil {
 		if errors.Is(err, os.ErrNotExist) {
 		if errors.Is(err, os.ErrNotExist) {
 			return nil
 			return nil
@@ -132,7 +132,7 @@ func (h *History) Save() error {
 
 
 	tmpFile := h.Filename + ".tmp"
 	tmpFile := h.Filename + ".tmp"
 
 
-	f, err := os.OpenFile(tmpFile, os.O_CREATE|os.O_WRONLY|os.O_TRUNC|os.O_APPEND, 0666)
+	f, err := os.OpenFile(tmpFile, os.O_CREATE|os.O_WRONLY|os.O_TRUNC|os.O_APPEND, 0o666)
 	if err != nil {
 	if err != nil {
 		return err
 		return err
 	}
 	}

+ 3 - 3
server/download.go

@@ -98,7 +98,7 @@ func (b *blobDownload) Prepare(ctx context.Context, requestURL *url.URL, opts *R
 
 
 		b.Total, _ = strconv.ParseInt(resp.Header.Get("Content-Length"), 10, 64)
 		b.Total, _ = strconv.ParseInt(resp.Header.Get("Content-Length"), 10, 64)
 
 
-		var size = b.Total / numDownloadParts
+		size := b.Total / numDownloadParts
 		switch {
 		switch {
 		case size < minDownloadPartSize:
 		case size < minDownloadPartSize:
 			size = minDownloadPartSize
 			size = minDownloadPartSize
@@ -132,7 +132,7 @@ func (b *blobDownload) run(ctx context.Context, requestURL *url.URL, opts *Regis
 	defer blobDownloadManager.Delete(b.Digest)
 	defer blobDownloadManager.Delete(b.Digest)
 	ctx, b.CancelFunc = context.WithCancel(ctx)
 	ctx, b.CancelFunc = context.WithCancel(ctx)
 
 
-	file, err := os.OpenFile(b.Name+"-partial", os.O_CREATE|os.O_RDWR, 0644)
+	file, err := os.OpenFile(b.Name+"-partial", os.O_CREATE|os.O_RDWR, 0o644)
 	if err != nil {
 	if err != nil {
 		return err
 		return err
 	}
 	}
@@ -246,7 +246,7 @@ func (b *blobDownload) readPart(partName string) (*blobDownloadPart, error) {
 }
 }
 
 
 func (b *blobDownload) writePart(partName string, part *blobDownloadPart) error {
 func (b *blobDownload) writePart(partName string, part *blobDownloadPart) error {
-	partFile, err := os.OpenFile(partName, os.O_CREATE|os.O_RDWR|os.O_TRUNC, 0644)
+	partFile, err := os.OpenFile(partName, os.O_CREATE|os.O_RDWR|os.O_TRUNC, 0o644)
 	if err != nil {
 	if err != nil {
 		return err
 		return err
 	}
 	}

+ 2 - 2
server/manifests.go

@@ -26,9 +26,9 @@ func WriteManifest(name string, config *Layer, layers []*Layer) error {
 		return err
 		return err
 	}
 	}
 
 
-	if err := os.MkdirAll(filepath.Dir(manifestPath), 0755); err != nil {
+	if err := os.MkdirAll(filepath.Dir(manifestPath), 0o755); err != nil {
 		return err
 		return err
 	}
 	}
 
 
-	return os.WriteFile(manifestPath, b.Bytes(), 0644)
+	return os.WriteFile(manifestPath, b.Bytes(), 0o644)
 }
 }

+ 2 - 1
server/routes.go

@@ -198,7 +198,8 @@ func GenerateHandler(c *gin.Context) {
 		c.JSON(http.StatusOK, api.GenerateResponse{
 		c.JSON(http.StatusOK, api.GenerateResponse{
 			CreatedAt: time.Now().UTC(),
 			CreatedAt: time.Now().UTC(),
 			Model:     req.Model,
 			Model:     req.Model,
-			Done:      true})
+			Done:      true,
+		})
 		return
 		return
 	}
 	}
 
 

+ 0 - 1
server/routes_test.go

@@ -201,5 +201,4 @@ func Test_Routes(t *testing.T) {
 		}
 		}
 
 
 	}
 	}
-
 }
 }

+ 1 - 1
server/upload.go

@@ -88,7 +88,7 @@ func (b *blobUpload) Prepare(ctx context.Context, requestURL *url.URL, opts *Reg
 		return nil
 		return nil
 	}
 	}
 
 
-	var size = b.Total / numUploadParts
+	size := b.Total / numUploadParts
 	switch {
 	switch {
 	case size < minUploadPartSize:
 	case size < minUploadPartSize:
 		size = minUploadPartSize
 		size = minUploadPartSize