mirror of
https://github.com/privatevoid-net/nix-super.git
synced 2024-11-27 08:16:14 +02:00
bc23a44c54
Already, we had classes like `BuiltPathsCommand` and `StorePathsCommand`
which provided alternative `run` virtual functions providing the
implementation with more arguments. This was a very nice and easy way to
make writing command; just fill in the virtual functions and it is
fairly clear what to do.
However, exception to this pattern were `Installable{,s}Command`. These
two classes instead just had a field where the installables would be
stored, and various side-effecting `prepare` and `load` machinery too
fill them in. Command would wish out those fields.
This isn't so clear to use.
What this commit does is make those command classes like the others,
with richer `run` functions.
Not only does this restore the pattern making commands easier to write,
it has a number of other benefits:
- `prepare` and `load` are gone entirely! One command just hands just
hands off to the next.
- `useDefaultInstallables` because `defaultInstallables`. This takes
over `prepare` for the one case that needs it, and provides enough
flexiblity to handle `nix repl`'s idiosyncratic migration.
- We can use `ref` instead of `std::shared_ptr`. The former must be
initialized (so it is like Rust's `Box` rather than `Option<Box>`,
This expresses the invariant that the installable are in fact
initialized much better.
This is possible because since we just have local variables not
fields, we can stop worrying about the not-yet-initialized case.
- Fewer lines of code! (Finally I have a large refactor that makes the
number go down not up...)
- `nix repl` is now implemented in a clearer way.
The last item deserves further mention. `nix repl` is not like the other
installable commands because instead working from once-loaded
installables, it needs to be able to load them again and again.
To properly support this, we make a new superclass
`RawInstallablesCommand`. This class has the argument parsing and
completion logic, but does *not* hand off parsed installables but
instead just the raw string arguments.
This is exactly what `nix repl` needs, and allows us to instead of
having the logic awkwardly split between `prepare`,
`useDefaultInstallables,` and `load`, have everything right next to each
other. I think this will enable future simplifications of that argument
defaulting logic, but I am saving those for a future PR --- best to keep
code motion and more complicated boolean expression rewriting separate
steps.
The "diagnostic ignored `-Woverloaded-virtual`" pragma helps because C++
doesn't like our many `run` methods. In our case, we don't mind the
shadowing it all --- it is *intentional* that the derived class only
provides a `run` method, and doesn't call any of the overridden `run`
methods.
Helps with https://github.com/NixOS/rfcs/pull/134
60 lines
1.8 KiB
C++
60 lines
1.8 KiB
C++
#include "command.hh"
|
|
#include "store-api.hh"
|
|
#include "make-content-addressed.hh"
|
|
#include "common-args.hh"
|
|
|
|
#include <nlohmann/json.hpp>
|
|
|
|
using namespace nix;
|
|
|
|
using nlohmann::json;
|
|
|
|
struct CmdMakeContentAddressed : virtual CopyCommand, virtual StorePathsCommand, MixJSON
|
|
{
|
|
CmdMakeContentAddressed()
|
|
{
|
|
realiseMode = Realise::Outputs;
|
|
}
|
|
|
|
std::string description() override
|
|
{
|
|
return "rewrite a path or closure to content-addressed form";
|
|
}
|
|
|
|
std::string doc() override
|
|
{
|
|
return
|
|
#include "make-content-addressed.md"
|
|
;
|
|
}
|
|
|
|
void run(ref<Store> srcStore, StorePaths && storePaths) override
|
|
{
|
|
auto dstStore = dstUri.empty() ? openStore() : openStore(dstUri);
|
|
|
|
auto remappings = makeContentAddressed(*srcStore, *dstStore,
|
|
StorePathSet(storePaths.begin(), storePaths.end()));
|
|
|
|
if (json) {
|
|
auto jsonRewrites = json::object();
|
|
for (auto & path : storePaths) {
|
|
auto i = remappings.find(path);
|
|
assert(i != remappings.end());
|
|
jsonRewrites[srcStore->printStorePath(path)] = srcStore->printStorePath(i->second);
|
|
}
|
|
auto json = json::object();
|
|
json["rewrites"] = jsonRewrites;
|
|
logger->cout("%s", json);
|
|
} else {
|
|
for (auto & path : storePaths) {
|
|
auto i = remappings.find(path);
|
|
assert(i != remappings.end());
|
|
notice("rewrote '%s' to '%s'",
|
|
srcStore->printStorePath(path),
|
|
srcStore->printStorePath(i->second));
|
|
}
|
|
}
|
|
}
|
|
};
|
|
|
|
static auto rCmdMakeContentAddressed = registerCommand2<CmdMakeContentAddressed>({"store", "make-content-addressed"});
|