Big changes

Author: jgg
Date: 1998-08-23 03:52:22 GMT
Big changes

diff --git a/apt-pkg/contrib/progress.cc b/apt-pkg/contrib/progress.cc
index aae0ea1e34997ef80c7f688210525f7edc54955b..4be7b87b999d512659774216b69f8058b96a83ec 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.4 1998/07/26 04:51:45 jgg Exp $
+// $Id: progress.cc,v 1.5 1998/08/23 03:52:22 jgg Exp $

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


@@ -76,9 +76,14 @@ 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;

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


@@ -87,6 +92,7 @@ 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;
 }
                                                                        /*}}}*/

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

-// $Id: progress.h,v 1.1 1998/07/21 05:33:21 jgg Exp $
+// $Id: progress.h,v 1.2 1998/08/23 03:52:23 jgg Exp $

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


@@ -40,6 +40,7 @@ class OpProgress
    // Change reduction code
    struct timeval LastTime;
    string LastOp;
    // Change reduction code
    struct timeval LastTime;
    string LastOp;

+   string LastSubOp;

    
    protected:
    
    
    protected:
    


@@ -58,7 +59,8 @@ class OpProgress
    void SubProgress(unsigned long SubTotal,string Op);
    void OverallProgress(unsigned long Current,unsigned long Total,
                        unsigned long Size,string Op);
    void SubProgress(unsigned long SubTotal,string Op);
    void OverallProgress(unsigned long Current,unsigned long Total,
                        unsigned long Size,string Op);

-
+   virtual void Done() {};
+   

    OpProgress();
    virtual ~OpProgress() {};
 };
    OpProgress();
    virtual ~OpProgress() {};
 };


@@ -75,7 +77,7 @@ class OpTextProgress : public OpProgress
    
    public:
 
    
    public:
 

-   void Done();
+   virtual void Done();

    
    OpTextProgress(bool NoUpdate = false) : NoUpdate(NoUpdate), LastLen(0) {};
    virtual ~OpTextProgress() {Done();};
    
    OpTextProgress(bool NoUpdate = false) : NoUpdate(NoUpdate), LastLen(0) {};
    virtual ~OpTextProgress() {Done();};