* apt-pkg/contrib/progress.cc

[apt.git] / apt-pkg / contrib / progress.cc

diff --git a/apt-pkg/contrib/progress.cc b/apt-pkg/contrib/progress.cc
index dfa978485861322d131528b38a3cc481c6a5cb16..e3db9a45aa1720c1d791caca362139142d474461 100644 (file)
--- a/apt-pkg/contrib/progress.cc
+++ b/apt-pkg/contrib/progress.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: progress.cc,v 1.9 2000/06/05 04:22:25 jgg Exp $
+// $Id: progress.cc,v 1.12 2003/01/11 07:17:04 jgg Exp $

 /* ######################################################################
    
    OpProgress - Operation Progress
 /* ######################################################################
    
    OpProgress - Operation Progress


@@ -14,9 +14,15 @@
 #include <apt-pkg/progress.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/progress.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/configuration.h>

+
+#include <apti18n.h>
+
+#include <iostream>

 #include <stdio.h>
                                                                        /*}}}*/
 
 #include <stdio.h>
                                                                        /*}}}*/
 

+using namespace std;
+

 // OpProgress::OpProgress - Constructor                                        /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // OpProgress::OpProgress - Constructor                                        /*{{{*/
 // ---------------------------------------------------------------------
 /* */


@@ -44,7 +50,7 @@ void OpProgress::Progress(unsigned long Cur)
 // ---------------------------------------------------------------------
 /* */
 void OpProgress::OverallProgress(unsigned long Current, unsigned long Total,
 // ---------------------------------------------------------------------
 /* */
 void OpProgress::OverallProgress(unsigned long Current, unsigned long Total,

-                                unsigned long Size,string Op)
+                                unsigned long Size,const string &Op)

 {
    this->Current = Current;
    this->Total = Total;
 {
    this->Current = Current;
    this->Total = Total;


@@ -61,7 +67,7 @@ void OpProgress::OverallProgress(unsigned long Current, unsigned long Total,
 // OpProgress::SubProgress - Set the sub progress state                        /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // OpProgress::SubProgress - Set the sub progress state                        /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-void OpProgress::SubProgress(unsigned long SubTotal,string Op)
+void OpProgress::SubProgress(unsigned long SubTotal,const string &Op)

 {
    this->SubTotal = SubTotal;
    SubOp = Op;
 {
    this->SubTotal = SubTotal;
    SubOp = Op;


@@ -109,6 +115,11 @@ bool OpProgress::CheckChange(float Interval)
    
    if ((int)LastPercent == (int)Percent)
       return false;
    
    if ((int)LastPercent == (int)Percent)
       return false;

+
+   LastPercent = Percent;
+   
+   if (Interval == 0)
+      return false;

    
    // Check time delta
    struct timeval Now;
    
    // Check time delta
    struct timeval Now;


@@ -117,7 +128,6 @@ bool OpProgress::CheckChange(float Interval)
    if (Diff < Interval)
       return false;
    LastTime = Now;   
    if (Diff < Interval)
       return false;
    LastTime = Now;   

-   LastPercent = Percent;

    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/


@@ -142,9 +152,9 @@ void OpTextProgress::Done()
    {
       char S[300];
       if (_error->PendingError() == true)
    {
       char S[300];
       if (_error->PendingError() == true)

-        snprintf(S,sizeof(S),"\r%s... Error!",OldOp.c_str());
+        snprintf(S,sizeof(S),_("%c%s... Error!"),'\r',OldOp.c_str());

       else
       else

-        snprintf(S,sizeof(S),"\r%s... Done",OldOp.c_str());
+        snprintf(S,sizeof(S),_("%c%s... Done"),'\r',OldOp.c_str());

       Write(S);
       cout << endl;
       OldOp = string();
       Write(S);
       cout << endl;
       OldOp = string();


@@ -162,7 +172,7 @@ void OpTextProgress::Done()
 /* */
 void OpTextProgress::Update()
 {
 /* */
 void OpTextProgress::Update()
 {

-   if (CheckChange() == false)
+   if (CheckChange((NoUpdate == true?0:0.7)) == false)

       return;
    
    // No percent spinner
       return;
    
    // No percent spinner