From 3b555efa916179e0cbd885d5a229151b67f761cc Mon Sep 17 00:00:00 2001 From: Jef Roosens Date: Thu, 7 Apr 2022 15:21:27 +0200 Subject: [PATCH] Renamed data_dir to repos_dir --- Dockerfile | 2 +- src/repo/repo.v | 16 ++++++++-------- src/repo/sync.v | 2 +- src/server/cli.v | 2 +- src/server/routes.v | 2 +- src/server/server.v | 2 +- vieter.toml | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8b62521..58087ad 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,7 +31,7 @@ RUN if [ -n "${CI_COMMIT_SHA}" ]; then \ FROM busybox:1.35.0 ENV PATH=/bin \ - VIETER_REPO_DIR=/data/repo \ + VIETER_REPOS_DIR=/data/repos \ VIETER_PKG_DIR=/data/pkgs \ VIETER_DOWNLOAD_DIR=/data/downloads \ VIETER_REPOS_FILE=/data/repos.json diff --git a/src/repo/repo.v b/src/repo/repo.v index 334c894..228b17e 100644 --- a/src/repo/repo.v +++ b/src/repo/repo.v @@ -11,7 +11,7 @@ mut: mutex shared util.Dummy pub: // Where to store repositories' files - data_dir string [required] + repos_dir string [required] // Where packages are stored; each architecture gets its own subdirectory pkg_dir string [required] // The default architecture to use for a repository. In reality, this value @@ -27,9 +27,9 @@ pub: } // new creates a new RepoGroupManager & creates the directories as needed -pub fn new(data_dir string, pkg_dir string, default_arch string) ?RepoGroupManager { - if !os.is_dir(data_dir) { - os.mkdir_all(data_dir) or { return error('Failed to create repo directory: $err.msg') } +pub fn new(repos_dir string, pkg_dir string, default_arch string) ?RepoGroupManager { + if !os.is_dir(repos_dir) { + os.mkdir_all(repos_dir) or { return error('Failed to create repos directory: $err.msg') } } if !os.is_dir(pkg_dir) { @@ -37,7 +37,7 @@ pub fn new(data_dir string, pkg_dir string, default_arch string) ?RepoGroupManag } return RepoGroupManager{ - data_dir: data_dir + repos_dir: repos_dir pkg_dir: pkg_dir default_arch: default_arch } @@ -83,7 +83,7 @@ fn (r &RepoGroupManager) add_pkg_in_repo(repo string, pkg &package.Pkg) ?bool { return r.add_pkg_in_arch_repo(repo, pkg.info.arch, pkg) } - repo_dir := os.join_path_single(r.data_dir, repo) + repo_dir := os.join_path_single(r.repos_dir, repo) mut arch_repos := []string{} @@ -118,7 +118,7 @@ fn (r &RepoGroupManager) add_pkg_in_repo(repo string, pkg &package.Pkg) ?bool { // changes. The function returns false if the package was already present in // the repo, and true otherwise. fn (r &RepoGroupManager) add_pkg_in_arch_repo(repo string, arch string, pkg &package.Pkg) ?bool { - pkg_dir := os.join_path(r.data_dir, repo, arch, '$pkg.info.name-$pkg.info.version') + pkg_dir := os.join_path(r.repos_dir, repo, arch, '$pkg.info.name-$pkg.info.version') // We can't add the same package twice if os.exists(pkg_dir) { @@ -150,7 +150,7 @@ fn (r &RepoGroupManager) add_pkg_in_arch_repo(repo string, arch string, pkg &pac // returns false if the package wasn't present in the database. It also // optionally re-syncs the repo archives. fn (r &RepoGroupManager) remove_pkg_from_arch_repo(repo string, arch string, pkg &package.Pkg, sync bool) ?bool { - repo_dir := os.join_path(r.data_dir, repo, arch) + repo_dir := os.join_path(r.repos_dir, repo, arch) // If the repository doesn't exist yet, the result is automatically false if !os.exists(repo_dir) { diff --git a/src/repo/sync.v b/src/repo/sync.v index afb8a4b..e2b7aac 100644 --- a/src/repo/sync.v +++ b/src/repo/sync.v @@ -31,7 +31,7 @@ fn archive_add_entry(archive &C.archive, entry &C.archive_entry, file_path &stri // Re-generate the repo archive files fn (r &RepoGroupManager) sync(repo string, arch string) ? { - subrepo_path := os.join_path(r.data_dir, repo, arch) + subrepo_path := os.join_path(r.repos_dir, repo, arch) lock r.mutex { a_db := C.archive_write_new() diff --git a/src/server/cli.v b/src/server/cli.v index b3f37e3..ae9e89c 100644 --- a/src/server/cli.v +++ b/src/server/cli.v @@ -10,7 +10,7 @@ pub: pkg_dir string download_dir string api_key string - data_dir string + repos_dir string repos_file string default_arch string } diff --git a/src/server/routes.v b/src/server/routes.v index 8c8cdff..a926425 100644 --- a/src/server/routes.v +++ b/src/server/routes.v @@ -23,7 +23,7 @@ fn (mut app App) get_repo_file(repo string, arch string, filename string) web.Re db_exts := ['.db', '.files', '.db.tar.gz', '.files.tar.gz'] if db_exts.any(filename.ends_with(it)) { - full_path = os.join_path(app.repo.data_dir, repo, arch, filename) + full_path = os.join_path(app.repo.repos_dir, repo, arch, filename) // repo-add does this using symlinks, but we just change the requested // path diff --git a/src/server/server.v b/src/server/server.v index f93a5ae..5bf9a87 100644 --- a/src/server/server.v +++ b/src/server/server.v @@ -44,7 +44,7 @@ pub fn server(conf Config) ? { } // This also creates the directories if needed - repo := repo.new(conf.data_dir, conf.pkg_dir, conf.default_arch) or { + repo := repo.new(conf.repos_dir, conf.pkg_dir, conf.default_arch) or { logger.error(err.msg) exit(1) } diff --git a/vieter.toml b/vieter.toml index 10b3855..8e0447b 100644 --- a/vieter.toml +++ b/vieter.toml @@ -1,7 +1,7 @@ # This file contains settings used during development api_key = "test" download_dir = "data/downloads" -data_dir = "data" +repos_dir = "data/repos" pkg_dir = "data/pkgs" log_level = "DEBUG" repos_file = "data/repos.json"