* merged from apt--mvo

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

diff --git a/apt-pkg/contrib/progress.cc b/apt-pkg/contrib/progress.cc
index 0f2218f3c2e76ca485178975b9b6a289f5b17e91..6ce6e950a788a90d603ac693ac215113c8b43cb6 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.8 1998/10/02 04:39:53 jgg Exp $
+// $Id: progress.cc,v 1.12 2003/01/11 07:17:04 jgg Exp $

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


@@ -8,15 +8,18 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

-#ifdef __GNUG__
-#pragma implementation "apt-pkg/progress.h"
-#endif 

 #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                                        /*{{{*/
 // ---------------------------------------------------------------------
 /* */


@@ -33,7 +36,10 @@ OpProgress::OpProgress() : Current(0), Total(0), Size(0), SubTotal(1),
    percent of Total SubTotal is. */
 void OpProgress::Progress(unsigned long Cur)
 {
    percent of Total SubTotal is. */
 void OpProgress::Progress(unsigned long Cur)
 {

-   Percent = (Current + Cur/((float)SubTotal)*Size)*100.0/Total;
+   if (Total == 0 || Size == 0 || SubTotal == 0)
+      Percent = 0;
+   else
+      Percent = (Current + Cur/((float)SubTotal)*Size)*100.0/Total;

    Update();
 }
                                                                        /*}}}*/
    Update();
 }
                                                                        /*}}}*/


@@ -41,25 +47,31 @@ 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->Size = Size;
    this->Op = Op;
    SubOp = string();
 {
    this->Current = Current;
    this->Total = Total;
    this->Size = Size;
    this->Op = Op;
    SubOp = string();

-   Percent = Current*100.0/Total;
+   if (Total == 0)
+      Percent = 0;
+   else
+      Percent = Current*100.0/Total;

    Update();
 }
                                                                        /*}}}*/
 // OpProgress::SubProgress - Set the sub progress state                        /*{{{*/
 // ---------------------------------------------------------------------
 /* */
    Update();
 }
                                                                        /*}}}*/
 // 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;

-   Percent = Current*100.0/Total;
+   if (Total == 0)
+      Percent = 0;
+   else
+      Percent = Current*100.0/Total;

    Update();
 }
                                                                        /*}}}*/
    Update();
 }
                                                                        /*}}}*/


@@ -69,7 +81,10 @@ void OpProgress::SubProgress(unsigned long SubTotal,string Op)
 void OpProgress::SubProgress(unsigned long SubTotal)
 {
    this->SubTotal = SubTotal;
 void OpProgress::SubProgress(unsigned long SubTotal)
 {
    this->SubTotal = SubTotal;

-   Percent = Current*100.0/Total;
+   if (Total == 0)
+      Percent = 0;
+   else
+      Percent = Current*100.0/Total;

    Update();
 }
                                                                        /*}}}*/
    Update();
 }
                                                                        /*}}}*/


@@ -97,6 +112,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;


@@ -105,7 +125,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;
 }
                                                                        /*}}}*/


@@ -130,9 +149,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();


@@ -150,7 +169,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