add {contrib,non-free}/{metapackages,oldlibs} to section specialhandling

[apt.git] / apt-pkg / deb / debindexfile.cc

diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc
index e9c7b063838288e6601a2ef06b0fefc2eb953b97..627cd36c5327dc35b0f9465e83974834e512bd50 100644 (file)
--- a/apt-pkg/deb/debindexfile.cc
+++ b/apt-pkg/deb/debindexfile.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: debindexfile.cc,v 1.6 2004/01/04 07:41:30 mdz Exp $
+// $Id: debindexfile.cc,v 1.5.2.3 2004/01/04 19:11:00 mdz Exp $

 /* ######################################################################
 
    Debian Specific sources.list types and the three sorts of Debian
 /* ######################################################################
 
    Debian Specific sources.list types and the three sorts of Debian


@@ -9,49 +9,49 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

-#ifdef __GNUG__
-#pragma implementation "apt-pkg/debindexfile.h"
-#endif
+#include <config.h>

 
 #include <apt-pkg/debindexfile.h>
 #include <apt-pkg/debsrcrecords.h>
 #include <apt-pkg/deblistparser.h>
 #include <apt-pkg/debrecords.h>
 
 #include <apt-pkg/debindexfile.h>
 #include <apt-pkg/debsrcrecords.h>
 #include <apt-pkg/deblistparser.h>
 #include <apt-pkg/debrecords.h>

-#include <apt-pkg/sourcelist.h>

 #include <apt-pkg/configuration.h>
 #include <apt-pkg/progress.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/acquire-item.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/progress.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/acquire-item.h>

-    
+#include <apt-pkg/debmetaindex.h>
+#include <apt-pkg/gpgv.h>
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/indexfile.h>
+#include <apt-pkg/mmap.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
+#include <apt-pkg/pkgcachegen.h>
+#include <apt-pkg/pkgrecords.h>
+#include <apt-pkg/srcrecords.h>
+#include <apt-pkg/sptr.h>
+
+#include <stdio.h>
+#include <iostream>
+#include <sstream>
+#include <string>
+#include <memory>

 #include <sys/stat.h>
                                                                        /*}}}*/
 
 #include <sys/stat.h>
                                                                        /*}}}*/
 

-// SourcesIndex::debSourcesIndex - Constructor                         /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-debSourcesIndex::debSourcesIndex(string URI,string Dist,string Section) :
-                                     URI(URI), Dist(Dist), Section(Section)
+// Sources Index                                                       /*{{{*/
+debSourcesIndex::debSourcesIndex(IndexTarget const &Target,bool const Trusted) :
+     pkgDebianIndexTargetFile(Target, Trusted), d(NULL)

 {
 }
 {
 }

-                                                                       /*}}}*/
-// SourcesIndex::SourceInfo - Short 1 liner describing a source                /*{{{*/
-// ---------------------------------------------------------------------
-/* The result looks like:
-     http://foo/ stable/main src 1.1.1 (dsc) */
-string debSourcesIndex::SourceInfo(pkgSrcRecords::Parser const &Record,
+std::string debSourcesIndex::SourceInfo(pkgSrcRecords::Parser const &Record,

                                   pkgSrcRecords::File const &File) const
 {
                                   pkgSrcRecords::File const &File) const
 {

-   string Res;
-   Res = ::URI::SiteOnly(URI) + ' ';
-   if (Dist[Dist.size() - 1] == '/')
-   {
-      if (Dist != "/")
-        Res += Dist;
-   }      
-   else
-      Res += Dist + '/' + Section;
-   
+   // The result looks like: http://foo/debian/ stable/main src 1.1.1 (dsc)
+   std::string Res = Target.Description;
+   Res.erase(Target.Description.rfind(' '));
+

    Res += " ";
    Res += Record.Package();
    Res += " ";
    Res += " ";
    Res += Record.Package();
    Res += " ";


@@ -60,436 +60,272 @@ string debSourcesIndex::SourceInfo(pkgSrcRecords::Parser const &Record,
       Res += " (" + File.Type + ")";
    return Res;
 }
       Res += " (" + File.Type + ")";
    return Res;
 }

-                                                                       /*}}}*/
-// SourcesIndex::CreateSrcParser - Get a parser for the source files   /*{{{*/
-// ---------------------------------------------------------------------
-/* */

 pkgSrcRecords::Parser *debSourcesIndex::CreateSrcParser() const
 {
 pkgSrcRecords::Parser *debSourcesIndex::CreateSrcParser() const
 {

-   string SourcesURI = URItoFileName(IndexURI("Sources"));
-   return new debSrcRecordParser(_config->FindDir("Dir::State::lists") +
-                                SourcesURI,this);
+   std::string const SourcesURI = IndexFileName();
+   if (FileExists(SourcesURI))
+      return new debSrcRecordParser(SourcesURI, this);
+   return NULL;

 }
 }

-                                                                       /*}}}*/
-// SourcesIndex::Describe - Give a descriptive path to the index       /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-string debSourcesIndex::Describe(bool Short) const
-{
-   char S[300];
-   if (Short == true)
-      snprintf(S,sizeof(S),"%s",Info("Sources").c_str());
-   else
-      snprintf(S,sizeof(S),"%s (%s)",Info("Sources").c_str(),
-              IndexFile("Sources").c_str());
-   
-   return S;
+bool debSourcesIndex::OpenListFile(FileFd &, std::string const &)
+{
+   return true;

 }
 }

-                                                                       /*}}}*/
-// SourcesIndex::Info - One liner describing the index URI             /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-string debSourcesIndex::Info(const char *Type) const
+pkgCacheListParser * debSourcesIndex::CreateListParser(FileFd &)

 {
 {

-   string Info = ::URI::SiteOnly(URI) + ' ';
-   if (Dist[Dist.size() - 1] == '/')
-   {
-      if (Dist != "/")
-        Info += Dist;
-   }
-   else
-      Info += Dist + '/' + Section;   
-   Info += " ";
-   Info += Type;
-   return Info;
+   return NULL;
+}
+uint8_t debSourcesIndex::GetIndexFlags() const
+{
+   return 0;

 }
                                                                        /*}}}*/
 }
                                                                        /*}}}*/

-// SourcesIndex::Index* - Return the URI to the index files            /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-inline string debSourcesIndex::IndexFile(const char *Type) const
+// Packages Index                                                      /*{{{*/
+debPackagesIndex::debPackagesIndex(IndexTarget const &Target, bool const Trusted) :
+                  pkgDebianIndexTargetFile(Target, Trusted), d(NULL)

 {
 {

-   return URItoFileName(IndexURI(Type));

 }
 }

-string debSourcesIndex::IndexURI(const char *Type) const
+std::string debPackagesIndex::ArchiveInfo(pkgCache::VerIterator const &Ver) const

 {
 {

-   string Res;
-   if (Dist[Dist.size() - 1] == '/')
-   {
-      if (Dist != "/")
-        Res = URI + Dist;
-      else 
-        Res = URI;
-   }
-   else
-      Res = URI + "dists/" + Dist + '/' + Section +
-      "/source/";
-   
-   Res += Type;
+   std::string Res = Target.Description;
+   Res.erase(Target.Description.rfind(' '));
+
+   Res += " ";
+   Res += Ver.ParentPkg().Name();
+   Res += " ";
+   std::string const Dist = Target.Option(IndexTarget::RELEASE);
+   if (Dist.empty() == false && Dist[Dist.size() - 1] != '/')
+      Res.append(Ver.Arch()).append(" ");
+   Res += Ver.VerStr();

    return Res;
 }
    return Res;
 }

-                                                                       /*}}}*/
-// SourcesIndex::GetIndexes - Fetch the index files                    /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-bool debSourcesIndex::GetIndexes(pkgAcquire *Owner) const
+uint8_t debPackagesIndex::GetIndexFlags() const

 {
 {

-   new pkgAcqIndex(Owner,IndexURI("Sources"),Info("Sources"),"Sources");
-   new pkgAcqIndexRel(Owner,IndexURI("Release"),Info("Release"),"Release");
-   return true;
+   return 0;

 }
                                                                        /*}}}*/
 }
                                                                        /*}}}*/

-// SourcesIndex::Exists - Check if the index is available              /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-bool debSourcesIndex::Exists() const
+// Translation-* Index                                                 /*{{{*/
+debTranslationsIndex::debTranslationsIndex(IndexTarget const &Target) :
+                       pkgDebianIndexTargetFile(Target, true), d(NULL)
+{}
+bool debTranslationsIndex::HasPackages() const

 {
 {

-   return FileExists(IndexFile("Sources"));
+   return Exists();

 }
 }

-                                                                       /*}}}*/
-// SourcesIndex::Size - Return the size of the index                   /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-unsigned long debSourcesIndex::Size() const
+bool debTranslationsIndex::OpenListFile(FileFd &Pkg, std::string const &FileName)

 {
 {

-   struct stat S;
-   if (stat(IndexFile("Sources").c_str(),&S) != 0)
-      return 0;
-   return S.st_size;
+   if (FileExists(FileName))
+      return pkgDebianIndexTargetFile::OpenListFile(Pkg, FileName);
+   return true;

 }
 }

-                                                                       /*}}}*/
-
-// PackagesIndex::debPackagesIndex - Contructor                                /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-debPackagesIndex::debPackagesIndex(string URI,string Dist,string Section) : 
-                  URI(URI), Dist(Dist), Section(Section)
+uint8_t debTranslationsIndex::GetIndexFlags() const

 {
 {

+   return pkgCache::Flag::NotSource | pkgCache::Flag::NoPackages;

 }
 }

-                                                                       /*}}}*/
-// PackagesIndex::ArchiveInfo - Short version of the archive url       /*{{{*/
-// ---------------------------------------------------------------------
-/* This is a shorter version that is designed to be < 60 chars or so */
-string debPackagesIndex::ArchiveInfo(pkgCache::VerIterator Ver) const
+std::string debTranslationsIndex::GetArchitecture() const

 {
 {

-   string Res = ::URI::SiteOnly(URI) + ' ';
-   if (Dist[Dist.size() - 1] == '/')
-   {
-      if (Dist != "/")
-        Res += Dist;
-   }
-   else
-      Res += Dist + '/' + Section;
-   
-   Res += " ";
-   Res += Ver.ParentPkg().Name();
-   Res += " ";
-   Res += Ver.VerStr();
-   return Res;
+   return std::string();

 }
 }

-                                                                       /*}}}*/
-// PackagesIndex::Describe - Give a descriptive path to the index      /*{{{*/
-// ---------------------------------------------------------------------
-/* This should help the user find the index in the sources.list and
-   in the filesystem for problem solving */
-string debPackagesIndex::Describe(bool Short) const
-{   
-   char S[300];
-   if (Short == true)
-      snprintf(S,sizeof(S),"%s",Info("Packages").c_str());
-   else
-      snprintf(S,sizeof(S),"%s (%s)",Info("Packages").c_str(),
-              IndexFile("Packages").c_str());
-   return S;
+pkgCacheListParser * debTranslationsIndex::CreateListParser(FileFd &Pkg)
+{
+   if (Pkg.IsOpen() == false)
+      return NULL;
+   _error->PushToStack();
+   pkgCacheListParser * const Parser = new debTranslationsParser(&Pkg);
+   bool const newError = _error->PendingError();
+   _error->MergeWithStack();
+   return newError ? NULL : Parser;

 }
                                                                        /*}}}*/
 }
                                                                        /*}}}*/

-// PackagesIndex::Info - One liner describing the index URI            /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-string debPackagesIndex::Info(const char *Type) const 
+// dpkg/status Index                                                   /*{{{*/
+debStatusIndex::debStatusIndex(std::string const &File) : pkgDebianIndexRealFile(File, true), d(NULL)

 {
 {

-   string Info = ::URI::SiteOnly(URI) + ' ';
-   if (Dist[Dist.size() - 1] == '/')
-   {
-      if (Dist != "/")
-        Info += Dist;
-   }
-   else
-      Info += Dist + '/' + Section;   
-   Info += " ";
-   Info += Type;
-   return Info;

 }
 }

-                                                                       /*}}}*/
-// PackagesIndex::Index* - Return the URI to the index files           /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-inline string debPackagesIndex::IndexFile(const char *Type) const
+std::string debStatusIndex::GetArchitecture() const

 {
 {

-   return _config->FindDir("Dir::State::lists") + URItoFileName(IndexURI(Type));
+   return std::string();

 }
 }

-string debPackagesIndex::IndexURI(const char *Type) const
+std::string debStatusIndex::GetComponent() const

 {
 {

-   string Res;
-   if (Dist[Dist.size() - 1] == '/')
-   {
-      if (Dist != "/")
-        Res = URI + Dist;
-      else 
-        Res = URI;
-   }
-   else
-      Res = URI + "dists/" + Dist + '/' + Section +
-      "/binary-" + _config->Find("APT::Architecture") + '/';
-   
-   Res += Type;
-   return Res;
+   return "now";

 }
 }

-                                                                       /*}}}*/
-// PackagesIndex::GetIndexes - Fetch the index files                   /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-bool debPackagesIndex::GetIndexes(pkgAcquire *Owner) const
+uint8_t debStatusIndex::GetIndexFlags() const

 {
 {

-   new pkgAcqIndex(Owner,IndexURI("Packages"),Info("Packages"),"Packages");
-   new pkgAcqIndexRel(Owner,IndexURI("Release"),Info("Release"),"Release");
-   return true;
+   return pkgCache::Flag::NotSource;

 }
                                                                        /*}}}*/
 }
                                                                        /*}}}*/

-// PackagesIndex::Exists - Check if the index is available             /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-bool debPackagesIndex::Exists() const
+// DebPkgFile Index - a single .deb file as an index                   /*{{{*/
+debDebPkgFileIndex::debDebPkgFileIndex(std::string const &DebFile)
+   : pkgDebianIndexRealFile(DebFile, true), d(NULL), DebFile(DebFile)

 {
 {

-   return FileExists(IndexFile("Packages"));

 }
 }

-                                                                       /*}}}*/
-// PackagesIndex::Size - Return the size of the index                  /*{{{*/
-// ---------------------------------------------------------------------
-/* This is really only used for progress reporting. */
-unsigned long debPackagesIndex::Size() const
+bool debDebPkgFileIndex::GetContent(std::ostream &content, std::string const &debfile)

 {
 {

-   struct stat S;
-   if (stat(IndexFile("Packages").c_str(),&S) != 0)
-      return 0;
-   return S.st_size;
-}
-                                                                       /*}}}*/
-// PackagesIndex::Merge - Load the index file into a cache             /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-bool debPackagesIndex::Merge(pkgCacheGenerator &Gen,OpProgress &Prog) const
-{
-   string PackageFile = IndexFile("Packages");
-   FileFd Pkg(PackageFile,FileFd::ReadOnly);
-   debListParser Parser(&Pkg);
-   if (_error->PendingError() == true)
-      return _error->Error("Problem opening %s",PackageFile.c_str());
-   
-   Prog.SubProgress(0,Info("Packages"));
-   ::URI Tmp(URI);
-   if (Gen.SelectFile(PackageFile,Tmp.Host,*this) == false)
-      return _error->Error("Problem with SelectFile %s",PackageFile.c_str());
+   struct stat Buf;
+   if (stat(debfile.c_str(), &Buf) != 0)
+      return false;

 
 

-   // Store the IMS information
-   pkgCache::PkgFileIterator File = Gen.GetCurFile();
-   struct stat St;
-   if (fstat(Pkg.Fd(),&St) != 0)
-      return _error->Errno("fstat","Failed to stat");
-   File->Size = St.st_size;
-   File->mtime = St.st_mtime;
-   
-   if (Gen.MergeList(Parser) == false)
-      return _error->Error("Problem with MergeList %s",PackageFile.c_str());
+   // get the control data out of the deb file via dpkg-deb -I
+   std::string dpkg = _config->Find("Dir::Bin::dpkg","dpkg-deb");
+   std::vector<const char *> Args;
+   Args.push_back(dpkg.c_str());
+   Args.push_back("-I");
+   Args.push_back(debfile.c_str());
+   Args.push_back("control");
+   Args.push_back(NULL);
+   FileFd PipeFd;
+   pid_t Child;
+   if(Popen((const char**)&Args[0], PipeFd, Child, FileFd::ReadOnly) == false)
+      return _error->Error("Popen failed");
+
+   char buffer[1024];
+   do {
+      unsigned long long actual = 0;
+      if (PipeFd.Read(buffer, sizeof(buffer)-1, &actual) == false)
+        return _error->Errno("read", "Failed to read dpkg pipe");
+      if (actual == 0)
+        break;
+      buffer[actual] = '\0';
+      content << buffer;
+   } while(true);
+   ExecWait(Child, "Popen");
+
+   content << "Filename: " << debfile << "\n";
+   content << "Size: " << Buf.st_size << "\n";

 
 

-   // Check the release file
-   string ReleaseFile = IndexFile("Release");
-   if (FileExists(ReleaseFile) == true)
-   {
-      FileFd Rel(ReleaseFile,FileFd::ReadOnly);
-      if (_error->PendingError() == true)
-        return false;
-      Parser.LoadReleaseInfo(File,Rel);
-   }
-   

    return true;
 }
    return true;
 }

-                                                                       /*}}}*/
-// PackagesIndex::FindInCache - Find this index                                /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-pkgCache::PkgFileIterator debPackagesIndex::FindInCache(pkgCache &Cache) const
+bool debDebPkgFileIndex::OpenListFile(FileFd &Pkg, std::string const &FileName)

 {
 {

-   string FileName = IndexFile("Packages");
-   pkgCache::PkgFileIterator File = Cache.FileBegin();
-   for (; File.end() == false; File++)
-   {
-      if (FileName != File.FileName())
-        continue;
-      
-      struct stat St;
-      if (stat(File.FileName(),&St) != 0)
-        return pkgCache::PkgFileIterator(Cache);
-      if ((unsigned)St.st_size != File->Size || St.st_mtime != File->mtime)
-        return pkgCache::PkgFileIterator(Cache);
-      return File;
-   }
-   
-   return File;
+   // write the control data to a tempfile
+   if (GetTempFile("deb-file-" + flNotDir(FileName), true, &Pkg) == NULL)
+      return false;
+   std::ostringstream content;
+   if (GetContent(content, FileName) == false)
+      return false;
+   std::string const contentstr = content.str();
+   if (contentstr.empty())
+      return true;
+   if (Pkg.Write(contentstr.c_str(), contentstr.length()) == false || Pkg.Seek(0) == false)
+      return false;
+   return true;

 }
 }

-                                                                       /*}}}*/
-
-// StatusIndex::debStatusIndex - Constructor                           /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-debStatusIndex::debStatusIndex(string File) : File(File)
+pkgCacheListParser * debDebPkgFileIndex::CreateListParser(FileFd &Pkg)
+{
+   if (Pkg.IsOpen() == false)
+      return NULL;
+   _error->PushToStack();
+   pkgCacheListParser * const Parser = new debDebFileParser(&Pkg, DebFile);
+   bool const newError = _error->PendingError();
+   _error->MergeWithStack();
+   return newError ? NULL : Parser;
+}
+uint8_t debDebPkgFileIndex::GetIndexFlags() const

 {
 {

+   return pkgCache::Flag::LocalSource;

 }
 }

-                                                                       /*}}}*/
-// StatusIndex::Size - Return the size of the index                    /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-unsigned long debStatusIndex::Size() const
+std::string debDebPkgFileIndex::GetArchitecture() const

 {
 {

-   struct stat S;
-   if (stat(File.c_str(),&S) != 0)
-      return 0;
-   return S.st_size;
+   return std::string();

 }
 }

-                                                                       /*}}}*/
-// StatusIndex::Merge - Load the index file into a cache               /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-bool debStatusIndex::Merge(pkgCacheGenerator &Gen,OpProgress &Prog) const
+std::string debDebPkgFileIndex::GetComponent() const

 {
 {

-   FileFd Pkg(File,FileFd::ReadOnly);
-   if (_error->PendingError() == true)
-      return false;
-   debListParser Parser(&Pkg);
-   if (_error->PendingError() == true)
-      return false;
-   
-   Prog.SubProgress(0,File);
-   if (Gen.SelectFile(File,string(),*this,pkgCache::Flag::NotSource) == false)
-      return _error->Error("Problem with SelectFile %s",File.c_str());
-
-   // Store the IMS information
-   pkgCache::PkgFileIterator CFile = Gen.GetCurFile();
-   struct stat St;
-   if (fstat(Pkg.Fd(),&St) != 0)
-      return _error->Errno("fstat","Failed to stat");
-   CFile->Size = St.st_size;
-   CFile->mtime = St.st_mtime;
-   CFile->Archive = Gen.WriteUniqString("now");
-   
-   if (Gen.MergeList(Parser) == false)
-      return _error->Error("Problem with MergeList %s",File.c_str());   
-   return true;
+   return "local-deb";

 }
 }

-                                                                       /*}}}*/
-// StatusIndex::FindInCache - Find this index                          /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-pkgCache::PkgFileIterator debStatusIndex::FindInCache(pkgCache &Cache) const
+pkgCache::PkgFileIterator debDebPkgFileIndex::FindInCache(pkgCache &Cache) const

 {
 {

+   std::string const FileName = IndexFileName();

    pkgCache::PkgFileIterator File = Cache.FileBegin();
    pkgCache::PkgFileIterator File = Cache.FileBegin();

-   for (; File.end() == false; File++)
+   for (; File.end() == false; ++File)

    {
    {

-      if (this->File != File.FileName())
+       if (File.FileName() == NULL || FileName != File.FileName())

         continue;
         continue;

-      
-      struct stat St;
-      if (stat(File.FileName(),&St) != 0)
-        return pkgCache::PkgFileIterator(Cache);
-      if ((unsigned)St.st_size != File->Size || St.st_mtime != File->mtime)
-        return pkgCache::PkgFileIterator(Cache);
+      // we can't do size checks here as file size != content size

       return File;
       return File;

-   }   
+   }
+

    return File;
 }
    return File;
 }

+

                                                                        /*}}}*/
                                                                        /*}}}*/

-// StatusIndex::Exists - Check if the index is available               /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-bool debStatusIndex::Exists() const
+// DscFile Index - a single .dsc file as an index                      /*{{{*/
+debDscFileIndex::debDscFileIndex(std::string const &DscFile)
+   : pkgDebianIndexRealFile(DscFile, true), d(NULL)

 {
 {

-   // Abort if the file does not exist.
-   return true;
+}
+pkgSrcRecords::Parser *debDscFileIndex::CreateSrcParser() const
+{
+   if (Exists() == false)
+      return NULL;
+   return new debDscRecordParser(File, this);

 }
                                                                        /*}}}*/
 
 }
                                                                        /*}}}*/
 

-// Source List types for Debian                                                /*{{{*/
-class debSLTypeDeb : public pkgSourceList::Type
+// Index File types for Debian                                         /*{{{*/
+class APT_HIDDEN debIFTypeSrc : public pkgIndexFile::Type

 {
    public:
 {
    public:

-
-   bool CreateItem(vector<pkgIndexFile *> &List,string URI,
-                  string Dist,string Section,
-                  pkgSourceList::Vendor const *Vendor) const
+   debIFTypeSrc() {Label = "Debian Source Index";};
+};
+class APT_HIDDEN debIFTypePkg : public pkgIndexFile::Type
+{
+   public:
+   virtual pkgRecords::Parser *CreatePkgParser(pkgCache::PkgFileIterator const &File) const APT_OVERRIDE

    {
    {

-      List.push_back(new debPackagesIndex(URI,Dist,Section));
-      return true;
+      return new debRecordParser(File.FileName(),*File.Cache());

    };
    };

-
-   debSLTypeDeb()
-   {
-      Name = "deb";
-      Label = "Standard Debian binary tree";
-   }   
+   debIFTypePkg() {Label = "Debian Package Index";};

 };
 };

-
-class debSLTypeDebSrc : public pkgSourceList::Type
+class APT_HIDDEN debIFTypeTrans : public debIFTypePkg

 {
    public:
 {
    public:

-
-   bool CreateItem(vector<pkgIndexFile *> &List,string URI,
-                  string Dist,string Section,
-                  pkgSourceList::Vendor const *Vendor) const 
-   {      
-      List.push_back(new debSourcesIndex(URI,Dist,Section));
-      return true;
-   };  
-   
-   debSLTypeDebSrc()
+   debIFTypeTrans() {Label = "Debian Translation Index";};
+};
+class APT_HIDDEN debIFTypeStatus : public pkgIndexFile::Type
+{
+   public:
+   virtual pkgRecords::Parser *CreatePkgParser(pkgCache::PkgFileIterator const &File) const APT_OVERRIDE

    {
    {

-      Name = "deb-src";
-      Label = "Standard Debian source tree";
-   }   
+      return new debRecordParser(File.FileName(),*File.Cache());
+   };
+   debIFTypeStatus() {Label = "Debian dpkg status file";};

 };
 };

-
-debSLTypeDeb _apt_DebType;
-debSLTypeDebSrc _apt_DebSrcType;
-                                                                       /*}}}*/
-// Index File types for Debian                                         /*{{{*/
-class debIFTypeSrc : public pkgIndexFile::Type
+class APT_HIDDEN debIFTypeDebPkgFile : public pkgIndexFile::Type

 {
    public:
 {
    public:

-   
-   debIFTypeSrc() {Label = "Debian Source Index";};
+   virtual pkgRecords::Parser *CreatePkgParser(pkgCache::PkgFileIterator const &File) const APT_OVERRIDE
+   {
+      return new debDebFileRecordParser(File.FileName());
+   };
+   debIFTypeDebPkgFile() {Label = "Debian deb file";};

 };
 };

-class debIFTypePkg : public pkgIndexFile::Type
+class APT_HIDDEN debIFTypeDscFile : public pkgIndexFile::Type

 {
    public:
 {
    public:

-   
-   virtual pkgRecords::Parser *CreatePkgParser(pkgCache::PkgFileIterator File) const 
+   virtual pkgSrcRecords::Parser *CreateSrcPkgParser(std::string const &DscFile) const APT_OVERRIDE

    {
    {

-      return new debRecordParser(File.FileName(),*File.Cache());
+      return new debDscRecordParser(DscFile, NULL);

    };
    };

-   debIFTypePkg() {Label = "Debian Package Index";};
+   debIFTypeDscFile() {Label = "Debian dsc file";};

 };
 };

-class debIFTypeStatus : public pkgIndexFile::Type
+class APT_HIDDEN debIFTypeDebianSourceDir : public pkgIndexFile::Type

 {
    public:
 {
    public:

-   
-   virtual pkgRecords::Parser *CreatePkgParser(pkgCache::PkgFileIterator File) const 
+   virtual pkgSrcRecords::Parser *CreateSrcPkgParser(std::string const &SourceDir) const APT_OVERRIDE

    {
    {

-      return new debRecordParser(File.FileName(),*File.Cache());
+      return new debDscRecordParser(SourceDir + std::string("/debian/control"), NULL);

    };
    };

-   debIFTypeStatus() {Label = "Debian dpkg status file";};
+   debIFTypeDebianSourceDir() {Label = "Debian control file";};

 };
 };

-static debIFTypeSrc _apt_Src;
-static debIFTypePkg _apt_Pkg;
-static debIFTypeStatus _apt_Status;
+
+APT_HIDDEN debIFTypeSrc _apt_Src;
+APT_HIDDEN debIFTypePkg _apt_Pkg;
+APT_HIDDEN debIFTypeTrans _apt_Trans;
+APT_HIDDEN debIFTypeStatus _apt_Status;
+APT_HIDDEN debIFTypeDebPkgFile _apt_DebPkgFile;
+// file based pseudo indexes
+APT_HIDDEN debIFTypeDscFile _apt_DscFile;
+APT_HIDDEN debIFTypeDebianSourceDir _apt_DebianSourceDir;

 
 const pkgIndexFile::Type *debSourcesIndex::GetType() const
 {
 
 const pkgIndexFile::Type *debSourcesIndex::GetType() const
 {


@@ -499,9 +335,32 @@ const pkgIndexFile::Type *debPackagesIndex::GetType() const
 {
    return &_apt_Pkg;
 }
 {
    return &_apt_Pkg;
 }

+const pkgIndexFile::Type *debTranslationsIndex::GetType() const
+{
+   return &_apt_Trans;
+}

 const pkgIndexFile::Type *debStatusIndex::GetType() const
 {
    return &_apt_Status;
 }
 const pkgIndexFile::Type *debStatusIndex::GetType() const
 {
    return &_apt_Status;
 }

-
+const pkgIndexFile::Type *debDebPkgFileIndex::GetType() const
+{
+   return &_apt_DebPkgFile;
+}
+const pkgIndexFile::Type *debDscFileIndex::GetType() const
+{
+   return &_apt_DscFile;
+}
+const pkgIndexFile::Type *debDebianSourceDirIndex::GetType() const
+{
+   return &_apt_DebianSourceDir;
+}

                                                                        /*}}}*/
                                                                        /*}}}*/

+
+debStatusIndex::~debStatusIndex() {}
+debPackagesIndex::~debPackagesIndex() {}
+debTranslationsIndex::~debTranslationsIndex() {}
+debSourcesIndex::~debSourcesIndex() {}
+
+debDebPkgFileIndex::~debDebPkgFileIndex() {}
+debDscFileIndex::~debDscFileIndex() {}