Apply patch from Sami Liedes <sliedes@cc.hut.fi> to avoid unecessary

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

diff --git a/apt-pkg/contrib/progress.cc b/apt-pkg/contrib/progress.cc
index 18dffc83e8382b12ba103dc5e60c37c55f1bfd5e..cffdddc4fe0d70a9f45e3fc5fadd3c73c7944168 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.1 1998/07/21 05:33:21 jgg Exp $
+// $Id: progress.cc,v 1.12 2003/01/11 07:17:04 jgg Exp $

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


@@ -8,13 +8,19 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

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

 #include <apt-pkg/progress.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>

+#include <cstring>

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

+using namespace std;
+

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


@@ -26,10 +32,15 @@ OpProgress::OpProgress() : Current(0), Total(0), Size(0), SubTotal(1),
                                                                        /*}}}*/
 // OpProgress::Progress - Sub progress with no state change            /*{{{*/
 // ---------------------------------------------------------------------
                                                                        /*}}}*/
 // OpProgress::Progress - Sub progress with no state change            /*{{{*/
 // ---------------------------------------------------------------------

-/* This assumes that Size is the same as the current sub size */
+/* Current is the Base Overall progress in units of Total. Cur is the sub
+   progress in units of SubTotal. Size is a scaling factor that says what
+   percent of Total SubTotal is. */

 void OpProgress::Progress(unsigned long Cur)
 {
 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();
 }
                                                                        /*}}}*/


@@ -37,25 +48,44 @@ 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();
+}
+                                                                       /*}}}*/
+// OpProgress::SubProgress - Set the sub progress state                        /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+void OpProgress::SubProgress(unsigned long SubTotal)
+{
+   this->SubTotal = SubTotal;
+   if (Total == 0)
+      Percent = 0;
+   else
+      Percent = Current*100.0/Total;

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


@@ -75,10 +105,20 @@ bool OpProgress::CheckChange(float Interval)
    }
    MajorChange = false;
 
    }
    MajorChange = false;
 

+   if (SubOp != LastSubOp)
+   {
+      LastSubOp = SubOp;
+      return true;
+   }
+   

    if ((int)LastPercent == (int)Percent)
       return false;
    if ((int)LastPercent == (int)Percent)
       return false;

+

    LastPercent = Percent;
    
    LastPercent = Percent;
    

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

    // Check time delta
    struct timeval Now;
    gettimeofday(&Now,0);
    // Check time delta
    struct timeval Now;
    gettimeofday(&Now,0);


@@ -89,6 +129,18 @@ bool OpProgress::CheckChange(float Interval)
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

+// OpTextProgress::OpTextProgress - Constructor                                /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+OpTextProgress::OpTextProgress(Configuration &Config) : 
+                               NoUpdate(false), NoDisplay(false), LastLen(0) 
+{
+   if (Config.FindI("quiet",0) >= 1)
+      NoUpdate = true;
+   if (Config.FindI("quiet",0) >= 2)
+      NoDisplay = true;
+};
+                                                                       /*}}}*/

 // OpTextProgress::Done - Clean up the display                         /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // OpTextProgress::Done - Clean up the display                         /*{{{*/
 // ---------------------------------------------------------------------
 /* */


@@ -97,11 +149,20 @@ void OpTextProgress::Done()
    if (NoUpdate == false && OldOp.empty() == false)
    {
       char S[300];
    if (NoUpdate == false && OldOp.empty() == false)
    {
       char S[300];

-      snprintf(S,sizeof(S),"\r%s",OldOp.c_str());
+      if (_error->PendingError() == true)
+        snprintf(S,sizeof(S),_("%c%s... Error!"),'\r',OldOp.c_str());
+      else
+        snprintf(S,sizeof(S),_("%c%s... Done"),'\r',OldOp.c_str());

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

-   }      
+   }
+   
+   if (NoUpdate == true && NoDisplay == false && OldOp.empty() == false)
+   {
+      OldOp = string();
+      cout << endl;   
+   }   

 }
                                                                        /*}}}*/
 // OpTextProgress::Update - Simple text spinner                                /*{{{*/
 }
                                                                        /*}}}*/
 // OpTextProgress::Update - Simple text spinner                                /*{{{*/


@@ -109,7 +170,7 @@ void OpTextProgress::Done()
 /* */
 void OpTextProgress::Update()
 {
 /* */
 void OpTextProgress::Update()
 {

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

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


@@ -117,7 +178,14 @@ void OpTextProgress::Update()
    {
       if (MajorChange == false)
         return;
    {
       if (MajorChange == false)
         return;

-      cout << Op << endl;
+      if (NoDisplay == false)
+      {
+        if (OldOp.empty() == false)
+           cout << endl;
+        OldOp = "a";
+        cout << Op << "..." << flush;
+      }
+      

       return;
    }
 
       return;
    }