Add a GetListOfFilesInDir() helper method which replaces the old

[apt.git] / methods / file.cc

diff --git a/methods/file.cc b/methods/file.cc
index fc42c296833c154798641ace3ce701eec7d0b201..9cdd5bc2d3b3a3ea9ff14f2732ef832780e146cd 100644 (file)
--- a/methods/file.cc
+++ b/methods/file.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: file.cc,v 1.3 1998/10/23 00:50:02 jgg Exp $
+// $Id: file.cc,v 1.9.2.1 2004/01/16 18:58:50 mdz Exp $
 /* ######################################################################
 
    File URI method for APT
@@ -13,132 +13,84 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
+#include <apt-pkg/acquire-method.h>
+#include <apt-pkg/error.h>
+#include <apt-pkg/hashes.h>
 #include <apt-pkg/fileutl.h>
-#include <strutl.h>
 
 #include <sys/stat.h>
 #include <unistd.h>
-#include <stdio.h>
+#include <apti18n.h>
                                                                        /*}}}*/
 
-// Fail - Generate a failure message                                   /*{{{*/
+class FileMethod : public pkgAcqMethod
+{
+   virtual bool Fetch(FetchItem *Itm);
+   
+   public:
+   
+   FileMethod() : pkgAcqMethod("1.0",SingleInstance | LocalOnly) {};
+};
+
+// FileMethod::Fetch - Fetch a file                                    /*{{{*/
 // ---------------------------------------------------------------------
 /* */
-void Fail(string URI)
+bool FileMethod::Fetch(FetchItem *Itm)
 {
-   printf("400 URI Failure\n"
-         "URI: %s\n"
-         "Message: File does not exist\n\n",URI.c_str());
-}
-                                                                       /*}}}*/
+   URI Get = Itm->Uri;
+   string File = Get.Path;
+   FetchResult Res;
+   if (Get.Host.empty() == false)
+      return _error->Error(_("Invalid URI, local URIS must not start with //"));
 
-int main()
-{
-   setlinebuf(stdout);
-   SetNonBlock(STDIN_FILENO,true);
+   // See if the file exists
+   struct stat Buf;
+   if (stat(File.c_str(),&Buf) == 0)
+   {
+      Res.Size = Buf.st_size;
+      Res.Filename = File;
+      Res.LastModified = Buf.st_mtime;
+      Res.IMSHit = false;
+      if (Itm->LastModified == Buf.st_mtime && Itm->LastModified != 0)
+        Res.IMSHit = true;
+   }
    
-   printf("100 Capabilities\n"
-         "Version: 1.0\n"
-         "Pipeline: true\n\n");
-      
-   vector<string> Messages;   
-   while (1)
+   // See if we can compute a file without a .gz exentsion
+   string::size_type Pos = File.rfind(".gz");
+   if (Pos + 3 == File.length())
    {
-      if (WaitFd(STDIN_FILENO) == false ||
-         ReadMessages(STDIN_FILENO,Messages) == false)
-        return 0;
-
-      while (Messages.empty() == false)
+      File = string(File,0,Pos);
+      if (stat(File.c_str(),&Buf) == 0)
       {
-        string Message = Messages.front();
-        Messages.erase(Messages.begin());
-        
-        // Fetch the message number
-        char *End;
-        int Number = strtol(Message.c_str(),&End,10);
-        if (End == Message.c_str())
-        {
-           cerr << "Malformed message!" << endl;
-           return 100;
-        }
-        
-        // We only understand 600 URI Fetch messages
-        if (Number != 600)
-           continue;
-        
-        // Grab the URI bit 
-        string URI = LookupTag(Message,"URI");
+        FetchResult AltRes;
+        AltRes.Size = Buf.st_size;
+        AltRes.Filename = File;
+        AltRes.LastModified = Buf.st_mtime;
+        AltRes.IMSHit = false;
+        if (Itm->LastModified == Buf.st_mtime && Itm->LastModified != 0)
+           AltRes.IMSHit = true;
         
-        // Grab the filename
-        string::size_type Pos = URI.find(':');
-        if (Pos == string::npos)
-        {
-           Fail(URI);
-           continue;
-        }
-        string File = string(URI,Pos+1);
-        
-        // Grab the modification time
-        time_t LastMod;
-        string LTime = LookupTag(Message,"Last-Modified");
-        if (LTime.empty() == false && StrToTime(LTime,LastMod) == false)
-           LTime = string();
-        
-        // Start the reply message
-        string Result = "201 URI Done";
-        Result += "\nURI: " + URI;
-
-        // See if the file exists
-        struct stat Buf;
-        bool Ok = false;
-        if (stat(File.c_str(),&Buf) == 0)
-        {
-           char S[300];
-           sprintf(S,"\nSize: %ld",Buf.st_size);
-           
-           Result += "\nFilename: " + File;
-           Result += S;
-           Result += "\nLast-Modified: " + TimeRFC1123(Buf.st_mtime);
-           if (LTime.empty() == false && LastMod == Buf.st_mtime)
-              Result += "\nIMS-Hit: true";
-               
-           Ok = true;
-        }
-        
-        // See if we can compute a file without a .gz exentsion
-        Pos = File.rfind(".gz");
-        if (Pos + 3 == File.length())
-        {
-           File = string(File,0,Pos);
-           if (stat(File.c_str(),&Buf) == 0)
-           {
-              char S[300];
-              sprintf(S,"\nAlt-Size: %ld",Buf.st_size);
-              
-              Result += "\nAlt-Filename: " + File;
-              Result += S;
-              Result += "\nAlt-Last-Modified: " + TimeRFC1123(Buf.st_mtime);
-              if (LTime.empty() == false && LastMod == Buf.st_mtime)
-                 Result += "\nAlt-IMS-Hit: true";
-              
-              Ok = true;
-           }
-        }
-        
-        // Did we find something?
-        if (Ok == false)
-        {
-           Fail(URI);
-           continue;
-        }
-        Result += "\n\n";
-        
-        // Send the message
-        if (write(STDOUT_FILENO,Result.begin(),Result.length()) != 
-            (signed)Result.length())
-           return 100;
+        URIDone(Res,&AltRes);
+        return true;
       }      
    }
    
-   return 0;
+   if (Res.Filename.empty() == true)
+      return _error->Error(_("File not found"));
+
+   Hashes Hash;
+   FileFd Fd(Res.Filename, FileFd::ReadOnly);
+   Hash.AddFD(Fd.Fd(), Fd.Size());
+   Res.TakeHashes(Hash);
+   URIDone(Res);
+   return true;
+}
+                                                                       /*}}}*/
+
+int main()
+{
+   setlocale(LC_ALL, "");
+
+   FileMethod Mth;
+   return Mth.Run();
 }