* added "{candidate,installed}Downloadable"

5 files changed, 64 insertions, 0 deletions

diff --git a/TODO b/TODO
new file mode 100644
index 00000000..f3f6a995
--- /dev/null
+++ b/TODO
@@ -0,0 +1,4 @@
+* apt.Package:
+  - change all candidateInstalledSize() to installSize(useCandidate=True)
+    same for candidateOrigin()  (see downloadable for a example). 
+  - might be better to have "Package.candidate.{downloadable,size,etc}
diff --git a/apt/package.py b/apt/package.py
index 5642496a..5fb6ade7 100644
--- a/apt/package.py
+++ b/apt/package.py
@@ -21,6 +21,7 @@
 
 import apt_pkg, string, sys, random
 
+
 class Package(object):
     """ This class represents a package in the cache
     """
@@ -89,6 +90,25 @@ class Package(object):
             return None
     candidateVersion = property(candidateVersion)
 
+    def _downloadable(self, useCandidate=True):
+        """ helper, return if the version is downloadable """
+        if useCandidate:
+            ver = self._depcache.GetCandidateVer(self._pkg)
+        else:
+            ver = self._pkg.CurrentVer
+        if ver == None:
+            return False
+        return ver.Downloadable
+    def candidateDownloadable(self):
+        " returns if the canidate is downloadable "
+        self._downloadable(useCandidate=True)
+    candidateDownloadable = property(candidateDownloadable)
+
+    def installedDownloadable(self):
+        " returns if the installed version is downloadable "
+        self._downloadable(useCandidate=False)
+    installedDownloadable = property(installedDownloadable)
+
     def sourcePackageName(self):
         """ Return the source package name as string """
         self._lookupRecord()
@@ -298,6 +318,7 @@ if __name__ == "__main__":
     print "Priority (Installed): %s " % pkg.installedPriority
     print "Installed: %s " % pkg.installedVersion
     print "Candidate: %s " % pkg.candidateVersion
+    print "CandiateDownloadable: %s" % pkg.candidateDownloadable
     print "CandiateOrigin: %s" % pkg.candidateOrigin
     print "SourcePkg: %s " % pkg.sourcePackageName
     print "Section: %s " % pkg.section
diff --git a/apt/progress.py b/apt/progress.py
index 552c9e75..8c47ab95 100644
--- a/apt/progress.py
+++ b/apt/progress.py
@@ -62,6 +62,8 @@ class FetchProgress(object):
                    dlIgnored : "Ignored"}
     
     def __init__(self):
+        self.eta = ""
+        self.percent = 0.0
         pass
     
     def start(self):
diff --git a/debian/changelog b/debian/changelog
index 402ff2dc..bda57c52 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ python-apt (0.6.16) unstable; urgency=low
 
   * added GetPkgAcqFile to queue individual file downloads with the 
     system
+  * added Package.downloadable 
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Thu,  1 Dec 2005 14:01:39 +0100
 
diff --git a/doc/examples/dependant-pkgs.py b/doc/examples/dependant-pkgs.py
new file mode 100644
index 00000000..656e38bf
--- /dev/null
+++ b/doc/examples/dependant-pkgs.py
@@ -0,0 +1,36 @@
+#!/usr/bin/env python
+
+import apt
+import sys
+
+pkgs = set()
+cache = apt.Cache()
+for pkg in cache:
+	candver = cache._depcache.GetCandidateVer(pkg._pkg)
+	if candver == None:
+		continue
+	dependslist = candver.DependsList
+	for dep in dependslist.keys():
+		# get the list of each dependency object
+		for depVerList in dependslist[dep]:
+			for z in depVerList:
+				# get all TargetVersions of
+				# the dependency object
+				for tpkg in z.AllTargets():
+					if sys.argv[1] == tpkg.ParentPkg.Name:
+						pkgs.add(pkg.name)
+
+main = []
+universe = []
+for pkg in pkgs:
+	if "universe" in cache[pkg].section:
+		universe.append(cache[pkg].sourcePackageName)
+	else:
+		main.append(cache[pkg].sourcePackageName)
+
+print "main:"		
+print "\n".join(main)
+print
+
+print "universe:"		
+print "\n".join(universe)