Sync

[apt.git] / apt-pkg / acquire-worker.cc

diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc
index 756b309594efebd21d5131ab6e635dee684edb01..936d469c3ea715166513f72fe00fc6f81ade4ace 100644 (file)
--- a/apt-pkg/acquire-worker.cc
+++ b/apt-pkg/acquire-worker.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: acquire-worker.cc,v 1.4 1998/10/22 04:56:40 jgg Exp $
+// $Id: acquire-worker.cc,v 1.6 1998/10/24 04:57:58 jgg Exp $
 /* ######################################################################
 
    Acquire Worker 
@@ -167,7 +167,6 @@ bool pkgAcquire::Worker::ReadMessages()
    return true;
 }
                                                                        /*}}}*/
-
 // Worker::RunMessage - Empty the message queue                                /*{{{*/
 // ---------------------------------------------------------------------
 /* This takes the messages from the message queue and runs them through
@@ -188,6 +187,11 @@ bool pkgAcquire::Worker::RunMessages()
       if (End == Message.c_str())
         return _error->Error("Invalid message from method %s: %s",Access.c_str(),Message.c_str());
 
+      string URI = LookupTag(Message,"URI");
+      pkgAcquire::Queue::QItem *Itm = 0;
+      if (URI.empty() == false)
+        Itm = OwnerQ->FindItem(URI,this);
+        
       // Determine the message number and dispatch
       switch (Number)
       {
@@ -210,15 +214,47 @@ bool pkgAcquire::Worker::RunMessages()
            
         // 200 URI Start
         case 200:
-        break;
+        {
+           if (Itm == 0)
+           {
+              _error->Warning("Method gave invalid 200 URI Start message");
+              break;
+           }
+           CurrentItem = Itm;
+           CurrentSize = 0;
+           TotalSize = atoi(LookupTag(Message,"Size","0").c_str());
+           
+           break;
+        }
         
         // 201 URI Done
         case 201:
-        break;
+        {
+           if (Itm == 0)
+           {
+              _error->Warning("Method gave invalid 400 URI Failure message");
+              break;
+           }
+
+           Itm->Owner->Done(Message,atoi(LookupTag(Message,"Size","0").c_str()),
+                                         LookupTag(Message,"MD5-Hash"));
+           OwnerQ->ItemDone(Itm);
+           break;
+        }       
         
         // 400 URI Failure
         case 400:
-        break;
+        {
+           if (Itm == 0)
+           {
+              _error->Warning("Method gave invalid 400 URI Failure message");
+              break;
+           }
+
+           Itm->Owner->Failed(Message);
+           OwnerQ->ItemDone(Itm);
+           break;
+        }       
         
         // 401 General Failure
         case 401: