diff --git a/build.go b/build.go index 4ca76b4..d22d575 100644 --- a/build.go +++ b/build.go @@ -27,7 +27,7 @@ import ( "go.elara.ws/lure/internal/osutils" "go.elara.ws/lure/internal/types" "go.elara.ws/lure/pkg/build" - "go.elara.ws/lure/pkg/config" + "go.elara.ws/lure/internal/config" "go.elara.ws/lure/pkg/manager" "go.elara.ws/lure/pkg/repos" ) diff --git a/cmd/lure-api-server/main.go b/cmd/lure-api-server/main.go index 38828b7..10ea657 100644 --- a/cmd/lure-api-server/main.go +++ b/cmd/lure-api-server/main.go @@ -30,7 +30,6 @@ import ( "go.elara.ws/logger" "go.elara.ws/lure/cmd/lure-api-server/internal/api" "go.elara.ws/lure/internal/log" - "go.elara.ws/lure/pkg/config" "go.elara.ws/lure/pkg/repos" ) @@ -55,7 +54,7 @@ func main() { log.Logger = logger.NewMulti(log.Logger, logger.NewJSON(fl)) } - err := repos.Pull(ctx, config.Config().Repos) + err := repos.Pull(ctx, nil) if err != nil { log.Fatal("Error pulling repositories").Err(err).Send() } diff --git a/cmd/lure-api-server/webhook.go b/cmd/lure-api-server/webhook.go index 3faf5b5..63d0bc7 100644 --- a/cmd/lure-api-server/webhook.go +++ b/cmd/lure-api-server/webhook.go @@ -30,7 +30,6 @@ import ( "strings" "go.elara.ws/lure/internal/log" - "go.elara.ws/lure/pkg/config" "go.elara.ws/lure/pkg/repos" ) @@ -88,7 +87,7 @@ func repoPullWorker(ctx context.Context, sigCh <-chan struct{}) { for { select { case <-sigCh: - err := repos.Pull(ctx, config.Config().Repos) + err := repos.Pull(ctx, nil) if err != nil { log.Warn("Error while pulling repositories").Err(err).Send() } diff --git a/fix.go b/fix.go index 0de54ac..6701d4b 100644 --- a/fix.go +++ b/fix.go @@ -23,8 +23,8 @@ import ( "github.com/urfave/cli/v2" "go.elara.ws/lure/internal/log" - "go.elara.ws/lure/pkg/config" - "go.elara.ws/lure/pkg/db" + "go.elara.ws/lure/internal/config" + "go.elara.ws/lure/internal/db" "go.elara.ws/lure/pkg/repos" ) diff --git a/info.go b/info.go index ff331bc..3cddb19 100644 --- a/info.go +++ b/info.go @@ -27,7 +27,7 @@ import ( "github.com/urfave/cli/v2" "go.elara.ws/lure/internal/cliutils" "go.elara.ws/lure/internal/overrides" - "go.elara.ws/lure/pkg/config" + "go.elara.ws/lure/internal/config" "go.elara.ws/lure/pkg/distro" "go.elara.ws/lure/pkg/repos" "gopkg.in/yaml.v3" diff --git a/install.go b/install.go index f85dda2..c65f29b 100644 --- a/install.go +++ b/install.go @@ -26,8 +26,8 @@ import ( "go.elara.ws/lure/internal/log" "go.elara.ws/lure/internal/types" "go.elara.ws/lure/pkg/build" - "go.elara.ws/lure/pkg/config" - "go.elara.ws/lure/pkg/db" + "go.elara.ws/lure/internal/config" + "go.elara.ws/lure/internal/db" "go.elara.ws/lure/pkg/manager" "go.elara.ws/lure/pkg/repos" ) diff --git a/internal/cliutils/prompt.go b/internal/cliutils/prompt.go index 899d541..7f8406c 100644 --- a/internal/cliutils/prompt.go +++ b/internal/cliutils/prompt.go @@ -26,8 +26,8 @@ import ( "go.elara.ws/lure/internal/log" "go.elara.ws/lure/internal/pager" "go.elara.ws/lure/internal/translations" - "go.elara.ws/lure/pkg/config" - "go.elara.ws/lure/pkg/db" + "go.elara.ws/lure/internal/config" + "go.elara.ws/lure/internal/db" ) // YesNoPrompt asks the user a yes or no question, using def as the default answer diff --git a/pkg/config/config.go b/internal/config/config.go similarity index 100% rename from pkg/config/config.go rename to internal/config/config.go diff --git a/pkg/config/lang.go b/internal/config/lang.go similarity index 100% rename from pkg/config/lang.go rename to internal/config/lang.go diff --git a/pkg/config/paths.go b/internal/config/paths.go similarity index 100% rename from pkg/config/paths.go rename to internal/config/paths.go diff --git a/pkg/config/version.go b/internal/config/version.go similarity index 100% rename from pkg/config/version.go rename to internal/config/version.go diff --git a/pkg/db/db.go b/internal/db/db.go similarity index 99% rename from pkg/db/db.go rename to internal/db/db.go index 339516e..0575ac6 100644 --- a/pkg/db/db.go +++ b/internal/db/db.go @@ -27,7 +27,7 @@ import ( "github.com/jmoiron/sqlx" "go.elara.ws/lure/internal/log" - "go.elara.ws/lure/pkg/config" + "go.elara.ws/lure/internal/config" "golang.org/x/exp/slices" "modernc.org/sqlite" ) diff --git a/pkg/db/db_test.go b/internal/db/db_test.go similarity index 99% rename from pkg/db/db_test.go rename to internal/db/db_test.go index e8631ea..1a93282 100644 --- a/pkg/db/db_test.go +++ b/internal/db/db_test.go @@ -24,7 +24,7 @@ import ( "testing" "github.com/jmoiron/sqlx" - "go.elara.ws/lure/pkg/db" + "go.elara.ws/lure/internal/db" ) var testPkg = db.Package{ diff --git a/internal/dlcache/dlcache.go b/internal/dlcache/dlcache.go index 8fc6fd2..bc3cbfe 100644 --- a/internal/dlcache/dlcache.go +++ b/internal/dlcache/dlcache.go @@ -25,7 +25,7 @@ import ( "os" "path/filepath" - "go.elara.ws/lure/pkg/config" + "go.elara.ws/lure/internal/config" ) // BasePath returns the base path of the download cache diff --git a/internal/dlcache/dlcache_test.go b/internal/dlcache/dlcache_test.go index 257c1d4..4533f88 100644 --- a/internal/dlcache/dlcache_test.go +++ b/internal/dlcache/dlcache_test.go @@ -27,7 +27,7 @@ import ( "testing" "go.elara.ws/lure/internal/dlcache" - "go.elara.ws/lure/pkg/config" + "go.elara.ws/lure/internal/config" ) func init() { diff --git a/internal/overrides/overrides.go b/internal/overrides/overrides.go index 44351d6..1c23573 100644 --- a/internal/overrides/overrides.go +++ b/internal/overrides/overrides.go @@ -23,7 +23,7 @@ import ( "strings" "go.elara.ws/lure/internal/cpu" - "go.elara.ws/lure/pkg/db" + "go.elara.ws/lure/internal/db" "go.elara.ws/lure/pkg/distro" "golang.org/x/exp/slices" "golang.org/x/text/language" diff --git a/list.go b/list.go index 68da552..ccb6d8d 100644 --- a/list.go +++ b/list.go @@ -23,8 +23,8 @@ import ( "github.com/urfave/cli/v2" "go.elara.ws/lure/internal/log" - "go.elara.ws/lure/pkg/config" - "go.elara.ws/lure/pkg/db" + "go.elara.ws/lure/internal/config" + "go.elara.ws/lure/internal/db" "go.elara.ws/lure/pkg/manager" "go.elara.ws/lure/pkg/repos" "golang.org/x/exp/slices" diff --git a/main.go b/main.go index 0c998ea..44532f7 100644 --- a/main.go +++ b/main.go @@ -30,8 +30,8 @@ import ( "go.elara.ws/logger" "go.elara.ws/lure/internal/log" "go.elara.ws/lure/internal/translations" - "go.elara.ws/lure/pkg/config" - "go.elara.ws/lure/pkg/db" + "go.elara.ws/lure/internal/config" + "go.elara.ws/lure/internal/db" "go.elara.ws/lure/pkg/manager" ) diff --git a/pkg/build/build.go b/pkg/build/build.go index 6030c46..834eaa9 100644 --- a/pkg/build/build.go +++ b/pkg/build/build.go @@ -46,8 +46,8 @@ import ( "go.elara.ws/lure/internal/shutils/decoder" "go.elara.ws/lure/internal/shutils/helpers" "go.elara.ws/lure/internal/types" - "go.elara.ws/lure/pkg/config" - "go.elara.ws/lure/pkg/db" + "go.elara.ws/lure/internal/config" + "go.elara.ws/lure/internal/db" "go.elara.ws/lure/pkg/distro" "go.elara.ws/lure/pkg/manager" "go.elara.ws/lure/pkg/repos" diff --git a/pkg/build/install.go b/pkg/build/install.go index 8d10e49..b39762c 100644 --- a/pkg/build/install.go +++ b/pkg/build/install.go @@ -24,8 +24,8 @@ import ( "go.elara.ws/lure/internal/log" "go.elara.ws/lure/internal/types" - "go.elara.ws/lure/pkg/config" - "go.elara.ws/lure/pkg/db" + "go.elara.ws/lure/internal/config" + "go.elara.ws/lure/internal/db" ) // InstallPkgs installs native packages via the package manager, diff --git a/pkg/repos/find.go b/pkg/repos/find.go index b0be320..c97c748 100644 --- a/pkg/repos/find.go +++ b/pkg/repos/find.go @@ -18,7 +18,7 @@ package repos -import "go.elara.ws/lure/pkg/db" +import "go.elara.ws/lure/internal/db" // FindPkgs looks for packages matching the inputs inside the database. // It returns a map that maps the package name input to any packages found for it. diff --git a/pkg/repos/find_test.go b/pkg/repos/find_test.go index 6ab8ac4..22460db 100644 --- a/pkg/repos/find_test.go +++ b/pkg/repos/find_test.go @@ -25,7 +25,7 @@ import ( "testing" "go.elara.ws/lure/internal/types" - "go.elara.ws/lure/pkg/db" + "go.elara.ws/lure/internal/db" "go.elara.ws/lure/pkg/repos" ) diff --git a/pkg/repos/pull.go b/pkg/repos/pull.go index 96175c1..0d5e888 100644 --- a/pkg/repos/pull.go +++ b/pkg/repos/pull.go @@ -34,12 +34,12 @@ import ( "github.com/go-git/go-git/v5/plumbing" "github.com/go-git/go-git/v5/plumbing/format/diff" "github.com/pelletier/go-toml/v2" + "go.elara.ws/lure/internal/config" + "go.elara.ws/lure/internal/db" "go.elara.ws/lure/internal/log" "go.elara.ws/lure/internal/shutils" "go.elara.ws/lure/internal/shutils/decoder" "go.elara.ws/lure/internal/types" - "go.elara.ws/lure/pkg/config" - "go.elara.ws/lure/pkg/db" "go.elara.ws/lure/pkg/distro" "go.elara.ws/vercmp" "mvdan.cc/sh/v3/expand" @@ -50,7 +50,12 @@ import ( // Pull pulls the provided repositories. If a repo doesn't exist, it will be cloned // and its packages will be written to the DB. If it does exist, it will be pulled. // In this case, only changed packages will be processed if possible. +// If repos is set to nil, the repos in the LURE config will be used. func Pull(ctx context.Context, repos []types.Repo) error { + if repos == nil { + repos = config.Config().Repos + } + for _, repo := range repos { repoURL, err := url.Parse(repo.URL) if err != nil { diff --git a/pkg/repos/pull_test.go b/pkg/repos/pull_test.go index 54cf915..111c417 100644 --- a/pkg/repos/pull_test.go +++ b/pkg/repos/pull_test.go @@ -25,8 +25,8 @@ import ( "testing" "go.elara.ws/lure/internal/types" - "go.elara.ws/lure/pkg/config" - "go.elara.ws/lure/pkg/db" + "go.elara.ws/lure/internal/config" + "go.elara.ws/lure/internal/db" "go.elara.ws/lure/pkg/repos" ) diff --git a/pkg/search/search.go b/pkg/search/search.go index d9d48d3..5db3ca4 100644 --- a/pkg/search/search.go +++ b/pkg/search/search.go @@ -9,8 +9,8 @@ import ( "strconv" "strings" - "go.elara.ws/lure/pkg/config" - "go.elara.ws/lure/pkg/db" + "go.elara.ws/lure/internal/config" + "go.elara.ws/lure/internal/db" ) // Filter represents search filters. diff --git a/repo.go b/repo.go index c37afd7..5beacbd 100644 --- a/repo.go +++ b/repo.go @@ -26,8 +26,8 @@ import ( "github.com/urfave/cli/v2" "go.elara.ws/lure/internal/log" "go.elara.ws/lure/internal/types" - "go.elara.ws/lure/pkg/config" - "go.elara.ws/lure/pkg/db" + "go.elara.ws/lure/internal/config" + "go.elara.ws/lure/internal/db" "go.elara.ws/lure/pkg/repos" "golang.org/x/exp/slices" ) diff --git a/upgrade.go b/upgrade.go index dd16009..41dd829 100644 --- a/upgrade.go +++ b/upgrade.go @@ -26,8 +26,8 @@ import ( "go.elara.ws/lure/internal/log" "go.elara.ws/lure/internal/types" "go.elara.ws/lure/pkg/build" - "go.elara.ws/lure/pkg/config" - "go.elara.ws/lure/pkg/db" + "go.elara.ws/lure/internal/config" + "go.elara.ws/lure/internal/db" "go.elara.ws/lure/pkg/distro" "go.elara.ws/lure/pkg/manager" "go.elara.ws/lure/pkg/repos"