Commit 170c310e authored by Michael Vogt's avatar Michael Vogt

* added support for pkgIndexFile

parent 5462bd26
......@@ -7,8 +7,9 @@ python-apt (0.6.16) unstable; urgency=low
* apt/ API change: apt.Package.candidateOrigin returns a list of origins
now instead of a single one
* apt_pkg.Cdrom.Add() returns a boolean now, CdromProgress has totalSteps
* added support for pkgIndexFile and added SourcesList.FindIndex()
-- Michael Vogt <michael.vogt@ubuntu.com> Thu, 22 Dec 2005 10:21:51 +0100
--
python-apt (0.6.15) unstable; urgency=low
......
import apt_pkg
apt_pkg.init()
sources = apt_pkg.GetPkgSourceList()
sources.ReadMainList()
cache = apt_pkg.GetCache()
depcache = apt_pkg.GetDepCache(cache)
pkg = cache["bzr"]
cand = depcache.GetCandidateVer(pkg)
for (f,i) in cand.FileList:
index = sources.FindIndex(f)
print index
if index:
print index.Size
print index.IsTrusted
print index.Exists
print index.HasPackages
......@@ -91,4 +91,8 @@ PyObject *GetPkgSrcRecords(PyObject *Self,PyObject *Args);
extern PyTypeObject PkgSourceListType;
PyObject *GetPkgSourceList(PyObject *Self,PyObject *Args);
// pkgSourceList
extern PyTypeObject PackageIndexFileType;
#endif
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
// $Id: indexfile.cc,v 1.2 2003/12/26 17:04:22 mdz Exp $
/* ######################################################################
pkgIndexFile - Wrapper for the pkgIndexFilefunctions
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
#include "generic.h"
#include "apt_pkgmodule.h"
#include <apt-pkg/indexfile.h>
#include <Python.h>
static PyObject *PackageIndexFileAttr(PyObject *Self,char *Name)
{
pkgIndexFile *File = GetCpp<pkgIndexFile*>(Self);
if (strcmp("Label",Name) == 0)
return Safe_FromString(File->GetType()->Label);
else if (strcmp("Describe",Name) == 0)
return Safe_FromString(File->Describe().c_str());
else if (strcmp("Exists",Name) == 0)
return Py_BuildValue("i",(File->Exists()));
else if (strcmp("HasPackages",Name) == 0)
return Py_BuildValue("i",(File->HasPackages()));
else if (strcmp("Size",Name) == 0)
return Py_BuildValue("i",(File->Size()));
else if (strcmp("IsTrusted",Name) == 0)
return Py_BuildValue("i",(File->IsTrusted()));
PyErr_SetString(PyExc_AttributeError,Name);
return 0;
}
static PyObject *PackageIndexFileRepr(PyObject *Self)
{
pkgIndexFile *File = GetCpp<pkgIndexFile*>(Self);
char S[300];
snprintf(S,sizeof(S),"<pkIndexFile object: "
"Label:'%s' Describe='%s' Exists='%i' "
"HasPackages='%i' Size='%i' "
"IsTrusted='%i' ArchiveURI='%s'>",
File->GetType()->Label, File->Describe().c_str(), File->Exists(),
File->HasPackages(), File->Size(),
File->IsTrusted(), File->ArchiveURI("").c_str());
return PyString_FromString(S);
}
PyTypeObject PackageIndexFileType =
{
PyObject_HEAD_INIT(&PyType_Type)
0, // ob_size
"pkgIndexFile", // tp_name
sizeof(CppOwnedPyObject<pkgIndexFile*>), // tp_basicsize
0, // tp_itemsize
// Methods
CppOwnedDealloc<pkgIndexFile*>, // tp_dealloc
0, // tp_print
PackageIndexFileAttr, // tp_getattr
0, // tp_setattr
0, // tp_compare
PackageIndexFileRepr, // tp_repr
0, // tp_as_number
0, // tp_as_sequence
0, // tp_as_mapping
0, // tp_hash
};
......@@ -11,7 +11,8 @@ SLIBS = -lapt-pkg
LIB_MAKES = apt-pkg/makefile
APT_PKG_SRC = apt_pkgmodule.cc configuration.cc generic.cc tag.cc string.cc \
cache.cc pkgrecords.cc pkgsrcrecords.cc sourcelist.cc \
depcache.cc progress.cc cdrom.cc acquire.cc pkgmanager.cc
depcache.cc progress.cc cdrom.cc acquire.cc pkgmanager.cc \
indexfile.cc
SOURCE := $(APT_PKG_SRC)
include $(PYTHON_H) progress.h
......
......@@ -3,7 +3,7 @@
// $Id: sourcelist.cc,v 1.2 2003/12/26 17:04:22 mdz Exp $
/* ######################################################################
Package Records - Wrapper for the package records functions
SourcesList - Wrapper for the SourcesList functions
##################################################################### */
/*}}}*/
......@@ -16,6 +16,7 @@
#include <Python.h>
/*}}}*/
// PkgsourceList Class /*{{{*/
// ---------------------------------------------------------------------
......@@ -24,7 +25,24 @@ static char *doc_PkgSourceListFindIndex = "xxx";
static PyObject *PkgSourceListFindIndex(PyObject *Self,PyObject *Args)
{
pkgSourceList *list = GetCpp<pkgSourceList*>(Self);
return Py_BuildValue("i", 1);
PyObject *pyPkgFileIter;
PyObject *pyPkgIndexFile;
if (PyArg_ParseTuple(Args, "O!", &PackageFileType,&pyPkgFileIter) == 0)
return 0;
pkgCache::PkgFileIterator &i = GetCpp<pkgCache::PkgFileIterator>(pyPkgFileIter);
pkgIndexFile *index;
if(list->FindIndex(i, index))
{
pyPkgIndexFile = CppOwnedPyObject_NEW<pkgIndexFile*>(pyPkgFileIter,&PackageIndexFileType,index);
return pyPkgIndexFile;
}
//&PackageIndexFileType,&pyPkgIndexFile)
Py_INCREF(Py_None);
return Py_None;
}
static char *doc_PkgSourceListReadMainList = "xxx";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment