Merge lp:~mac9416/unwrapt/modularization into lp:unwrapt

[mac9416]

I tried to modularize a couple of things, and in the process hacked the existing code to pieces. There's still a lot of work to do, so feel free to do the same to mine. :-)

[mac9416 (mac9416)]

lp:unwrapt was out of date. I've updated it to lp:~excid3/keryx/unwrapt. Resubmitting.

[mac9416 (mac9416)]

Forgive the little change to example.py. My test machine is 32-bit. :-P

[Chris Oliver (excid3)]

Yeah I did not update it because I wanted to make sure recent changes were tested in my personal branch before pushing. I think it was all good and I forgot to push. :P

[Chris Oliver (excid3)]

review: Approve

=== modified file 'example.py'
--- example.py	2010-08-11 04:46:25 +0000
+++ example.py	2010-08-13 17:44:39 +0000
@@ -29,7 +29,8 @@
 #apt.set_proxy({"http": "http://192.168.1.100:3128"}, "username", "password")
 
 # Configure the apt client
-apt.set_architecture("amd64")
+#apt.set_architecture("amd64")
+apt.set_architecture("i386")
 
 apt.set_status("/var/lib/dpkg/status")
 

=== modified file 'unwrapt/definitions/aptdef/__init__.py'
--- unwrapt/definitions/aptdef/__init__.py	2010-08-11 07:02:50 +0000
+++ unwrapt/definitions/aptdef/__init__.py	2010-08-13 17:44:39 +0000
@@ -112,7 +112,7 @@
 def to_filename(directory, url):
     """
        Forms a full filename from a directory and url.
-       i.e. Strips the url of the protocol prefix, replacse all slashes with 
+       i.e. Strips the url of the protocol prefix, replaces all slashes with 
        underscores, and appends it to directory.
     """
     return os.path.join(directory, url.split("//")[1].replace("/", "_"))
@@ -226,13 +226,22 @@
         """
             This is a missing docstring ZOMG!
         """
+
+        if download:
+            self.on_download_lists(reporthook)
+
+        # Read the newly-downloaded lists.
+        self.on_read_lists()
+
+
+    def on_download_lists(self, reporthook=None):
         
         directory = os.path.join(self.download_directory, "lists")
 
-        #TODO: This function obviously needs to be split up and modularized :)
+        # If the download directory does not exist, create it
+        if not os.path.exists(directory):
+            os.makedirs(directory)
 
-        # This is a list of files we downloaded and now need to parse
-        downloaded = []
         for repo in self.__iter_repositories():
 
             # Build the strings
@@ -240,31 +249,31 @@
             filename = to_filename(directory, url)
             display_name = "Repository => %s / %s" % (repo["dist"], repo["section"])
 
-            # If the download directory does not exist, create it
-            if not os.path.exists(directory):
-                os.makedirs(directory)
-
             # Download
             #TODO: pass proxy information and catch exceptions
             #TODO: Support bz2 and unarchived Packages files
             filename = "%s.gz" % filename
-            if download:
-                download_url("%s.gz" % url, filename, display_name, proxy=self.proxy["proxy"], username=self.proxy["user"], password=self.proxy["pass"])
-                downloaded.append((repo, filename))
-                
-            #TODO: Improve this. For now we are just opening local files in 
-            # unextracted format (what you find in /var/lib/apt/lists) since
-            # that's an easy way to do things. This won't open the gz files
-            # that Unwrapt downloads however
-            else: # Files that are pre-downloaded
-                downloaded.append((repo, filename[:-3]))
-            
+            download_url("%s.gz" % url, filename, display_name, proxy=self.proxy["proxy"], username=self.proxy["user"], password=self.proxy["pass"])
+
+
+    def on_read_lists(self):
+        
+        directory = os.path.join(self.download_directory, "lists")
+
+        lists = []
+        for repo in self.__iter_repositories():
+
+            # Build the strings
+            url = to_url(repo, self.architecture, "Packages")
+            filename = to_filename(directory, url)
+            filename = "%s.gz" % filename  # Works only if the index files are gz
+            lists.append((repo, filename))
             
         self.packages = {}
  
-        total = len(downloaded)
+        total = len(lists)
         # Now parse each file, extracting as necessary
-        for i, value in enumerate(downloaded):
+        for i, value in enumerate(lists):
             repo, filename = value
 
             # Display percent read            
@@ -272,17 +281,19 @@
             sys.stdout.write("\rReading package lists... %3i%%" % frac)
             sys.stdout.flush()
 
-            # Parse packages into dictionary
+            # Attempt to open the package list.
             try:
                 if filename.endswith(".gz"):
                     f = gzip.open(filename, "rb")
                 else:
-                    f = open(filename, "rb")    
-                    
-                self.__parse(repo, f)
-                f.close()
-            except:
-                logging.error("\nPackage list does not exist: %s" % filename)
+                    f = open(filename, "rb")   
+            except:  #FIXME: specify exception.
+                logging.error("\nPackage list does not exist: %s" % filename) 
+                continue
+
+            # Parse packages into dictionary
+            self.__parse(repo, f)
+            f.close()
             
             #TODO: Insert items into database
 
@@ -290,6 +301,7 @@
         sys.stdout.write("\n")
         
         logging.info("%i packages available" % len(self.packages))
+        
 
     def __parse(self, repo, f):
         """
@@ -438,9 +450,9 @@
         #TODO: This function obviously needs to be split up and modularized :)
 
         # First check if the package is installed already?
-        if metadata["Package"] in self.status:
-            raise AttributeError, "Package already set to status: %s" % \
-                self.status[metadata["Package"]]["Status"]
+        status = self.on_get_package_status(metadata["Package"])
+        if status != "not installed":
+            raise AttributeError, "Package already set to status: %s" % status
         
         # Mark the package itself
         if not dependency: metadata["Status"] = "to be downloaded"
@@ -449,15 +461,10 @@
 
         logging.info("Finding dependencies for %s..." % metadata["Package"])
 
-        # Build a string of the necessary sections we need
-        depends = []
-        for section in self.binary_dependencies:
-            if section in metadata:
-                depends.append(metadata[section])
-        depends = ", ".join(depends)
+        depends = self.on_get_package_dependencies(metadata)
         
         # Do the dependency calculations
-        for dep in depends.split(", "):
+        for dep in depends:
             
             # In case we have some ORs
             options = dep.split(" | ")
@@ -478,7 +485,7 @@
                     # Test for compatible version just in case
                     if len(details) > 1:
                         comparison = details[1][1:] # strip the '('
-                        version = details [2][:-1] # strip the ')'
+                        version = details[2][:-1] # strip the ')'
                         
                         satisfied = DpkgVersion(self.status[name]["Version"]).compare_string(comparison, version)
                         
@@ -501,8 +508,19 @@
                 # Mark sub-dependencies as well
                 if pkg:
                     self.on_mark_package(pkg, dependency=True)
-                
-                
+
+
+    def on_get_package_dependencies(self, metadata):
+
+        # Build a string of the necessary sections we need
+        depends = []
+        for section in self.binary_dependencies:
+            if section in metadata:
+                depends += metadata[section].split(", ")
+
+        return depends
+
+
     def on_apply_changes(self):
         
         directory = os.path.join(self.download_directory, "packages")
@@ -628,9 +646,7 @@
         # Call apt-get install with the packages
         packages = [value["Package"] for key, value in self.status.items() if value["Status"] == "to be installed"]
         
-        #FIXME: apt-get update will fail when installing on an offline machine.
-        #       `apt-cache gencaches` should be used.
-        subprocess.call("apt-get update", shell=True)
+        subprocess.call("apt-gcache gencaches", shell=True)
         subprocess.call("apt-get -y install %s" % " ".join(packages), shell=True)