diff --git a/doc/apk-fetch.8.scd b/doc/apk-fetch.8.scd index dd86ce4e9a8a92202eef24c7bbedaa7e75542767..7bbbc9075cbc2236b5ff26edf1b48224a1a209d3 100644 --- a/doc/apk-fetch.8.scd +++ b/doc/apk-fetch.8.scd @@ -17,6 +17,10 @@ specified. # OPTIONS +*--built-after* _TIMESPEC_ + Only fetch packages that have buildtime more recent than TIMESPEC. + TIMESPEC can be a "YYYY-MM-DD HH:MM:SS" date, or seconds since epoch. + *-L, --link* Create hard links if possible. diff --git a/src/app_fetch.c b/src/app_fetch.c index 54f3e474f31be158e4095f2c8d75f2e33c4995b9..1f05a80f318f33df9580b5dd40c541e2b8fc7914 100644 --- a/src/app_fetch.c +++ b/src/app_fetch.c @@ -29,6 +29,7 @@ struct fetch_ctx { unsigned int flags; int outdir_fd, errors; + time_t built_after; struct apk_database *db; struct apk_progress prog; size_t done, total; @@ -70,6 +71,7 @@ static int cup(void) } #define FETCH_OPTIONS(OPT) \ + OPT(OPT_FETCH_built_after, APK_OPT_ARG "built-after") \ OPT(OPT_FETCH_link, APK_OPT_SH("l") "link") \ OPT(OPT_FETCH_recursive, APK_OPT_SH("R") "recursive") \ OPT(OPT_FETCH_output, APK_OPT_ARG APK_OPT_SH("o") "output") \ @@ -80,11 +82,30 @@ static int cup(void) APK_OPT_APPLET(option_desc, FETCH_OPTIONS); +static time_t parse_time(const char *timestr) +{ + struct tm tm; + char *p; + time_t t; + + p = strptime(optarg, "%Y-%m-%d %H:%M:%S", &tm); + if (p && *p == 0) return mktime(&tm); + + t = strtoul(optarg, &p, 10); + if (p && *p == 0) return t; + + return 0; +} + static int option_parse_applet(void *ctx, struct apk_ctx *ac, int opt, const char *optarg) { struct fetch_ctx *fctx = (struct fetch_ctx *) ctx; switch (opt) { + case OPT_FETCH_built_after: + fctx->built_after = parse_time(optarg); + if (!fctx->built_after) return -EINVAL; + break; case OPT_FETCH_simulate: ac->flags |= APK_SIMULATE; break; @@ -207,6 +228,8 @@ static void mark_package(struct fetch_ctx *ctx, struct apk_package *pkg) { if (pkg == NULL || pkg->marked) return; + if (ctx->built_after && pkg->build_time && ctx->built_after >= pkg->build_time) + return; ctx->total += pkg->size; pkg->marked = 1; }