Merge branch 'debian/sid' into debian/experimental

[apt.git] / apt-pkg / acquire-method.h

diff --git a/apt-pkg/acquire-method.h b/apt-pkg/acquire-method.h
index 08c88265cf60b5171942ac2885d60822a2a4077c..cbf79f8609be84b6d72e204e983095696f1ce258 100644 (file)
--- a/apt-pkg/acquire-method.h
+++ b/apt-pkg/acquire-method.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: acquire-method.h,v 1.5 1998/12/03 07:29:17 jgg Exp $
+// $Id: acquire-method.h,v 1.15.2.1 2003/12/24 23:09:17 mdz Exp $

 /* ######################################################################
 
    Acquire Method - Method helper class + functions
 /* ######################################################################
 
    Acquire Method - Method helper class + functions


@@ -10,15 +10,29 @@
    
    ##################################################################### */
                                                                        /*}}}*/
    
    ##################################################################### */
                                                                        /*}}}*/

+
+/** \addtogroup acquire
+ *  @{
+ *
+ *  \file acquire-method.h
+ */
+

 #ifndef PKGLIB_ACQUIRE_METHOD_H
 #define PKGLIB_ACQUIRE_METHOD_H
 
 #ifndef PKGLIB_ACQUIRE_METHOD_H
 #define PKGLIB_ACQUIRE_METHOD_H
 

-#include <apt-pkg/configuration.h>
-#include <strutl.h>
+#include <apt-pkg/hashes.h>
+#include <apt-pkg/macros.h>

 
 

-#ifdef __GNUG__
-#pragma interface "apt-pkg/acquire-method.h"
-#endif 
+#include <stdarg.h>
+#include <time.h>
+
+#include <string>
+#include <vector>
+
+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/strutl.h>
+#endif

 
 class pkgAcqMethod
 {
 
 class pkgAcqMethod
 {


@@ -28,51 +42,74 @@ class pkgAcqMethod
    {
       FetchItem *Next;
 
    {
       FetchItem *Next;
 

-      string Uri;
-      string DestFile;
+      std::string Uri;
+      std::string DestFile;

       time_t LastModified;
       bool IndexFile;
       time_t LastModified;
       bool IndexFile;

+      bool FailIgnore;
+      HashStringList ExpectedHashes;

    };
    
    struct FetchResult
    {
    };
    
    struct FetchResult
    {

-      string MD5Sum;
+      HashStringList Hashes;
+      std::vector<std::string> GPGVOutput;

       time_t LastModified;
       bool IMSHit;
       time_t LastModified;
       bool IMSHit;

-      string Filename;
-      unsigned long Size;
-      unsigned long ResumePoint;      
+      std::string Filename;
+      unsigned long long Size;
+      unsigned long long ResumePoint;
+      
+      void TakeHashes(class Hashes &Hash);

       FetchResult();
    };
 
    // State
       FetchResult();
    };
 
    // State

-   vector<string> Messages;
+   std::vector<std::string> Messages;

    FetchItem *Queue;
    FetchItem *Queue;

-      
+   FetchItem *QueueBack;
+   std::string FailReason;
+   std::string UsedMirror;
+   std::string IP;
+   

    // Handlers for messages
    // Handlers for messages

-   virtual bool Configuration(string Message);
-   virtual bool Fetch(FetchItem *Item) {return true;};
+   virtual bool Configuration(std::string Message);
+   virtual bool Fetch(FetchItem * /*Item*/) {return true;};

    
    // Outgoing messages
    void Fail(bool Transient = false);
    
    // Outgoing messages
    void Fail(bool Transient = false);

-   void Fail(string Why, bool Transient = false);
-   void URIStart(FetchResult &Res);
-   void URIDone(FetchResult &Res,FetchResult *Alt = 0);
-   void MediaFail(string Required,string Drive);
-   
-   public:
+   inline void Fail(const char *Why, bool Transient = false) {Fail(std::string(Why),Transient);};
+   virtual void Fail(std::string Why, bool Transient = false);
+   virtual void URIStart(FetchResult &Res);
+   virtual void URIDone(FetchResult &Res,FetchResult *Alt = 0);
+
+   bool MediaFail(std::string Required,std::string Drive);
+   virtual void Exit() {};

 
 

+   void PrintStatus(char const * const header, const char* Format, va_list &args) const;
+
+   public:

    enum CnfFlags {SingleInstance = (1<<0),
                   Pipeline = (1<<1), SendConfig = (1<<2),
    enum CnfFlags {SingleInstance = (1<<0),
                   Pipeline = (1<<1), SendConfig = (1<<2),

-                  LocalOnly = (1<<3)};
+                  LocalOnly = (1<<3), NeedsCleanup = (1<<4), 
+                  Removable = (1<<5)};

 
    void Log(const char *Format,...);
    void Status(const char *Format,...);
    
 
    void Log(const char *Format,...);
    void Status(const char *Format,...);
    

+   void Redirect(const std::string &NewURI);
+ 

    int Run(bool Single = false);
    int Run(bool Single = false);

+   inline void SetFailReason(std::string Msg) {FailReason = Msg;};
+   inline void SetIP(std::string aIP) {IP = aIP;};

    
    pkgAcqMethod(const char *Ver,unsigned long Flags = 0);
    virtual ~pkgAcqMethod() {};
    
    pkgAcqMethod(const char *Ver,unsigned long Flags = 0);
    virtual ~pkgAcqMethod() {};

+
+   private:
+   APT_HIDDEN void Dequeue();

 };
 
 };
 

+/** @} */
+

 #endif
 #endif