feat(config): print durations and URLs with human values
Alan Pearce alan@alanpearce.eu
Mon, 20 May 2024 18:13:07 +0200
8 files changed, 33 insertions(+), 41 deletions(-)
M defaults.toml → defaults.toml
@@ -4,6 +4,7 @@ [Web] ListenAddress = 'localhost' Port = 3000 +BaseURL = 'http://localhost:3000' SentryDSN = '' Environment = 'development' ExtraHeadHTML = '' @@ -41,22 +42,11 @@ trusted-types = [] upgrade-insecure-requests = false worker-src = [] -[Web.BaseURL] -Scheme = 'http' -Opaque = '' -Host = 'localhost:3000' -Path = '' -RawPath = '' -OmitHost = false -ForceQuery = false -RawQuery = '' -Fragment = '' -RawFragment = '' - [Web.Headers] x-content-type-options = 'nosniff' [Importer] +Timeout = '30m0s' UpdateAt = 04:00:00 [Importer.Sources] @@ -70,8 +60,8 @@ Channel = 'darwin' URL = 'https://github.com/LnL7/nix-darwin/archive/master.tar.gz' Attribute = 'options' ImportPath = 'release.nix' -FetchTimeout = 300000000000 -ImportTimeout = 900000000000 +FetchTimeout = '5m0s' +ImportTimeout = '15m0s' OutputPath = 'share/doc/darwin' [Importer.Sources.darwin.Repo] @@ -90,8 +80,8 @@ Channel = 'home-manager' URL = 'https://github.com/nix-community/home-manager/archive/master.tar.gz' Attribute = 'docs.json' ImportPath = 'default.nix' -FetchTimeout = 300000000000 -ImportTimeout = 900000000000 +FetchTimeout = '5m0s' +ImportTimeout = '15m0s' OutputPath = 'share/doc/home-manager' [Importer.Sources.home-manager.Repo] @@ -110,8 +100,8 @@ Channel = 'nixpkgs' URL = 'https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz' Attribute = 'options' ImportPath = 'nixos/release.nix' -FetchTimeout = 300000000000 -ImportTimeout = 900000000000 +FetchTimeout = '5m0s' +ImportTimeout = '15m0s' OutputPath = 'share/doc/nixos' [Importer.Sources.nixos.Repo] @@ -130,8 +120,8 @@ Channel = 'nixos-unstable' URL = '' Attribute = '' ImportPath = '' -FetchTimeout = 300000000000 -ImportTimeout = 900000000000 +FetchTimeout = '5m0s' +ImportTimeout = '15m0s' OutputPath = 'packages.json.br' [Importer.Sources.nixpkgs.Repo] @@ -139,5 +129,3 @@ Type = 'github' Owner = 'NixOS' Repo = 'nixpkgs' Revision = '' - -[Importer.Timeout]
M internal/config/config.go → internal/config/config.go
@@ -21,6 +21,10 @@ type URL struct { *url.URL } +func (u *URL) MarshalText() ([]byte, error) { + return []byte(u.URL.String()), nil +} + func (u *URL) UnmarshalText(text []byte) (err error) { u.URL, err = url.Parse(string(text)) @@ -33,6 +37,10 @@ } type Duration struct { time.Duration +} + +func (d *Duration) MarshalText() ([]byte, error) { + return []byte(d.Duration.String()), nil } func (d *Duration) UnmarshalText(text []byte) (err error) { @@ -122,8 +130,8 @@ URL: "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz", ImportPath: "nixos/release.nix", Attribute: "options", OutputPath: "share/doc/nixos", - FetchTimeout: 5 * time.Minute, - ImportTimeout: 15 * time.Minute, + FetchTimeout: Duration{5 * time.Minute}, + ImportTimeout: Duration{15 * time.Minute}, Repo: nixpkgs, }, "darwin": { @@ -137,8 +145,8 @@ URL: "https://github.com/LnL7/nix-darwin/archive/master.tar.gz", ImportPath: "release.nix", Attribute: "options", OutputPath: "share/doc/darwin", - FetchTimeout: 5 * time.Minute, - ImportTimeout: 15 * time.Minute, + FetchTimeout: Duration{5 * time.Minute}, + ImportTimeout: Duration{15 * time.Minute}, Repo: Repository{ Type: "github", Owner: "LnL7", @@ -156,8 +164,8 @@ Fetcher: Channel, ImportPath: "default.nix", Attribute: "docs.json", OutputPath: "share/doc/home-manager", - FetchTimeout: 5 * time.Minute, - ImportTimeout: 15 * time.Minute, + FetchTimeout: Duration{5 * time.Minute}, + ImportTimeout: Duration{15 * time.Minute}, Repo: Repository{ Type: "github", Owner: "nix-community", @@ -172,8 +180,8 @@ Importer: Packages, Fetcher: ChannelNixpkgs, Channel: "nixos-unstable", OutputPath: "packages.json.br", - FetchTimeout: 5 * time.Minute, - ImportTimeout: 15 * time.Minute, + FetchTimeout: Duration{5 * time.Minute}, + ImportTimeout: Duration{15 * time.Minute}, Repo: nixpkgs, }, },
M internal/config/source.go → internal/config/source.go
@@ -1,9 +1,5 @@ package config -import ( - "time" -) - type Source struct { Name string Key string @@ -14,8 +10,8 @@ Channel string URL string Attribute string ImportPath string - FetchTimeout time.Duration - ImportTimeout time.Duration + FetchTimeout Duration + ImportTimeout Duration OutputPath string Repo Repository }
M internal/fetcher/channel.go → internal/fetcher/channel.go
@@ -25,7 +25,7 @@ func (i *ChannelFetcher) FetchIfNeeded( parent context.Context, ) (f FetchedFiles, updated bool, err error) { - ctx, cancel := context.WithTimeout(parent, i.Source.FetchTimeout) + ctx, cancel := context.WithTimeout(parent, i.Source.FetchTimeout.Duration) defer cancel() dest := i.DataPath
M internal/fetcher/download.go → internal/fetcher/download.go
@@ -26,7 +26,7 @@ func (i *DownloadFetcher) FetchIfNeeded( parent context.Context, ) (f FetchedFiles, updated bool, err error) { - ctx, cancel := context.WithTimeout(parent, i.Source.FetchTimeout) + ctx, cancel := context.WithTimeout(parent, i.Source.FetchTimeout.Duration) defer cancel() root := i.DataPath
M internal/fetcher/nixpkgs-channel.go → internal/fetcher/nixpkgs-channel.go
@@ -32,7 +32,7 @@ func (i *NixpkgsChannelFetcher) FetchIfNeeded( parent context.Context, ) (f FetchedFiles, updated bool, err error) { - ctx, cancel := context.WithTimeout(parent, i.Source.FetchTimeout) + ctx, cancel := context.WithTimeout(parent, i.Source.FetchTimeout.Duration) defer cancel() root := i.DataPath
M internal/importer/options.go → internal/importer/options.go
@@ -88,7 +88,7 @@ return &i, nil } func (i *OptionIngester) Process(parent context.Context) (<-chan nix.Importable, <-chan error) { - ctx, cancel := context.WithTimeout(parent, i.source.ImportTimeout) + ctx, cancel := context.WithTimeout(parent, i.source.ImportTimeout.Duration) results := make(chan nix.Importable) errs := make(chan error)
M internal/importer/package.go → internal/importer/package.go
@@ -105,7 +105,7 @@ return l } func (i *PackageIngester) Process(parent context.Context) (<-chan nix.Importable, <-chan error) { - ctx, cancel := context.WithTimeout(parent, i.source.ImportTimeout) + ctx, cancel := context.WithTimeout(parent, i.source.ImportTimeout.Duration) results := make(chan nix.Importable) errs := make(chan error)