alois31/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

cleanup lookupFileArg

Browse source 
Change-Id: I2acd56e7a542b12138f43c95af78fdd50e944619
This commit is contained in:
Qyriad 2024-05-20 13:51:42 -06:00
parent 3a597f1d0b
commit a0dcfbb084
1 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/libcmd/common-eval-args.cc
View file

@ -164,28 +164,30 @@ Bindings * MixEvalArgs::getAutoArgs(EvalState & state)
return res.finish(); return res.finish();
} }
SourcePath lookupFileArg(EvalState & state, std::string_view s) SourcePath lookupFileArg(EvalState & state, std::string_view fileArg)
{ {
if (EvalSettings::isPseudoUrl(s)) { if (EvalSettings::isPseudoUrl(fileArg)) {
auto storePath = fetchers::downloadTarball( auto const url = EvalSettings::resolvePseudoUrl(fileArg);
state.store, EvalSettings::resolvePseudoUrl(s), "source", false).tree.storePath; auto const downloaded = fetchers::downloadTarball(
state.store,
url,
/* name */ "source",
/* locked */ false
);
StorePath const storePath = downloaded.tree.storePath;
return state.rootPath(CanonPath(state.store->toRealPath(storePath))); return state.rootPath(CanonPath(state.store->toRealPath(storePath)));
} } else if (fileArg.starts_with("flake:")) {
else if (s.starts_with("flake:")) {
experimentalFeatureSettings.require(Xp::Flakes); experimentalFeatureSettings.require(Xp::Flakes);
auto flakeRef = parseFlakeRef(std::string(s.substr(6)), {}, true, false); static constexpr size_t FLAKE_LEN = std::string_view("flake:").size();
auto flakeRef = parseFlakeRef(std::string(fileArg.substr(FLAKE_LEN)), {}, true, false);
auto storePath = flakeRef.resolve(state.store).fetchTree(state.store).first.storePath; auto storePath = flakeRef.resolve(state.store).fetchTree(state.store).first.storePath;
return state.rootPath(CanonPath(state.store->toRealPath(storePath))); return state.rootPath(CanonPath(state.store->toRealPath(storePath)));
} } else if (fileArg.size() > 2 && fileArg.at(0) == '<' && fileArg.at(fileArg.size() - 1) == '>') {
Path p(fileArg.substr(1, fileArg.size() - 2));
else if (s.size() > 2 && s.at(0) == '<' && s.at(s.size() - 1) == '>') {
Path p(s.substr(1, s.size() - 2));
return state.findFile(p); return state.findFile(p);
} else {
return state.rootPath(CanonPath::fromCwd(fileArg));
} }
else
return state.rootPath(CanonPath::fromCwd(s));
} }
} }