diff --git a/.woodpecker/.builder.yml b/.woodpecker/.builder.yml index 55d83d5c..e94a8463 100644 --- a/.woodpecker/.builder.yml +++ b/.woodpecker/.builder.yml @@ -13,5 +13,6 @@ pipeline: when: event: push path: + - Makefile - Dockerfile.builder - patches/* diff --git a/Makefile b/Makefile index c363c8a8..8674ca0b 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ SRC_DIR := src SOURCES != find '$(SRC_DIR)' -iname '*.v' -V_RELEASE := weekly.2022.04 +V_RELEASE := weekly.2022.05 V_PATH ?= v-$(V_RELEASE)/v V := $(V_PATH) -showcc @@ -70,4 +70,4 @@ v-$(V_RELEASE)/v: make -C 'v-$(V_RELEASE)' clean: - rm -rf '$(LARCHIVE_DIR)' 'data' 'vieter' 'dvieter' 'pvieter' 'vieter.c' 'v-$(V_RELEASE)' + rm -rf 'data' 'vieter' 'dvieter' 'pvieter' 'vieter.c' 'v-$(V_RELEASE)' diff --git a/src/repo/sync.v b/src/repo/sync.v index 0bb55457..d6080e07 100644 --- a/src/repo/sync.v +++ b/src/repo/sync.v @@ -44,9 +44,8 @@ fn (r &Repo) sync() ? { C.archive_write_add_filter_gzip(a_files) C.archive_write_set_format_pax_restricted(a_files) - // TODO add symlink to .tar.gz version - db_path := os.join_path_single(r.repo_dir, 'repo.db') - files_path := os.join_path_single(r.repo_dir, 'repo.files') + db_path := os.join_path_single(r.repo_dir, 'vieter.db.tar.gz') + files_path := os.join_path_single(r.repo_dir, 'vieter.files.tar.gz') C.archive_write_open_filename(a_db, &char(db_path.str)) C.archive_write_open_filename(a_files, &char(files_path.str)) diff --git a/src/routes.v b/src/routes.v index 5dfd34e2..45e7fa55 100644 --- a/src/routes.v +++ b/src/routes.v @@ -27,7 +27,7 @@ fn is_pkg_name(s string) bool { ['/health'; get] pub fn (mut app App) healthcheck() web.Result { - return app.text('Healthy') + return app.text('Healthy') } // get_root handles a GET request for a file on the root @@ -35,10 +35,12 @@ pub fn (mut app App) healthcheck() web.Result { fn (mut app App) get_root(filename string) web.Result { mut full_path := '' - if is_pkg_name(filename) { - full_path = os.join_path_single(app.repo.pkg_dir, filename) + if filename.ends_with('.db') || filename.ends_with('.files') { + full_path = os.join_path_single(app.repo.repo_dir, '${filename}.tar.gz') + } else if filename.ends_with('.db.tar.gz') || filename.ends_with('.files.tar.gz') { + full_path = os.join_path_single(app.repo.repo_dir, '$filename') } else { - full_path = os.join_path_single(app.repo.repo_dir, filename) + full_path = os.join_path_single(app.repo.pkg_dir, filename) } return app.file(full_path) diff --git a/src/web/web.v b/src/web/web.v index 2db8f18b..bbb909f4 100644 --- a/src/web/web.v +++ b/src/web/web.v @@ -262,7 +262,6 @@ pub fn (mut ctx Context) file(f_path string) Result { if ctx.done { return Result{} } - ctx.done = true if !os.is_file(f_path) { return ctx.not_found()