wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-29 10:31:15 +02:00
Code Activity

Progress indicator: Unify "copying" and "substituting"

Browse source 
They're the same thing after all.

Example:

  $ nix build --store local?root=/tmp/nix nixpkgs.firefox-unwrapped
  [0/1 built, 49/98 copied, 16.3/92.8 MiB DL, 55.8/309.2 MiB copied] downloading 'https://cache.nixos.org/nar/0pl9li1jigcj2dany47hpmn0r3r48wc4nz48v5mqhh426lgz3bz6.nar.xz'
This commit is contained in:
Eelco Dolstra 2017-08-14 22:12:36 +02:00
parent c36467ad2e
commit 0e0dcf2c7e
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
4 changed files with 24 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/libutil/logging.hh
View file

@ -18,6 +18,7 @@ typedef enum {
actCopyPath = 100,
actDownload = 101,
actRealise = 102,
actCopyPaths = 103,
} ActivityType;
class Activity
@ -32,7 +33,7 @@ public:
~Activity();
template<typename... Args>
void progress(const Args & ... args);
void progress(const Args & ... args) const;
};
typedef enum {
@ -40,12 +41,6 @@ typedef enum {
evBuildStarted = 1,
evBuildOutput = 2,
evBuildFinished = 3,
evSubstitutionCreated = 8,
evSubstitutionStarted = 9,
evSubstitutionFinished = 10,
evCopyStarted = 100,
evCopyProgress = 101,
evStartActivity = 1000,
evStopActivity = 1001,
@ -152,7 +147,7 @@ void warnOnce(bool & haveWarned, const FormatOrString & fs);
void writeToStderr(const string & s);
template<typename... Args>
void Activity::progress(const Args & ... args)
void Activity::progress(const Args & ... args) const
{
Event ev;
ev.type = evProgress;