merge with lp:~mvo/apt/apt-sid to get the complete fr

[apt.git] / cmdline / acqprogress.cc

diff --git a/cmdline/acqprogress.cc b/cmdline/acqprogress.cc
index f16843c612970feb750e2b5f0b573c07457e4ea2..b3ded4142f651f831db799604b6527075bf13a9d 100644 (file)
--- a/cmdline/acqprogress.cc
+++ b/cmdline/acqprogress.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: acqprogress.cc,v 1.16 1999/07/03 03:10:35 jgg Exp $
+// $Id: acqprogress.cc,v 1.24 2003/04/27 01:56:48 doogie Exp $

 /* ######################################################################
 
    Acquire Progress - Command line progress meter 
 /* ######################################################################
 
    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/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 <stdio.h>
 #include <signal.h>

+#include <iostream>

                                                                        /*}}}*/
 
                                                                        /*}}}*/
 

+using namespace std;
+

 // AcqTextStatus::AcqTextStatus - Constructor                          /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // AcqTextStatus::AcqTextStatus - Constructor                          /*{{{*/
 // ---------------------------------------------------------------------
 /* */


@@ -46,7 +52,7 @@ void AcqTextStatus::IMSHit(pkgAcquire::ItemDesc &Itm)
    if (Quiet <= 0)
       cout << '\r' << BlankLine << '\r';   
    
    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 << endl;
    if (Itm.Owner->FileSize != 0)
       cout << " [" << SizeToStr(Itm.Owner->FileSize) << "B]";
    cout << endl;


@@ -70,7 +76,7 @@ void AcqTextStatus::Fetch(pkgAcquire::ItemDesc &Itm)
    if (Quiet <= 0)
       cout << '\r' << BlankLine << '\r';
    
    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 << endl;
    if (Itm.Owner->FileSize != 0)
       cout << " [" << SizeToStr(Itm.Owner->FileSize) << "B]";
    cout << endl;


@@ -92,6 +98,7 @@ void AcqTextStatus::Fail(pkgAcquire::ItemDesc &Itm)
    if (Quiet > 1)
       return;
 
    if (Quiet > 1)
       return;
 

+   // Ignore certain kinds of transient failures (bad code)

    if (Itm.Owner->Status == pkgAcquire::Item::StatIdle)
       return;
       
    if (Itm.Owner->Status == pkgAcquire::Item::StatIdle)
       return;
       


@@ -100,11 +107,11 @@ void AcqTextStatus::Fail(pkgAcquire::ItemDesc &Itm)
    
    if (Itm.Owner->Status == pkgAcquire::Item::StatDone)
    {
    
    if (Itm.Owner->Status == pkgAcquire::Item::StatDone)
    {

-      cout << "Ign " << Itm.Description << endl;
+      cout << _("Ign ") << Itm.Description << endl;

    }
    else
    {
    }
    else
    {

-      cout << "Err " << Itm.Description << endl;
+      cout << _("Err ") << Itm.Description << endl;

       cout << "  " << Itm.Owner->ErrorText << endl;
    }
    
       cout << "  " << Itm.Owner->ErrorText << endl;
    }
    


@@ -122,12 +129,13 @@ void AcqTextStatus::Stop()
       return;
 
    if (Quiet <= 0)
       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                          /*{{{*/
 }
                                                                        /*}}}*/
 // AcqTextStatus::Pulse - Regular event pulse                          /*{{{*/


@@ -137,17 +145,19 @@ void AcqTextStatus::Stop()
    bandwidth and ETA indicator. */
 bool AcqTextStatus::Pulse(pkgAcquire *Owner)
 {
    bandwidth and ETA indicator. */
 bool AcqTextStatus::Pulse(pkgAcquire *Owner)
 {

+   pkgAcquireStatus::Pulse(Owner);
+   

    if (Quiet > 0)
       return true;
    
    if (Quiet > 0)
       return true;
    

-   pkgAcquireStatus::Pulse(Owner);
-   

    enum {Long = 0,Medium,Short} Mode = Long;
    
    enum {Long = 0,Medium,Short} Mode = Long;
    

-   char Buffer[300];
+   char Buffer[sizeof(BlankLine)];

    char *End = Buffer + sizeof(Buffer);
    char *S = Buffer;
    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)));
 
    // Put in the percent done
    sprintf(S,"%ld%%",long(double((CurrentBytes + CurrentItems)*100.0)/double(TotalBytes+TotalItems)));
 


@@ -212,7 +222,7 @@ bool AcqTextStatus::Pulse(pkgAcquire *Owner)
 
    // Show something..
    if (Shown == false)
 
    // 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 */
       
    /* Put in the ETA and cps meter, block off signals to prevent strangeness
       during resizing */


@@ -236,7 +246,7 @@ bool AcqTextStatus::Pulse(pkgAcquire *Owner)
    }
    Buffer[ScreenWidth] = 0;
    BlankLine[ScreenWidth] = 0;
    }
    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))
 
    // Draw the current status
    if (strlen(Buffer) == strlen(BlankLine))


@@ -257,15 +267,23 @@ bool AcqTextStatus::Pulse(pkgAcquire *Owner)
 bool AcqTextStatus::MediaChange(string Media,string Drive)
 {
    if (Quiet <= 0)
 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\n"
+                  " '%s'\n"
+                  "in the drive '%s' and press enter\n"),
+           Media.c_str(),Drive.c_str());

 
    char C = 0;
 
    char C = 0;

+   bool bStatus = true;

    while (C != '\n' && C != '\r')
    while (C != '\n' && C != '\r')

-      read(STDIN_FILENO,&C,1);
-   
-   Update = true;
-   return true;
+   {
+      int len = read(STDIN_FILENO,&C,1);
+      if(C == 'c' || len <= 0)
+        bStatus = false;
+   }
+
+   if(bStatus)
+      Update = true;
+   return bStatus;

 }
                                                                        /*}}}*/
 }
                                                                        /*}}}*/