From 3b379a13710cae2adc56131af1069e6fb92976b8 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Thu, 9 May 2024 18:58:14 +0200 Subject: style: reformat with golines and enforce on commit --- default.nix | 8 ++++++++ internal/importer/channel.go | 16 ++++++++++++++-- internal/importer/http.go | 6 +++++- internal/importer/importer.go | 12 ++++++++++-- internal/importer/nixpkgs-channel.go | 5 ++++- internal/search/search.go | 13 +++++++++++-- internal/server/server.go | 5 ++++- justfile | 2 ++ 8 files changed, 58 insertions(+), 9 deletions(-) diff --git a/default.nix b/default.nix index 10f7ac7..3de02f2 100644 --- a/default.nix +++ b/default.nix @@ -61,6 +61,14 @@ in yamllint = { enable = true; }; + golines = { + enable = true; + name = "golines"; + description = "A golang formatter that fixes long lines"; + types_or = [ "go" ]; + entry = "${pkgs.golines}/bin/golines --write-output"; + pass_filenames = true; + }; go-mod-tidy = { enable = true; name = "go-mod-tidy"; diff --git a/internal/importer/channel.go b/internal/importer/channel.go index 4d051cc..b75839b 100644 --- a/internal/importer/channel.go +++ b/internal/importer/channel.go @@ -55,10 +55,22 @@ func (i *ChannelImporter) FetchIfNeeded(parent context.Context) (bool, error) { i.Logger.Debug("nix-build", "output", strings.TrimSpace(string(out))) outPath := path.Join(dest, i.Source.OutputPath) - i.Logger.Debug("checking output path", "outputPath", outPath, "dest", dest, "source", i.Source.OutputPath) + i.Logger.Debug( + "checking output path", + "outputPath", + outPath, + "dest", + dest, + "source", + i.Source.OutputPath, + ) after, err := os.Readlink(dest) if err := file.NeedNotExist(err); err != nil { - return false, errors.WithMessagef(err, "failed to stat output file from nix-build, filename: %s", outPath) + return false, errors.WithMessagef( + err, + "failed to stat output file from nix-build, filename: %s", + outPath, + ) } i.Logger.Debug("stat after", "name", after) diff --git a/internal/importer/http.go b/internal/importer/http.go index 1bf2428..6d60c44 100644 --- a/internal/importer/http.go +++ b/internal/importer/http.go @@ -44,7 +44,11 @@ func fetchFileIfNeeded(ctx context.Context, path string, url string) (needed boo case http.StatusOK: newMtime, err := time.Parse(time.RFC1123, res.Header.Get("Last-Modified")) if err != nil { - slog.Warn("could not parse Last-Modified header from response", "value", res.Header.Get("Last-Modified")) + slog.Warn( + "could not parse Last-Modified header from response", + "value", + res.Header.Get("Last-Modified"), + ) } err = file.WriteToFile(path, res.Body) if err != nil { diff --git a/internal/importer/importer.go b/internal/importer/importer.go index 2318fe4..4d563fd 100644 --- a/internal/importer/importer.go +++ b/internal/importer/importer.go @@ -27,7 +27,11 @@ type Importer interface { Import(context.Context, *search.WriteIndex) (bool, error) } -func NewNixpkgsChannelImporter(source Source, dataPath string, logger *slog.Logger) *NixpkgsChannelImporter { +func NewNixpkgsChannelImporter( + source Source, + dataPath string, + logger *slog.Logger, +) *NixpkgsChannelImporter { indexPath := dataPath fullpath := path.Join(dataPath, source.Channel) @@ -58,7 +62,11 @@ type importConfig struct { Logger *slog.Logger } -func processOptions(parent context.Context, indexer *search.WriteIndex, conf *importConfig) (bool, error) { +func processOptions( + parent context.Context, + indexer *search.WriteIndex, + conf *importConfig, +) (bool, error) { ctx, cancel := context.WithTimeout(parent, conf.Source.ImportTimeout) defer cancel() diff --git a/internal/importer/nixpkgs-channel.go b/internal/importer/nixpkgs-channel.go index 0e5be62..e237246 100644 --- a/internal/importer/nixpkgs-channel.go +++ b/internal/importer/nixpkgs-channel.go @@ -63,7 +63,10 @@ func (i *NixpkgsChannelImporter) FetchIfNeeded(parent context.Context) (bool, er return true, nil } -func (i *NixpkgsChannelImporter) Import(parent context.Context, indexer *search.WriteIndex) (bool, error) { +func (i *NixpkgsChannelImporter) Import( + parent context.Context, + indexer *search.WriteIndex, +) (bool, error) { filename := path.Join(i.DataPath, filesToFetch["options"]) revFilename := path.Join(i.DataPath, filesToFetch["revision"]) bits, err := os.ReadFile(revFilename) diff --git a/internal/search/search.go b/internal/search/search.go index 9766294..bc77cea 100644 --- a/internal/search/search.go +++ b/internal/search/search.go @@ -50,14 +50,23 @@ func (index *ReadIndex) GetSource(ctx context.Context, name string) (*bleve.Sear return nil, ctx.Err() default: if err != nil { - return nil, errors.WithMessagef(err, "failed to execute search to find source %s in index", name) + return nil, errors.WithMessagef( + err, + "failed to execute search to find source %s in index", + name, + ) } } return result, nil } -func (index *ReadIndex) Search(ctx context.Context, source string, keyword string, from uint64) (*Result, error) { +func (index *ReadIndex) Search( + ctx context.Context, + source string, + keyword string, + from uint64, +) (*Result, error) { sourceQuery := bleve.NewTermQuery(source) userQuery := bleve.NewMatchQuery(keyword) userQuery.Analyzer = "option_name" diff --git a/internal/server/server.go b/internal/server/server.go index 8252b8e..7ff174a 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -245,7 +245,10 @@ func New(runtimeConfig *Config) (*Server, error) { } }) - mux.Handle("/static/", http.StripPrefix("/static/", http.FileServer(http.Dir("frontend/static")))) + mux.Handle( + "/static/", + http.StripPrefix("/static/", http.FileServer(http.Dir("frontend/static"))), + ) if runtimeConfig.LiveReload { applyDevModeOverrides(config) diff --git a/justfile b/justfile index 78bea08..6f75d1b 100644 --- a/justfile +++ b/justfile @@ -7,10 +7,12 @@ prepare: checkformat: gofmt -d . goimports -d . + golines --dry-run . format: gofmt -w . goimports -w . + golines -w . fix: go fix . -- cgit 1.4.1