Various bug fixes

[apt.git] / cmdline / acqprogress.cc

diff --git a/cmdline/acqprogress.cc b/cmdline/acqprogress.cc
index a5383a838d9cf2e96c805931b030b945420ed68a..ee833923c5a1998a8bb00d1d641d4524d2c8ccf2 100644 (file)
--- a/cmdline/acqprogress.cc
+++ b/cmdline/acqprogress.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: acqprogress.cc,v 1.13 1999/04/20 05:59:29 jgg Exp $
+// $Id: acqprogress.cc,v 1.22 2001/05/27 04:46:43 jgg Exp $
 /* ######################################################################
 
    Acquire Progress - Command line progress meter 
@@ -12,11 +12,17 @@
 #include <apt-pkg/acquire-item.h>
 #include <apt-pkg/acquire-worker.h>
 #include <apt-pkg/strutl.h>
+#include <apt-pkg/error.h>
 
+#include <apti18n.h>
+    
 #include <stdio.h>
 #include <signal.h>
+#include <iostream>
                                                                        /*}}}*/
 
+using namespace std;
+
 // AcqTextStatus::AcqTextStatus - Constructor                          /*{{{*/
 // ---------------------------------------------------------------------
 /* */
@@ -46,9 +52,9 @@ void AcqTextStatus::IMSHit(pkgAcquire::ItemDesc &Itm)
    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) << "b]";
+      cout << " [" << SizeToStr(Itm.Owner->FileSize) << "B]";
    cout << endl;
    Update = true;
 };
@@ -70,9 +76,9 @@ void AcqTextStatus::Fetch(pkgAcquire::ItemDesc &Itm)
    if (Quiet <= 0)
       cout << '\r' << BlankLine << '\r';
    
-   cout << "Get:" << Itm.Owner->ID << ' ' << Itm.Description;
+   cout << _("Get:") << Itm.Owner->ID << ' ' << Itm.Description;
    if (Itm.Owner->FileSize != 0)
-      cout << " [" << SizeToStr(Itm.Owner->FileSize) << "b]";
+      cout << " [" << SizeToStr(Itm.Owner->FileSize) << "B]";
    cout << endl;
 };
                                                                        /*}}}*/
@@ -92,16 +98,20 @@ void AcqTextStatus::Fail(pkgAcquire::ItemDesc &Itm)
    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';
    
    if (Itm.Owner->Status == pkgAcquire::Item::StatDone)
    {
-      cout << "Ign " << Itm.Description << endl;
+      cout << _("Ign ") << Itm.Description << endl;
    }
    else
    {
-      cout << "Err " << Itm.Description << endl;
+      cout << _("Err ") << Itm.Description << endl;
       cout << "  " << Itm.Owner->ErrorText << endl;
    }
    
@@ -119,12 +129,13 @@ void AcqTextStatus::Stop()
       return;
 
    if (Quiet <= 0)
-      cout << '\r' << BlankLine << '\r';
-   
-   if (FetchedBytes != 0)
-      cout << "Fetched " << SizeToStr(FetchedBytes) << "b in " <<
-         TimeToStr(ElapsedTime) << " (" << SizeToStr(CurrentCPS) << 
-         "b/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                          /*{{{*/
@@ -132,19 +143,21 @@ void AcqTextStatus::Stop()
 /* 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;
+      return true;
    
    pkgAcquireStatus::Pulse(Owner);
    
    enum {Long = 0,Medium,Short} Mode = Long;
    
-   char Buffer[300];
+   char Buffer[1024];
    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)));
 
@@ -189,7 +202,7 @@ void AcqTextStatus::Pulse(pkgAcquire *Owner)
       else
       {
         if (Mode == Medium || I->TotalSize == 0)
-           snprintf(S,End-S," %sb",SizeToStr(I->CurrentSize).c_str());
+           snprintf(S,End-S," %sB",SizeToStr(I->CurrentSize).c_str());
       }
       S += strlen(S);
       
@@ -200,7 +213,7 @@ void AcqTextStatus::Pulse(pkgAcquire *Owner)
            snprintf(S,End-S," %lu%%",
                     long(double(I->CurrentSize*100.0)/double(I->TotalSize)));
         else
-           snprintf(S,End-S,"/%sb %lu%%",SizeToStr(I->TotalSize).c_str(),
+           snprintf(S,End-S,"/%sB %lu%%",SizeToStr(I->TotalSize).c_str(),
                     long(double(I->CurrentSize*100.0)/double(I->TotalSize)));
       }      
       S += strlen(S);
@@ -209,7 +222,7 @@ void AcqTextStatus::Pulse(pkgAcquire *Owner)
 
    // Show something..
    if (Shown == false)
-      snprintf(S,End-S," [Working]");
+      snprintf(S,End-S,_(" [Working]"));
       
    /* Put in the ETA and cps meter, block off signals to prevent strangeness
       during resizing */
@@ -222,7 +235,7 @@ void AcqTextStatus::Pulse(pkgAcquire *Owner)
    {      
       char Tmp[300];
       unsigned long ETA = (unsigned long)((TotalBytes - CurrentBytes)/CurrentCPS);
-      sprintf(Tmp," %sb/s %s",SizeToStr(CurrentCPS).c_str(),TimeToStr(ETA).c_str());
+      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)
@@ -233,7 +246,7 @@ void AcqTextStatus::Pulse(pkgAcquire *Owner)
    }
    Buffer[ScreenWidth] = 0;
    BlankLine[ScreenWidth] = 0;
-   sigprocmask(SIG_UNBLOCK,&OldSigs,0);
+   sigprocmask(SIG_SETMASK,&OldSigs,0);
 
    // Draw the current status
    if (strlen(Buffer) == strlen(BlankLine))
@@ -244,6 +257,8 @@ void AcqTextStatus::Pulse(pkgAcquire *Owner)
    BlankLine[strlen(Buffer)] = 0;
    
    Update = false;
+
+   return true;
 }
                                                                        /*}}}*/
 // AcqTextStatus::MediaChange - Media need to be swapped               /*{{{*/
@@ -252,9 +267,10 @@ void AcqTextStatus::Pulse(pkgAcquire *Owner)
 bool AcqTextStatus::MediaChange(string Media,string Drive)
 {
    if (Quiet <= 0)
-      cout << '\r' << BlankLine << '\r';   
-   cout << "Media Change: Please insert the disc labeled '" << Media << "' in "\
-           "the drive '" << Drive << "' and press enter" << endl;
+      cout << '\r' << BlankLine << '\r';
+   ioprintf(cout,_("Media Change: Please insert the disc labeled '%s' in "
+                  "the drive '%s' and press enter\n"),
+           Media.c_str(),Drive.c_str());
 
    char C = 0;
    while (C != '\n' && C != '\r')