[Aptitude-svn-commit] r4335 - in branches/aptitude-0.3/aptitude: . src src/generic/apt

[Daniel Burrows]

Author: dburrows
Date: Thu Sep 29 22:20:58 2005
New Revision: 4335

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/generic/apt/download_install_manager.cc
   branches/aptitude-0.3/aptitude/src/generic/apt/download_install_manager.h
   branches/aptitude-0.3/aptitude/src/generic/apt/download_manager.h
   branches/aptitude-0.3/aptitude/src/ui.cc
Log:
Make prepare() part of the generic download_manager interface.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Thu Sep 29 22:20:58 2005
@@ -1,5 +1,12 @@
 2005-09-29  Daniel Burrows  <dburrows at debian.org>
 
+	* src/generic/apt/download_manager.h, src/generic/apt/download_install_manager.h, src/generic/apt/download_install_manager.cc, src/ui.cc:
+
+	  Make prepare() part of the generic download_manager interface
+	  (additional arguments should be 'passed' in the constructor
+	  now).  This will pave the way for fully generic code in the UI
+	  to handle a download.
+
 	* src/generic/apt/download_install_manager.cc, src/generic/apt/download_install_manager.h, src/ui.cc:
 
 	  Make download_only a constructor parameter of the

Modified: branches/aptitude-0.3/aptitude/src/generic/apt/download_install_manager.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/apt/download_install_manager.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/generic/apt/download_install_manager.cc	Thu Sep 29 22:20:58 2005
@@ -43,7 +43,7 @@
 }
 
 bool download_install_manager::prepare(OpProgress &progress,
-				       pkgAcquireStatus *acqlog,
+				       pkgAcquireStatus &acqlog,
 				       download_signal_log *signallog)
 {
   log = signallog;
@@ -80,7 +80,7 @@
       return false;
     }
 
-  fetcher = new pkgAcquire(acqlog);
+  fetcher = new pkgAcquire(&acqlog);
 
   if(!pm->GetArchives(fetcher, &src_list, apt_package_records) ||
      _error->PendingError())

Modified: branches/aptitude-0.3/aptitude/src/generic/apt/download_install_manager.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/apt/download_install_manager.h	(original)
+++ branches/aptitude-0.3/aptitude/src/generic/apt/download_install_manager.h	Thu Sep 29 22:20:58 2005
@@ -32,8 +32,6 @@
 #include <utility>
 #include <vector>
 
-class download_signal_log;
-
 /** Manages downloading and installing packages. */
 class download_install_manager : public download_manager
 {
@@ -76,7 +74,7 @@
    *  \return \b true iff the preparation was successful.
    */
   bool prepare(OpProgress &progress,
-	       pkgAcquireStatus *acqlog,
+	       pkgAcquireStatus &acqlog,
 	       download_signal_log *signallog);
 
   /** If download_only is false, call the package manager to install

Modified: branches/aptitude-0.3/aptitude/src/generic/apt/download_manager.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/apt/download_manager.h	(original)
+++ branches/aptitude-0.3/aptitude/src/generic/apt/download_manager.h	Thu Sep 29 22:20:58 2005
@@ -29,6 +29,7 @@
 #include <sigc++/trackable.h>
 
 class OpProgress;
+class download_signal_log;
 
 /** The generic interface for a task involving a download and possibly
  *  some post-download operations.  (for instance, downloading and
@@ -54,6 +55,23 @@
   download_manager();
   virtual ~download_manager();
 
+  /** Do any preliminary work needed to set up a download.
+   *
+   *  \param progress a status object used to monitor tasks that
+   *                  execute while this method is running.
+   *
+   *  \param acqlog a pkgAcqStatus object that will be used to do the
+   *                actual download.
+   *
+   *  \param download_signal_log a signal logger that will be used
+   *                             to Complete the download.
+   *
+   *  \return \b true if the preparation succeeded, \b false otherwise
+   */
+  virtual bool prepare(OpProgress &progress,
+		       pkgAcquireStatus &acqlog,
+		       download_signal_log *signallog) = 0;
+
   /** Perform the actual download.  This may execute in a background
    *  thread.
    */

Modified: branches/aptitude-0.3/aptitude/src/ui.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/ui.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/ui.cc	Thu Sep 29 22:20:58 2005
@@ -1066,7 +1066,7 @@
   {
     vs_progress_ref p = gen_progress_bar();
 
-    bool ok = prepare(*p.unsafe_get_ref(), &st, log);
+    bool ok = prepare(*p.unsafe_get_ref(), st, log);
 
     p->destroy();