// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: acqprogress.cc,v 1.5 1998/12/04 21:16:52 jgg Exp $
+// $Id: acqprogress.cc,v 1.24 2003/04/27 01:56:48 doogie Exp $
/* ######################################################################
Acquire Progress - Command line progress meter
##################################################################### */
/*}}}*/
// Include files /*{{{*/
-#include "acqprogress.h"
+#include<config.h>
+
#include <apt-pkg/acquire-item.h>
#include <apt-pkg/acquire-worker.h>
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/strutl.h>
+#include <apt-pkg/error.h>
+
#include <stdio.h>
-#include <strutl.h>
+#include <signal.h>
+#include <iostream>
+#include <unistd.h>
+
+#include "acqprogress.h"
+#include <apti18n.h>
/*}}}*/
+using namespace std;
+
// AcqTextStatus::AcqTextStatus - Constructor /*{{{*/
// ---------------------------------------------------------------------
/* */
AcqTextStatus::AcqTextStatus(unsigned int &ScreenWidth,unsigned int Quiet) :
- ScreenWidth(ScreenWidth), Quiet(Quiet)
+ ScreenWidth(ScreenWidth), ID(0), Quiet(Quiet)
{
+ BlankLine[0] = 0;
}
/*}}}*/
// AcqTextStatus::Start - Downloading has started /*{{{*/
if (Quiet <= 0)
cout << '\r' << BlankLine << '\r';
- cout << "Hit " << Itm.Description;
+ cout << _("Hit ") << Itm.Description;
if (Itm.Owner->FileSize != 0)
- cout << " [" << SizeToStr(Itm.Owner->FileSize) << ']';
+ cout << " [" << SizeToStr(Itm.Owner->FileSize) << "B]";
cout << endl;
Update = true;
};
if (Quiet <= 0)
cout << '\r' << BlankLine << '\r';
- cout << "Get:" << hex << Itm.Owner->ID << dec << ' ' << Itm.Description;
+ cout << _("Get:") << Itm.Owner->ID << ' ' << Itm.Description;
if (Itm.Owner->FileSize != 0)
- cout << " [" << SizeToStr(Itm.Owner->FileSize) << ']';
+ cout << " [" << SizeToStr(Itm.Owner->FileSize) << "B]";
cout << endl;
};
/*}}}*/
if (Quiet > 1)
return;
+ // Ignore certain kinds of transient failures (bad code)
+ if (Itm.Owner->Status == pkgAcquire::Item::StatIdle)
+ return;
+
if (Quiet <= 0)
cout << '\r' << BlankLine << '\r';
- cout << "Err " << Itm.Description << endl;
- cout << " " << Itm.Owner->ErrorText << endl;
+ if (Itm.Owner->Status == pkgAcquire::Item::StatDone)
+ {
+ cout << _("Ign ") << Itm.Description << endl;
+ }
+ else
+ {
+ cout << _("Err ") << Itm.Description << endl;
+ cout << " " << Itm.Owner->ErrorText << endl;
+ }
+
Update = true;
};
/*}}}*/
return;
if (Quiet <= 0)
- cout << '\r' << BlankLine << '\r';
-
- if (FetchedBytes != 0)
- cout << "Fetched " << SizeToStr(FetchedBytes) << " in " <<
- TimeToStr(ElapsedTime) << " (" << SizeToStr(CurrentCPS) <<
- "/s)" << endl;
+ cout << '\r' << BlankLine << '\r' << flush;
+
+ if (FetchedBytes != 0 && _error->PendingError() == false)
+ ioprintf(cout,_("Fetched %sB in %s (%sB/s)\n"),
+ SizeToStr(FetchedBytes).c_str(),
+ TimeToStr(ElapsedTime).c_str(),
+ SizeToStr(CurrentCPS).c_str());
}
/*}}}*/
// AcqTextStatus::Pulse - Regular event pulse /*{{{*/
/* This draws the current progress. Each line has an overall percent
meter and a per active item status meter along with an overall
bandwidth and ETA indicator. */
-void AcqTextStatus::Pulse(pkgAcquire *Owner)
+bool AcqTextStatus::Pulse(pkgAcquire *Owner)
{
- if (Quiet > 0)
- return;
-
pkgAcquireStatus::Pulse(Owner);
- enum {Long = 0,Medium,Short} Mode = Long;
+ if (Quiet > 0)
+ return true;
+
+ enum {Long = 0,Medium,Short} Mode = Medium;
- char Buffer[300];
+ char Buffer[sizeof(BlankLine)];
char *End = Buffer + sizeof(Buffer);
char *S = Buffer;
-
+ if (ScreenWidth >= sizeof(Buffer))
+ ScreenWidth = sizeof(Buffer)-1;
+
// Put in the percent done
- sprintf(S,"%ld%%",long(double((CurrentBytes + CurrentItems)*100.0)/double(TotalBytes+TotalItems)));
+ sprintf(S,"%.0f%%",((CurrentBytes + CurrentItems)*100.0)/(TotalBytes+TotalItems));
bool Shown = false;
for (pkgAcquire::Worker *I = Owner->WorkersBegin(); I != 0;
// Add in the short description
if (I->CurrentItem->Owner->ID != 0)
- snprintf(S,End-S," [%x %s",I->CurrentItem->Owner->ID,
+ snprintf(S,End-S," [%lu %s",I->CurrentItem->Owner->ID,
I->CurrentItem->ShortDesc.c_str());
else
snprintf(S,End-S," [%s",I->CurrentItem->ShortDesc.c_str());
// Add the current progress
if (Mode == Long)
- snprintf(S,End-S," %u",I->CurrentSize);
+ snprintf(S,End-S," %llu",I->CurrentSize);
else
{
if (Mode == Medium || I->TotalSize == 0)
- snprintf(S,End-S," %s",SizeToStr(I->CurrentSize).c_str());
+ snprintf(S,End-S," %sB",SizeToStr(I->CurrentSize).c_str());
}
S += strlen(S);
if (I->TotalSize > 0 && I->CurrentItem->Owner->Complete == false)
{
if (Mode == Short)
- snprintf(S,End-S," %u%%",
- long(double(I->CurrentSize*100.0)/double(I->TotalSize)));
+ snprintf(S,End-S," %.0f%%",
+ (I->CurrentSize*100.0)/I->TotalSize);
else
- snprintf(S,End-S,"/%s %u%%",SizeToStr(I->TotalSize).c_str(),
- long(double(I->CurrentSize*100.0)/double(I->TotalSize)));
+ snprintf(S,End-S,"/%sB %.0f%%",SizeToStr(I->TotalSize).c_str(),
+ (I->CurrentSize*100.0)/I->TotalSize);
}
S += strlen(S);
snprintf(S,End-S,"]");
// Show something..
if (Shown == false)
- snprintf(S,End-S," [Working]");
+ snprintf(S,End-S,_(" [Working]"));
- // Put in the ETA and cps meter
+ /* Put in the ETA and cps meter, block off signals to prevent strangeness
+ during resizing */
+ sigset_t Sigs,OldSigs;
+ sigemptyset(&Sigs);
+ sigaddset(&Sigs,SIGWINCH);
+ sigprocmask(SIG_BLOCK,&Sigs,&OldSigs);
+
if (CurrentCPS != 0)
{
char Tmp[300];
- unsigned long ETA = (unsigned long)((TotalBytes - CurrentBytes)/CurrentCPS);
- sprintf(Tmp," %s/s %s",SizeToStr(CurrentCPS).c_str(),TimeToStr(ETA).c_str());
+ unsigned long long ETA = (TotalBytes - CurrentBytes)/CurrentCPS;
+ sprintf(Tmp," %sB/s %s",SizeToStr(CurrentCPS).c_str(),TimeToStr(ETA).c_str());
unsigned int Len = strlen(Buffer);
unsigned int LenT = strlen(Tmp);
if (Len + LenT < ScreenWidth)
}
}
Buffer[ScreenWidth] = 0;
-
+ BlankLine[ScreenWidth] = 0;
+ sigprocmask(SIG_SETMASK,&OldSigs,0);
+
// Draw the current status
if (strlen(Buffer) == strlen(BlankLine))
cout << '\r' << Buffer << flush;
BlankLine[strlen(Buffer)] = 0;
Update = false;
+
+ return true;
}
/*}}}*/
// AcqTextStatus::MediaChange - Media need to be swapped /*{{{*/
/* Prompt for a media swap */
bool AcqTextStatus::MediaChange(string Media,string Drive)
{
+ // If we do not output on a terminal and one of the options to avoid user
+ // interaction is given, we assume that no user is present who could react
+ // on your media change request
+ if (isatty(STDOUT_FILENO) != 1 && Quiet >= 2 &&
+ (_config->FindB("APT::Get::Assume-Yes",false) == true ||
+ _config->FindB("APT::Get::Force-Yes",false) == true ||
+ _config->FindB("APT::Get::Trivial-Only",false) == true))
+
+ return false;
+
if (Quiet <= 0)
- cout << '\r' << BlankLine << '\r';
- cout << "Media Change: Please insert the Disc labeled '" << Media << "' in "\
- " the drive '" << Drive << "' and press a key" << endl;
+ cout << '\r' << BlankLine << '\r';
+ ioprintf(cout,_("Media change: please insert the disc labeled\n"
+ " '%s'\n"
+ "in the drive '%s' and press enter\n"),
+ Media.c_str(),Drive.c_str());
- char C;
- read(STDIN_FILENO,&C,1);
-
- Update = true;
- return true;
+ char C = 0;
+ bool bStatus = true;
+ while (C != '\n' && C != '\r')
+ {
+ int len = read(STDIN_FILENO,&C,1);
+ if(C == 'c' || len <= 0)
+ bStatus = false;
+ }
+
+ if(bStatus)
+ Update = true;
+ return bStatus;
}
/*}}}*/
projects / apt.git / blobdiff