X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/6f4f200a22304be5352872d6e511f178434ce335..6627bdccce46a9acdae09d37e6e1444a5f7384e1:/apt-pkg/contrib/progress.cc?ds=sidebyside

diff --git a/apt-pkg/contrib/progress.cc b/apt-pkg/contrib/progress.cc
index aae0ea1e3..cb272e389 100644
--- a/apt-pkg/contrib/progress.cc
+++ b/apt-pkg/contrib/progress.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: progress.cc,v 1.4 1998/07/26 04:51:45 jgg Exp $
+// $Id: progress.cc,v 1.12 2003/01/11 07:17:04 jgg Exp $
 /* ######################################################################
    
    OpProgress - Operation Progress
@@ -13,9 +13,16 @@
 #endif 
 #include <apt-pkg/progress.h>
 #include <apt-pkg/error.h>
+#include <apt-pkg/configuration.h>
+
+#include <apti18n.h>
+
+#include <iostream>
 #include <stdio.h>
 									/*}}}*/
 
+using namespace std;
+
 // OpProgress::OpProgress - Constructor					/*{{{*/
 // ---------------------------------------------------------------------
 /* */
@@ -27,10 +34,15 @@ OpProgress::OpProgress() : Current(0), Total(0), Size(0), SubTotal(1),
 									/*}}}*/
 // 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)
 {
-   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();
 }
 									/*}}}*/
@@ -38,25 +50,44 @@ void OpProgress::Progress(unsigned long Cur)
 // ---------------------------------------------------------------------
 /* */
 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();
-   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,string Op)
+void OpProgress::SubProgress(unsigned long SubTotal,const string &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();
 }
 									/*}}}*/
@@ -76,9 +107,17 @@ bool OpProgress::CheckChange(float Interval)
    }
    MajorChange = false;
 
+   if (SubOp != LastSubOp)
+   {
+      LastSubOp = SubOp;
+      return true;
+   }
+   
    if ((int)LastPercent == (int)Percent)
       return false;
-   LastPercent = Percent;
+   
+   if (Interval == 0)
+      return false;
    
    // Check time delta
    struct timeval Now;
@@ -87,9 +126,22 @@ bool OpProgress::CheckChange(float Interval)
    if (Diff < Interval)
       return false;
    LastTime = Now;   
+   LastPercent = Percent;
    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				/*{{{*/
 // ---------------------------------------------------------------------
 /* */
@@ -99,13 +151,19 @@ void OpTextProgress::Done()
    {
       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
-	 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();
-   }      
+   }
+   
+   if (NoUpdate == true && NoDisplay == false && OldOp.empty() == false)
+   {
+      OldOp = string();
+      cout << endl;   
+   }   
 }
 									/*}}}*/
 // OpTextProgress::Update - Simple text spinner				/*{{{*/
@@ -113,7 +171,7 @@ void OpTextProgress::Done()
 /* */
 void OpTextProgress::Update()
 {
-   if (CheckChange() == false)
+   if (CheckChange((NoUpdate == true?0:0.7)) == false)
       return;
    
    // No percent spinner
@@ -121,7 +179,14 @@ void OpTextProgress::Update()
    {
       if (MajorChange == false)
 	 return;
-      cout << Op << endl;
+      if (NoDisplay == false)
+      {
+	 if (OldOp.empty() == false)
+	    cout << endl;
+	 OldOp = "a";
+	 cout << Op << "..." << flush;
+      }
+      
       return;
    }