elimate duplicated code in pkgIndexFile subclasses

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

diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc
index d672b4fd86afa7dd59c8aeeaf711c03256860cf6..627cd36c5327dc35b0f9465e83974834e512bd50 100644 (file)
--- a/apt-pkg/deb/debindexfile.cc
+++ b/apt-pkg/deb/debindexfile.cc
@@ -36,36 +36,22 @@
 #include <iostream>
 #include <sstream>
 #include <string>
 #include <iostream>
 #include <sstream>
 #include <string>

+#include <memory>

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

-using std::string;
-
-// SourcesIndex::debSourcesIndex - Constructor                         /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-debSourcesIndex::debSourcesIndex(string URI,string Dist,string Section,bool Trusted) :
-     pkgIndexFile(Trusted), 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/debian/ 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::NoUserPassword(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 += " ";


@@ -74,622 +60,111 @@ 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 = _config->FindDir("Dir::State::lists") + 
-      URItoFileName(IndexURI("Sources"));
-
-   std::vector<std::string> types = APT::Configuration::getCompressionTypes();
-   for (std::vector<std::string>::const_iterator t = types.begin(); t != types.end(); ++t)
-   {
-      string p;
-      p = SourcesURI + '.' + *t;
-      if (FileExists(p))
-         return new debSrcRecordParser(p, this);
-   }
+   std::string const SourcesURI = IndexFileName();

    if (FileExists(SourcesURI))
       return new debSrcRecordParser(SourcesURI, this);
    return NULL;
 }
    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;
-}
-                                                                       /*}}}*/
-// SourcesIndex::Info - One liner describing the index URI             /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-string debSourcesIndex::Info(const char *Type) const
+bool debSourcesIndex::OpenListFile(FileFd &, std::string const &)

 {
 {

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

 }
 }

-                                                                       /*}}}*/
-// SourcesIndex::Index* - Return the URI to the index files            /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-string debSourcesIndex::IndexFile(const char *Type) const
+pkgCacheListParser * debSourcesIndex::CreateListParser(FileFd &)

 {
 {

-   string s = URItoFileName(IndexURI(Type));
-
-   std::vector<std::string> types = APT::Configuration::getCompressionTypes();
-   for (std::vector<std::string>::const_iterator t = types.begin(); t != types.end(); ++t)
-   {
-      string p = s + '.' + *t;
-      if (FileExists(p))
-         return p;
-   }
-   return s;
+   return NULL;

 }
 }

-
-string debSourcesIndex::IndexURI(const char *Type) const
+uint8_t debSourcesIndex::GetIndexFlags() 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;
-   return Res;
+   return 0;

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

-// SourcesIndex::Exists - Check if the index is available              /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-bool debSourcesIndex::Exists() const
+// Packages Index                                                      /*{{{*/
+debPackagesIndex::debPackagesIndex(IndexTarget const &Target, bool const Trusted) :
+                  pkgDebianIndexTargetFile(Target, Trusted), d(NULL)

 {
 {

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

 }
 }

-                                                                       /*}}}*/
-// SourcesIndex::Size - Return the size of the index                   /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-unsigned long debSourcesIndex::Size() const
+std::string debPackagesIndex::ArchiveInfo(pkgCache::VerIterator const &Ver) const

 {
 {

-   unsigned long size = 0;
-
-   /* we need to ignore errors here; if the lists are absent, just return 0 */
-   _error->PushToStack();
-
-   FileFd f(IndexFile("Sources"), FileFd::ReadOnly, FileFd::Extension);
-   if (!f.Failed())
-      size = f.Size();
+   std::string Res = Target.Description;
+   Res.erase(Target.Description.rfind(' '));

 
 

-   if (_error->PendingError() == true)
-       size = 0;
-   _error->RevertToStack();
-
-   return size;
-}
-                                                                       /*}}}*/
-
-// PackagesIndex::debPackagesIndex - Contructor                                /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-debPackagesIndex::debPackagesIndex(string const &URI, string const &Dist, string const &Section,
-                                       bool const &Trusted, string const &Arch) :
-                  pkgIndexFile(Trusted), URI(URI), Dist(Dist), Section(Section), Architecture(Arch)
-{
-       if (Architecture == "native")
-               Architecture = _config->Find("APT::Architecture");
-}
-                                                                       /*}}}*/
-// 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
-{
-   string Res = ::URI::NoUserPassword(URI) + ' ';
-   if (Dist[Dist.size() - 1] == '/')
-   {
-      if (Dist != "/")
-        Res += Dist;
-   }
-   else
-      Res += Dist + '/' + Section;
-   

    Res += " ";
    Res += Ver.ParentPkg().Name();
    Res += " ";
    Res += " ";
    Res += Ver.ParentPkg().Name();
    Res += " ";

-   if (Dist[Dist.size() - 1] != '/')
+   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;
 }
       Res.append(Ver.Arch()).append(" ");
    Res += Ver.VerStr();
    return Res;
 }

-                                                                       /*}}}*/
-// 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;
-}
-                                                                       /*}}}*/
-// PackagesIndex::Info - One liner describing the index URI            /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-string debPackagesIndex::Info(const char *Type) const 
+uint8_t debPackagesIndex::GetIndexFlags() const

 {
 {

-   string Info = ::URI::NoUserPassword(URI) + ' ';
-   if (Dist[Dist.size() - 1] == '/')
-   {
-      if (Dist != "/")
-        Info += Dist;
-   }
-   else
-      Info += Dist + '/' + Section;   
-   Info += " ";
-   if (Dist[Dist.size() - 1] != '/')
-      Info += Architecture + " ";
-   Info += Type;
-   return Info;
-}
-                                                                       /*}}}*/
-// PackagesIndex::Index* - Return the URI to the index files           /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-string debPackagesIndex::IndexFile(const char *Type) const
-{
-   string s =_config->FindDir("Dir::State::lists") + URItoFileName(IndexURI(Type));
-
-   std::vector<std::string> types = APT::Configuration::getCompressionTypes();
-   for (std::vector<std::string>::const_iterator t = types.begin(); t != types.end(); ++t)
-   {
-      string p = s + '.' + *t;
-      if (FileExists(p))
-         return p;
-   }
-   return s;
-}
-string debPackagesIndex::IndexURI(const char *Type) const
-{
-   string Res;
-   if (Dist[Dist.size() - 1] == '/')
-   {
-      if (Dist != "/")
-        Res = URI + Dist;
-      else 
-        Res = URI;
-   }
-   else
-      Res = URI + "dists/" + Dist + '/' + Section +
-      "/binary-" + Architecture + '/';
-   
-   Res += Type;
-   return Res;
-}
-                                                                       /*}}}*/
-// PackagesIndex::Exists - Check if the index is available             /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-bool debPackagesIndex::Exists() const
-{
-   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
-{
-   unsigned long size = 0;
-
-   /* we need to ignore errors here; if the lists are absent, just return 0 */
-   _error->PushToStack();
-
-   FileFd f(IndexFile("Packages"), FileFd::ReadOnly, FileFd::Extension);
-   if (!f.Failed())
-      size = f.Size();
-
-   if (_error->PendingError() == true)
-       size = 0;
-   _error->RevertToStack();
-
-   return 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, FileFd::Extension);
-   debListParser Parser(&Pkg, Architecture);
-
-   if (_error->PendingError() == true)
-      return _error->Error("Problem opening %s",PackageFile.c_str());
-   if (Prog != NULL)
-      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());
-
-   // Store the IMS information
-   pkgCache::PkgFileIterator File = Gen.GetCurFile();
-   pkgCacheGenerator::Dynamic<pkgCache::PkgFileIterator> DynFile(File);
-   File->Size = Pkg.FileSize();
-   File->mtime = Pkg.ModificationTime();
-   
-   if (Gen.MergeList(Parser) == false)
-      return _error->Error("Problem with MergeList %s",PackageFile.c_str());
-
-   // Check the release file
-   string ReleaseFile = debReleaseIndex(URI,Dist).MetaIndexFile("InRelease");
-   bool releaseExists = false;
-   if (FileExists(ReleaseFile) == true)
-      releaseExists = true;
-   else
-      ReleaseFile = debReleaseIndex(URI,Dist).MetaIndexFile("Release");
-
-   if (releaseExists == true || FileExists(ReleaseFile) == true)
-   {
-      FileFd Rel;
-      // Beware: The 'Release' file might be clearsigned in case the
-      // signature for an 'InRelease' file couldn't be checked
-      if (OpenMaybeClearSignedFile(ReleaseFile, Rel) == false)
-        return false;
-
-      if (_error->PendingError() == true)
-        return false;
-      Parser.LoadReleaseInfo(File,Rel,Section);
-   }
-   
-   return true;
-}
-                                                                       /*}}}*/
-// PackagesIndex::FindInCache - Find this index                                /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-pkgCache::PkgFileIterator debPackagesIndex::FindInCache(pkgCache &Cache) const
-{
-   string FileName = IndexFile("Packages");
-   pkgCache::PkgFileIterator File = Cache.FileBegin();
-   for (; File.end() == false; ++File)
-   {
-       if (File.FileName() == NULL || FileName != File.FileName())
-        continue;
-      
-      struct stat St;
-      if (stat(File.FileName(),&St) != 0)
-      {
-         if (_config->FindB("Debug::pkgCacheGen", false))
-           std::clog << "PackagesIndex::FindInCache - stat failed on " << File.FileName() << std::endl;
-        return pkgCache::PkgFileIterator(Cache);
-      }
-      if ((unsigned)St.st_size != File->Size || St.st_mtime != File->mtime)
-      {
-         if (_config->FindB("Debug::pkgCacheGen", false))
-           std::clog << "PackagesIndex::FindInCache - size (" << St.st_size << " <> " << File->Size
-                       << ") or mtime (" << St.st_mtime << " <> " << File->mtime
-                       << ") doesn't match for " << File.FileName() << std::endl;
-        return pkgCache::PkgFileIterator(Cache);
-      }
-      return File;
-   }
-   
-   return File;
+   return 0;

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

-
-// TranslationsIndex::debTranslationsIndex - Contructor                        /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-debTranslationsIndex::debTranslationsIndex(std::string const &URI, std::string const &Dist,
-                                               std::string const &Section, std::string const &Translation) :
-                       pkgIndexFile(true), URI(URI), Dist(Dist), Section(Section),
-                               Language(Translation)
+// Translation-* Index                                                 /*{{{*/
+debTranslationsIndex::debTranslationsIndex(IndexTarget const &Target) :
+                       pkgDebianIndexTargetFile(Target, true), d(NULL)

 {}
 {}

-                                                                       /*}}}*/
-// TranslationIndex::Trans* - Return the URI to the translation files  /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-string debTranslationsIndex::IndexFile(const char *Type) const
+bool debTranslationsIndex::HasPackages() const

 {
 {

-   string s =_config->FindDir("Dir::State::lists") + URItoFileName(IndexURI(Type));
-
-   std::vector<std::string> types = APT::Configuration::getCompressionTypes();
-   for (std::vector<std::string>::const_iterator t = types.begin(); t != types.end(); ++t)
-   {
-      string p = s + '.' + *t;
-      if (FileExists(p))
-         return p;
-   }
-   return s;
-}
-string debTranslationsIndex::IndexURI(const char *Type) const
-{
-   string Res;
-   if (Dist[Dist.size() - 1] == '/')
-   {
-      if (Dist != "/")
-        Res = URI + Dist;
-      else 
-        Res = URI;
-   }
-   else
-      Res = URI + "dists/" + Dist + '/' + Section +
-      "/i18n/Translation-";
-   
-   Res += Type;
-   return Res;
-}
-                                                                       /*}}}*/
-// TranslationsIndex::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 debTranslationsIndex::Describe(bool Short) const
-{
-   std::string S;
-   if (Short == true)
-      strprintf(S,"%s",Info(TranslationFile().c_str()).c_str());
-   else
-      strprintf(S,"%s (%s)",Info(TranslationFile().c_str()).c_str(),
-              IndexFile(Language.c_str()).c_str());
-   return S;
+   return Exists();

 }
 }

-                                                                       /*}}}*/
-// TranslationsIndex::Info - One liner describing the index URI                /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-string debTranslationsIndex::Info(const char *Type) const 
+bool debTranslationsIndex::OpenListFile(FileFd &Pkg, std::string const &FileName)

 {
 {

-   string Info = ::URI::NoUserPassword(URI) + ' ';
-   if (Dist[Dist.size() - 1] == '/')
-   {
-      if (Dist != "/")
-        Info += Dist;
-   }
-   else
-      Info += Dist + '/' + Section;   
-   Info += " ";
-   Info += Type;
-   return Info;
+   if (FileExists(FileName))
+      return pkgDebianIndexTargetFile::OpenListFile(Pkg, FileName);
+   return true;

 }
 }

-                                                                       /*}}}*/
-bool debTranslationsIndex::HasPackages() const                         /*{{{*/
+uint8_t debTranslationsIndex::GetIndexFlags() const

 {
 {

-   return FileExists(IndexFile(Language.c_str()));
+   return pkgCache::Flag::NotSource | pkgCache::Flag::NoPackages;

 }
 }

-                                                                       /*}}}*/
-// TranslationsIndex::Exists - Check if the index is available         /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-bool debTranslationsIndex::Exists() const
+std::string debTranslationsIndex::GetArchitecture() const

 {
 {

-   return FileExists(IndexFile(Language.c_str()));
+   return std::string();

 }
 }

-                                                                       /*}}}*/
-// TranslationsIndex::Size - Return the size of the index              /*{{{*/
-// ---------------------------------------------------------------------
-/* This is really only used for progress reporting. */
-unsigned long debTranslationsIndex::Size() const
+pkgCacheListParser * debTranslationsIndex::CreateListParser(FileFd &Pkg)

 {
 {

-   unsigned long size = 0;
-
-   /* we need to ignore errors here; if the lists are absent, just return 0 */
+   if (Pkg.IsOpen() == false)
+      return NULL;

    _error->PushToStack();
    _error->PushToStack();

-
-   FileFd f(IndexFile(Language.c_str()), FileFd::ReadOnly, FileFd::Extension);
-   if (!f.Failed())
-      size = f.Size();
-
-   if (_error->PendingError() == true)
-       size = 0;
-   _error->RevertToStack();
-
-   return size;
+   pkgCacheListParser * const Parser = new debTranslationsParser(&Pkg);
+   bool const newError = _error->PendingError();
+   _error->MergeWithStack();
+   return newError ? NULL : Parser;

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

-// TranslationsIndex::Merge - Load the index file into a cache         /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-bool debTranslationsIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const
-{
-   // Check the translation file, if in use
-   string TranslationFile = IndexFile(Language.c_str());
-   if (FileExists(TranslationFile))
-   {
-     FileFd Trans(TranslationFile,FileFd::ReadOnly, FileFd::Extension);
-     debTranslationsParser TransParser(&Trans);
-     if (_error->PendingError() == true)
-       return false;
-     
-     if (Prog != NULL)
-       Prog->SubProgress(0, Info(TranslationFile.c_str()));
-     if (Gen.SelectFile(TranslationFile,string(),*this) == false)
-       return _error->Error("Problem with SelectFile %s",TranslationFile.c_str());
-
-     // Store the IMS information
-     pkgCache::PkgFileIterator TransFile = Gen.GetCurFile();
-     TransFile->Size = Trans.FileSize();
-     TransFile->mtime = Trans.ModificationTime();
-   
-     if (Gen.MergeList(TransParser) == false)
-       return _error->Error("Problem with MergeList %s",TranslationFile.c_str());
-   }
-
-   return true;
-}
-                                                                       /*}}}*/
-// TranslationsIndex::FindInCache - Find this index                            /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-pkgCache::PkgFileIterator debTranslationsIndex::FindInCache(pkgCache &Cache) const
+// dpkg/status Index                                                   /*{{{*/
+debStatusIndex::debStatusIndex(std::string const &File) : pkgDebianIndexRealFile(File, true), d(NULL)

 {
 {

-   string FileName = IndexFile(Language.c_str());
-   
-   pkgCache::PkgFileIterator File = Cache.FileBegin();
-   for (; File.end() == false; ++File)
-   {
-      if (FileName != File.FileName())
-        continue;
-
-      struct stat St;
-      if (stat(File.FileName(),&St) != 0)
-      {
-         if (_config->FindB("Debug::pkgCacheGen", false))
-           std::clog << "TranslationIndex::FindInCache - stat failed on " << File.FileName() << std::endl;
-        return pkgCache::PkgFileIterator(Cache);
-      }
-      if ((unsigned)St.st_size != File->Size || St.st_mtime != File->mtime)
-      {
-         if (_config->FindB("Debug::pkgCacheGen", false))
-           std::clog << "TranslationIndex::FindInCache - size (" << St.st_size << " <> " << File->Size
-                       << ") or mtime (" << St.st_mtime << " <> " << File->mtime
-                       << ") doesn't match for " << File.FileName() << std::endl;
-        return pkgCache::PkgFileIterator(Cache);
-      }
-      return File;
-   }   
-   return File;

 }
 }

-                                                                       /*}}}*/
-// StatusIndex::debStatusIndex - Constructor                           /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-debStatusIndex::debStatusIndex(string File) : pkgIndexFile(true), File(File)
+std::string debStatusIndex::GetArchitecture() const

 {
 {

+   return std::string();

 }
 }

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

 {
 {

-   struct stat S;
-   if (stat(File.c_str(),&S) != 0)
-      return 0;
-   return S.st_size;
-}
-                                                                       /*}}}*/
-// StatusIndex::Merge - Load the index file into a cache               /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-bool debStatusIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const
-{
-   FileFd Pkg(File,FileFd::ReadOnly, FileFd::Extension);
-   if (_error->PendingError() == true)
-      return false;
-   debListParser Parser(&Pkg);
-   if (_error->PendingError() == true)
-      return false;
-
-   if (Prog != NULL)
-      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();
-   CFile->Size = Pkg.FileSize();
-   CFile->mtime = Pkg.ModificationTime();
-   map_stringitem_t const storage = Gen.StoreString(pkgCacheGenerator::MIXED, "now");
-   CFile->Archive = storage;
-   
-   if (Gen.MergeList(Parser) == false)
-      return _error->Error("Problem with MergeList %s",File.c_str());   
-   return true;
+   return "now";

 }
 }

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

 {
 {

-   pkgCache::PkgFileIterator File = Cache.FileBegin();
-   for (; File.end() == false; ++File)
-   {
-      if (this->File != File.FileName())
-        continue;
-      
-      struct stat St;
-      if (stat(File.FileName(),&St) != 0)
-      {
-         if (_config->FindB("Debug::pkgCacheGen", false))
-           std::clog << "StatusIndex::FindInCache - stat failed on " << File.FileName() << std::endl;
-        return pkgCache::PkgFileIterator(Cache);
-      }
-      if ((unsigned)St.st_size != File->Size || St.st_mtime != File->mtime)
-      {
-         if (_config->FindB("Debug::pkgCacheGen", false))
-           std::clog << "StatusIndex::FindInCache - size (" << St.st_size << " <> " << File->Size
-                       << ") or mtime (" << St.st_mtime << " <> " << File->mtime
-                       << ") doesn't match for " << File.FileName() << std::endl;
-        return pkgCache::PkgFileIterator(Cache);
-      }
-      return File;
-   }   
-   return File;
+   return pkgCache::Flag::NotSource;

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

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

 {
 {

-   // Abort if the file does not exist.
-   return true;
-}
-                                                                       /*}}}*/
-
-// debDebPkgFile - Single .deb file                                    /*{{{*/
-debDebPkgFileIndex::debDebPkgFileIndex(std::string DebFile)
-   : pkgIndexFile(true), DebFile(DebFile)
-{
-   DebFileFullPath = flAbsPath(DebFile);
-}
-
-std::string debDebPkgFileIndex::ArchiveURI(std::string /*File*/) const
-{
-   return "file:" + DebFileFullPath;
-}
-
-bool debDebPkgFileIndex::Exists() const
-{
-   return FileExists(DebFile);

 }
 bool debDebPkgFileIndex::GetContent(std::ostream &content, std::string const &debfile)
 {
 }
 bool debDebPkgFileIndex::GetContent(std::ostream &content, std::string const &debfile)
 {

+   struct stat Buf;
+   if (stat(debfile.c_str(), &Buf) != 0)
+      return false;
+

    // 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;
    // 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;


@@ -716,106 +191,86 @@ bool debDebPkgFileIndex::GetContent(std::ostream &content, std::string const &de
    ExecWait(Child, "Popen");
 
    content << "Filename: " << debfile << "\n";
    ExecWait(Child, "Popen");
 
    content << "Filename: " << debfile << "\n";

-   struct stat Buf;
-   if (stat(debfile.c_str(), &Buf) != 0)
-      return false;

    content << "Size: " << Buf.st_size << "\n";
 
    return true;
 }
    content << "Size: " << Buf.st_size << "\n";
 
    return true;
 }

-bool debDebPkgFileIndex::Merge(pkgCacheGenerator& Gen, OpProgress* Prog) const
+bool debDebPkgFileIndex::OpenListFile(FileFd &Pkg, std::string const &FileName)

 {
 {

-   if(Prog)
-      Prog->SubProgress(0, "Reading deb file");
-

    // write the control data to a tempfile
    // write the control data to a tempfile

-   SPtr<FileFd> DebControl = GetTempFile("deb-file-" + flNotDir(DebFile));
-   if(DebControl == NULL)
+   if (GetTempFile("deb-file-" + flNotDir(FileName), true, &Pkg) == NULL)

       return false;
    std::ostringstream content;
       return false;
    std::ostringstream content;

-   if (GetContent(content, DebFile) == false)
+   if (GetContent(content, FileName) == false)

       return false;
    std::string const contentstr = content.str();
       return false;
    std::string const contentstr = content.str();

-   DebControl->Write(contentstr.c_str(), contentstr.length());
-   // rewind for the listparser
-   DebControl->Seek(0);
-
-   // and give it to the list parser
-   debDebFileParser Parser(DebControl, DebFile);
-   if(Gen.SelectFile(DebFile, "local", *this) == false)
-      return _error->Error("Problem with SelectFile %s", DebFile.c_str());
-
-   pkgCache::PkgFileIterator File = Gen.GetCurFile();
-   File->Size = DebControl->Size();
-   File->mtime = DebControl->ModificationTime();
-   
-   if (Gen.MergeList(Parser) == false)
-      return _error->Error("Problem with MergeLister for %s", DebFile.c_str());
-
+   if (contentstr.empty())
+      return true;
+   if (Pkg.Write(contentstr.c_str(), contentstr.length()) == false || Pkg.Seek(0) == false)
+      return false;

    return true;
 }
    return true;
 }

+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;
+}
+std::string debDebPkgFileIndex::GetArchitecture() const
+{
+   return std::string();
+}
+std::string debDebPkgFileIndex::GetComponent() const
+{
+   return "local-deb";
+}

 pkgCache::PkgFileIterator debDebPkgFileIndex::FindInCache(pkgCache &Cache) const
 {
 pkgCache::PkgFileIterator debDebPkgFileIndex::FindInCache(pkgCache &Cache) const
 {

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

    pkgCache::PkgFileIterator File = Cache.FileBegin();
    for (; File.end() == false; ++File)
    {
    pkgCache::PkgFileIterator File = Cache.FileBegin();
    for (; File.end() == false; ++File)
    {

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

         continue;
         continue;

-
-       return File;
+      // we can't do size checks here as file size != content size
+      return File;

    }
    }

-   
-   return File;
-}
-unsigned long debDebPkgFileIndex::Size() const
-{
-   struct stat buf;
-   if(stat(DebFile.c_str(), &buf) != 0)
-      return 0;
-   return buf.st_size;
-}
-                                                                       /*}}}*/

 
 

-// debDscFileIndex stuff
-debDscFileIndex::debDscFileIndex(std::string &DscFile) 
-   : pkgIndexFile(true), DscFile(DscFile)
-{
-}
-
-bool debDscFileIndex::Exists() const
-{
-   return FileExists(DscFile);
+   return File;

 }
 
 }
 

-unsigned long debDscFileIndex::Size() const
+                                                                       /*}}}*/
+// DscFile Index - a single .dsc file as an index                      /*{{{*/
+debDscFileIndex::debDscFileIndex(std::string const &DscFile)
+   : pkgDebianIndexRealFile(DscFile, true), d(NULL)

 {
 {

-   struct stat buf;
-   if(stat(DscFile.c_str(), &buf) == 0)
-      return buf.st_size;
-   return 0;

 }
 }

-
-// DscFileIndex::CreateSrcParser - Get a parser for the .dsc file      /*{{{*/

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

-   if (!FileExists(DscFile))
+   if (Exists() == false)

       return NULL;
       return NULL;

-
-   return new debDscRecordParser(DscFile,this);
+   return new debDscRecordParser(File, this);

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

+

 // Index File types for Debian                                         /*{{{*/
 class APT_HIDDEN debIFTypeSrc : public pkgIndexFile::Type
 {
    public:
 // Index File types for Debian                                         /*{{{*/
 class APT_HIDDEN debIFTypeSrc : public pkgIndexFile::Type
 {
    public:

-   

    debIFTypeSrc() {Label = "Debian Source Index";};
 };
 class APT_HIDDEN debIFTypePkg : public pkgIndexFile::Type
 {
    public:
    debIFTypeSrc() {Label = "Debian Source Index";};
 };
 class APT_HIDDEN debIFTypePkg : public pkgIndexFile::Type
 {
    public:

-   
-   virtual pkgRecords::Parser *CreatePkgParser(pkgCache::PkgFileIterator File) const 
+   virtual pkgRecords::Parser *CreatePkgParser(pkgCache::PkgFileIterator const &File) const APT_OVERRIDE

    {
       return new debRecordParser(File.FileName(),*File.Cache());
    };
    {
       return new debRecordParser(File.FileName(),*File.Cache());
    };


@@ -829,8 +284,7 @@ class APT_HIDDEN debIFTypeTrans : public debIFTypePkg
 class APT_HIDDEN debIFTypeStatus : public pkgIndexFile::Type
 {
    public:
 class APT_HIDDEN debIFTypeStatus : public pkgIndexFile::Type
 {
    public:

-   
-   virtual pkgRecords::Parser *CreatePkgParser(pkgCache::PkgFileIterator File) const 
+   virtual pkgRecords::Parser *CreatePkgParser(pkgCache::PkgFileIterator const &File) const APT_OVERRIDE

    {
       return new debRecordParser(File.FileName(),*File.Cache());
    };
    {
       return new debRecordParser(File.FileName(),*File.Cache());
    };


@@ -839,29 +293,29 @@ class APT_HIDDEN debIFTypeStatus : public pkgIndexFile::Type
 class APT_HIDDEN debIFTypeDebPkgFile : public pkgIndexFile::Type
 {
    public:
 class APT_HIDDEN debIFTypeDebPkgFile : public pkgIndexFile::Type
 {
    public:

-   virtual pkgRecords::Parser *CreatePkgParser(pkgCache::PkgFileIterator File) const 
+   virtual pkgRecords::Parser *CreatePkgParser(pkgCache::PkgFileIterator const &File) const APT_OVERRIDE

    {
       return new debDebFileRecordParser(File.FileName());
    };
    {
       return new debDebFileRecordParser(File.FileName());
    };

-   debIFTypeDebPkgFile() {Label = "deb Package file";};
+   debIFTypeDebPkgFile() {Label = "Debian deb file";};

 };
 class APT_HIDDEN debIFTypeDscFile : public pkgIndexFile::Type
 {
    public:
 };
 class APT_HIDDEN debIFTypeDscFile : public pkgIndexFile::Type
 {
    public:

-   virtual pkgSrcRecords::Parser *CreateSrcPkgParser(std::string DscFile) const
+   virtual pkgSrcRecords::Parser *CreateSrcPkgParser(std::string const &DscFile) const APT_OVERRIDE

    {
       return new debDscRecordParser(DscFile, NULL);
    };
    {
       return new debDscRecordParser(DscFile, NULL);
    };

-   debIFTypeDscFile() {Label = "dsc File Source Index";};
+   debIFTypeDscFile() {Label = "Debian dsc file";};

 };
 class APT_HIDDEN debIFTypeDebianSourceDir : public pkgIndexFile::Type
 {
    public:
 };
 class APT_HIDDEN debIFTypeDebianSourceDir : public pkgIndexFile::Type
 {
    public:

-   virtual pkgSrcRecords::Parser *CreateSrcPkgParser(std::string SourceDir) const
+   virtual pkgSrcRecords::Parser *CreateSrcPkgParser(std::string const &SourceDir) const APT_OVERRIDE

    {
    {

-      return new debDscRecordParser(SourceDir + string("/debian/control"), NULL);
+      return new debDscRecordParser(SourceDir + std::string("/debian/control"), NULL);

    };
    };

-   debIFTypeDebianSourceDir() {Label = "debian/control File Source Index";};
+   debIFTypeDebianSourceDir() {Label = "Debian control file";};

 };
 
 APT_HIDDEN debIFTypeSrc _apt_Src;
 };
 
 APT_HIDDEN debIFTypeSrc _apt_Src;


@@ -909,3 +363,4 @@ debTranslationsIndex::~debTranslationsIndex() {}
 debSourcesIndex::~debSourcesIndex() {}
 
 debDebPkgFileIndex::~debDebPkgFileIndex() {}
 debSourcesIndex::~debSourcesIndex() {}
 
 debDebPkgFileIndex::~debDebPkgFileIndex() {}

+debDscFileIndex::~debDscFileIndex() {}