Merge lp:~mac9416/keryx/keryx-1.0 into lp:keryx/unstable

[mac9416]

"Code‽ I don't have time to code! There's hay to be bailed and cows to be milked and..."

Anyway, I made some time to code. I managed to implement the Download button and the Installed Version text. That required an additional function in Unwrapt, mind you, (merge request for that coming soon) so be sure to update both branches before testing.

I'm adding RSK as a reviewer.

[mac9416 (mac9416)]

Bah, looks like I forgot to push the last batch of code into unstable. RSK, you'll just have to skim over old stuff. :-)

[Senthil Kumar_Webrsk (webrsk-ideas)]

> Bah, looks like I forgot to push the last batch of code into unstable. RSK,
> you'll just have to skim over old stuff. :-)

So do i have to take 63 revision of lp:~mac9416/keryx/unwrapt ?

[mac9416 (mac9416)]

> So do i have to take 63 revision of lp:~mac9416/keryx/unwrapt ?

Yes, for this revision of Keryx, you'll have to have the latest Unwrapt revision from my branch as well.

To make Keryx able to import Unwrapt, you'll have to create a link at keryx/unwrapt to the unwrapt directory in your local Unwrapt branch. If keryx/unwrapt already exists, replace it with your new link.

[Senthil Kumar_Webrsk (webrsk-ideas)]

When i try to manage the computer it fails to download the index files. As per the code it should proceed further but it raises more error.
Reading packing lists... 46%Traceback
IOError:Not a gzipped file

review: Needs Information

[mac9416 (mac9416)]

I've encountered that error too. By adding a print statement to the index file reading code in Unwrapt, I was able to see that it was a Medibuntu index file that threw the error. Opening the file with an archive app worked perfectly fine.
Even more befuddling is that the error occurs on my 64-bit Studio desktop, but not my 32-bit Lubuntu laptop. I'll test on another 32-bit machine and see what happens.

At any rate, you can disable whatever repos are causing the error and continue testing. I'll send a message to the mailing list that this needs looking into.

[mac9416 (mac9416)]

Hey, RSK, I'm going to go on and merge this in. If there are any serious issues, we'll iron them out later.

[Senthil Kumar_Webrsk (webrsk-ideas)]

Ya we can proceed merging :)

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2010-08-07 03:19:39 +0000
+++ .bzrignore	2010-09-23 21:27:41 +0000
@@ -12,9 +12,9 @@
 .git/objects
 .git/refs
 .git
-data/projects/amanda
-data/projects/amandasd
-data/downloads
-data/downloads
 data/keryx.conf
-data/projects
+data/projects/*
+data/downloads/*
+downloads/*
+data/profiles
+keryx/unwrapt
 
=== modified file 'bin/keryx'
--- bin/keryx	2010-08-17 00:09:50 +0000
+++ bin/keryx	2010-09-23 21:27:41 +0000
@@ -27,30 +27,59 @@
 from gettext import gettext as _
 gettext.textdomain('keryx')
 
-# optional Launchpad integration
-# this shouldn't crash if not found as it is simply used for bug reporting
+
+### Optional Launchpad integration ###
+# This shouldn't crash if not found as it is simply used for bug reporting.
 try:
     import LaunchpadIntegration
     launchpad_available = True
 except:
     launchpad_available = False
 
-# Add project root directory (enable symlink, and trunk execution).
-PROJECT_ROOT_DIRECTORY = os.path.abspath(
+
+### Add profile root directory (enable symlink, and trunk execution). ###
+PROFILE_ROOT_DIRECTORY = os.path.abspath(
     os.path.dirname(os.path.dirname(os.path.realpath(sys.argv[0]))))
 
-if (os.path.exists(os.path.join(PROJECT_ROOT_DIRECTORY, 'keryx'))
-    and PROJECT_ROOT_DIRECTORY not in sys.path):
-    sys.path.insert(0, PROJECT_ROOT_DIRECTORY)
-    os.putenv('PYTHONPATH', PROJECT_ROOT_DIRECTORY) # for subprocesses
-
-from keryx import (
-    AboutKeryxDialog, keryxconfig)
+if (os.path.exists(os.path.join(PROFILE_ROOT_DIRECTORY, 'keryx'))
+    and PROFILE_ROOT_DIRECTORY not in sys.path):
+    sys.path.insert(0, PROFILE_ROOT_DIRECTORY)
+    os.putenv('PYTHONPATH', PROFILE_ROOT_DIRECTORY) # for subprocesses
+
+
+### Start bringing in some Keryx grooviness. ###
+from keryx import AboutKeryxDialog, keryxconfig
 from keryx.MessageDialogs import (error_dialog, info_dialog, question_dialog,
                                   warning_dialog)
 from keryx.helpers import create_tab, create_closeable_tab, get_builder
 
 
+class UnsupportedOSException(Exception):
+    pass
+
+
+class ProfileExistsException(Exception):
+    pass
+
+
+def is_supported_os():
+    """If the current OS is supported, return True; else, False."""
+    return platform.system() == "Linux" and \
+           os.path.exists("/var/lib/dpkg/status")
+
+
+def get_architecture():
+    """Get the architecture of the current machine, converting to an APT-
+       friendly form.
+    """
+    arch = platform.machine()
+    if arch == "x86_64":
+        arch = "amd64"
+    elif arch =="i686":
+        arch = "i386"
+    return arch
+
+
 class KeryxWindow(gtk.Window):
     __gtype_name__ = "KeryxWindow"
     
@@ -102,12 +131,12 @@
             else:
                 launchpad_available = False
 
-        # Uncomment the following code to read in preferences at start up.
+        # Load in the preferences.
         self.config = keryxconfig.Config()
 
         # Code for other initialization actions should be added here.
         self.notebook = self._get("notebook")
-         
+        
         name = self._get("add_computer_name_entry")
         name.set_text(platform.node()) 
                
@@ -136,12 +165,12 @@
         
         
     def load_config(self):
-        # Create and set the projects folder
-        projects_chooser = self._get("projects_filechooserbutton")
-        path = os.path.abspath(self.config.get("projects"))
+        # Create and set the profiles folder
+        profiles_chooser = self._get("profiles_filechooserbutton")
+        path = os.path.abspath(self.config.get("profiles"))
         if not os.path.exists(path):
             os.makedirs(path)
-        projects_chooser.set_current_folder(path)
+        profiles_chooser.set_current_folder(path)
         
         # Create and set the downloads folder
         downloads_chooser = self._get("downloads_filechooserbutton")
@@ -160,7 +189,7 @@
         self._get("proxy_username_entry").set_text(self.config.get("proxy_username"))
         self._get("proxy_password_entry").set_text(self.config.get("proxy_password"))
         
-        for root, dirs, files in os.walk(self.config.get("projects")):
+        for root, dirs, files in os.walk(self.config.get("profiles")):
             for computer in [filename for filename in files if filename.endswith(".keryx")]:
                 self.computers_list.append([computer[:-6], root])
 
@@ -200,11 +229,11 @@
                          "Path": path,
                          "Client": client}
          
-        f = open(os.path.join(path, "apt.conf"), "rb")
+        f = open(os.path.join(path, "profile.conf"), "rb")
         lines = f.readlines() 
         f.close()
         
-        # Read apt.conf
+        # Read profile.conf
         hostname = lines[0].strip()
         dist, version, codename = [line.strip() for line in lines[1].split()]
         arch = lines[2].strip()
@@ -216,14 +245,13 @@
         client.set_status(os.path.join(path, "status"))
         
         # Set repositories
+        #TODO: Don't forget sources.list.d files.
         f = open(os.path.join(path, "sources.list"), "rb")
         repos = f.readlines()
         f.close()
         
         def valid_line(line):
-            """
-                Verify a sources line
-            """
+            """Take an APT source line and only return it if it's valid."""
             line = line.strip()
             
             # Line must not be empty
@@ -234,13 +262,17 @@
                 
             return line
             
-            
         
         # Parse for valid repos
         repos = [valid_line(line) for line in repos if valid_line(line)]
         
         client.set_repositories(repos)
-        client.update() #TODO: reporthook
+        try:
+            client.update()  #TODO: reporthook
+        except IOError:
+            logging.error(_("Downloading index files failed. Loading profile " \
+                            "without downloading index files."))
+            client.update(download=False)
         
         
         for item in client.get_available_package_names():
@@ -259,53 +291,52 @@
         textbuf = self._get("package_textbuffer")
         textbuf.set_text(package["Long"])
 
-        #self.computer["Client"].get_package_status(
-        #self._get("installed_label").set_text(
-
-
-    #TODO: Move errors to their own function to be called easily
+        version = self.computer["Client"].get_package_version(name)
+        if not version:
+            version = _("None")
+        self._get("installed_label").set_text(version)
+
+
     def on_add_button_clicked(self, widget, data=None):
-        status_file = "/var/lib/dpkg/status"
-        sources_file = "/etc/apt/sources.list"
-        
-        if not platform.system() == "Linux" or \
-           not os.path.exists(status_file) or \
-           not os.path.exists(sources_file):  # FIXME: Not everyone has a main sources_file.
-            error_dialog(self, 
-                         "Sorry, you can only add Debian based Linux " \
-                         "distros.\nPlease use Keryx on your offline " \
-                         "machine.",
-                         "Error adding computer")
-            return
-    
         name = self._get("add_computer_name_entry").get_text()
-        
-        path = os.path.join(self.config.get("projects"), name)
+        path = os.path.join(self.config.get("profiles"), name)
+
+        try:
+            self.create_profile(name, path)
+        except UnsupportedOSException:
+            self.wrong_os_dialog()
+            return
+        except ProfileExistsException:
+            self.already_managed_dialog()
+            logging.error("Computer already managed: %s" % path) 
+            return
+        
+        self.computers_list.append([name, path])
+        info_dialog(self, 
+                    "Computer added successfully!\n\nTo get started, take " \
+                    "Keryx to a computer with internet access or\nyou can " \
+                    "click Manage now to mark packages to download later.",
+                    "Everything Went Better Than Expected")           
+
+    def create_profile(self, name, path):
+        if not is_supported_os():
+            raise UnsupportedOSException
+        
+        # Create the new profile's directory.
         if os.path.exists(path):
-            error_dialog(self, 
-                         "The computer appears to have already been added.\n" \
-                         "\nMake sure you to use a different name for each " \
-                         "computer.",
-                         "Error Adding Computer")
-            logging.error("Computer already managed: %s" % path)
-            return
-        
+            raise ProfileExistsException
         os.makedirs(path)
+
+        # Create the .keryx config file.
         filename = "%s.keryx" % name
         f = open(os.path.join(path, filename), "wb")
         f.write("%s\napt" % name)
         f.close()
         
-        self.computers_list.append([name, path])
-        
-        arch = platform.machine()
-        if arch == "x86_64":
-            arch = "amd64"
-        
-        f = open(os.path.join(path, "apt.conf"), "wb")
-        f.write("%s\n%s\n%s\n%s" % (platform.uname()[1], 
+        f = open(os.path.join(path, "profile.conf"), "wb")
+        f.write("%s\n%s\n%s\n%s" % (platform.uname()[1],
                                     " ".join(platform.linux_distribution()), 
-                                    arch,
+                                    get_architecture(),  
                                     platform.release()))
         f.close()
         
@@ -318,12 +349,6 @@
         
         shutil.copy("/var/lib/dpkg/status", os.path.join(path, "status"))
         
-        info_dialog(self, 
-                    "Computer added successfully!\n\nTo get started, take " \
-                    "Keryx to a computer with internet access or\nyou can " \
-                    "click Manage now to mark packages to download later.",
-                    "Everything Went Better Than Expected")
-        
     def about(self, widget, data=None):
         """Display the about box for keryx."""
         about = AboutKeryxDialog.AboutKeryxDialog()
@@ -360,7 +385,7 @@
             self._get(item).set_sensitive(s)
 
     def on_preferences_changed(self, widget, data=None):
-        self.config.set("projects", self._get("projects_filechooserbutton").get_current_folder())
+        self.config.set("profiles", self._get("profiles_filechooserbutton").get_current_folder())
         self.config.set("downloads", self._get("downloads_filechooserbutton").get_current_folder())
         
         self.config.set("proxy", self._get("proxy_manual_radiobutton").get_active())
@@ -379,10 +404,35 @@
         
     def on_switch_tab(self, notebook, page, page_num, data=None):
         self._get("preferences_label").set_text("Click Save to apply changes")
+
+    def on_download(self, widget, data=None):
+        # Get the name of the package selected (overcomplicated process).
+        liststore, treeiter = self._get("packages_treeview").get_selection().get_selected()
+        name = liststore.get_value(treeiter, 0)
+
+        # Download the package.
+        client = self.computer["Client"]
+        package = client.get_latest_binary(name)
+        client.mark_package(package)
+        client.apply_changes()
         
     def _get(self, name):
         return self.builder.get_object(name)
 
+    ### Error dialogs ###
+
+    def wrong_os_dialog(self):
+        error_dialog(self, 
+                     "Sorry, you can only add Debian based Linux distros.\n" \
+                     "Please use Keryx on your offline computer.",
+                     "Error Adding Computer")
+
+    def already_managed_dialog(self):
+        error_dialog(self, 
+                     "The computer appears to have already been added.\n\n" \
+                     "Make sure you to use a different name for each computer.",
+                     "Error Adding Computer")
+
 if __name__ == "__main__":
     # Support for command line options.
     import optparse
 
=== modified file 'data/ui/KeryxWindow.ui'
--- data/ui/KeryxWindow.ui	2010-08-17 00:09:50 +0000
+++ data/ui/KeryxWindow.ui	2010-09-23 21:27:41 +0000
@@ -70,24 +70,6 @@
                       </object>
                     </child>
                     <child>
-                      <object class="GtkImageMenuItem" id="imagemenuitem3">
-                        <property name="label">gtk-save</property>
-                        <property name="visible">True</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                        <accelerator key="s" signal="activate" modifiers="GDK_CONTROL_MASK"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkImageMenuItem" id="imagemenuitem4">
-                        <property name="label">gtk-save-as</property>
-                        <property name="visible">True</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                        <accelerator key="s" signal="activate" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
-                      </object>
-                    </child>
-                    <child>
                       <object class="GtkSeparatorMenuItem" id="separatormenuitem1">
                         <property name="visible">True</property>
                       </object>
@@ -115,47 +97,6 @@
                   <object class="GtkMenu" id="menu2">
                     <property name="visible">True</property>
                     <child>
-                      <object class="GtkImageMenuItem" id="imagemenuitem6">
-                        <property name="label">gtk-cut</property>
-                        <property name="visible">True</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                        <accelerator key="x" signal="activate" modifiers="GDK_CONTROL_MASK"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkImageMenuItem" id="imagemenuitem7">
-                        <property name="label">gtk-copy</property>
-                        <property name="visible">True</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                        <accelerator key="c" signal="activate" modifiers="GDK_CONTROL_MASK"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkImageMenuItem" id="imagemenuitem8">
-                        <property name="label">gtk-paste</property>
-                        <property name="visible">True</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                        <accelerator key="v" signal="activate" modifiers="GDK_CONTROL_MASK"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkImageMenuItem" id="imagemenuitem9">
-                        <property name="label">gtk-delete</property>
-                        <property name="visible">True</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                        <accelerator key="Delete" signal="activate"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkSeparatorMenuItem" id="separatormenuitem2">
-                        <property name="visible">True</property>
-                      </object>
-                    </child>
-                    <child>
                       <object class="GtkImageMenuItem" id="imagemenuitem11">
                         <property name="label">gtk-preferences</property>
                         <property name="visible">True</property>
@@ -169,13 +110,6 @@
               </object>
             </child>
             <child>
-              <object class="GtkMenuItem" id="menuitem3">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">_View</property>
-                <property name="use_underline">True</property>
-              </object>
-            </child>
-            <child>
               <object class="GtkMenuItem" id="menuitem4">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">_Help</property>
@@ -675,6 +609,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
+                                    <signal name="clicked" handler="on_download"/>
                                     <child>
                                       <object class="GtkHBox" id="hbox3">
                                         <property name="visible">True</property>
@@ -765,7 +700,7 @@
                                           <object class="GtkLabel" id="label20">
                                             <property name="visible">True</property>
                                             <property name="xalign">0</property>
-                                            <property name="label" translatable="yes">Projects:</property>
+                                            <property name="label" translatable="yes">Profiles:</property>
                                             <property name="width_chars">10</property>
                                           </object>
                                           <packing>
@@ -775,10 +710,10 @@
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkFileChooserButton" id="projects_filechooserbutton">
+                                          <object class="GtkFileChooserButton" id="profiles_filechooserbutton">
                                             <property name="visible">True</property>
+                                            <property name="show_hidden">True</property>
                                             <property name="action">select-folder</property>
-                                            <property name="show_hidden">True</property>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
@@ -810,8 +745,8 @@
                                         <child>
                                           <object class="GtkFileChooserButton" id="downloads_filechooserbutton">
                                             <property name="visible">True</property>
+                                            <property name="show_hidden">True</property>
                                             <property name="action">select-folder</property>
-                                            <property name="show_hidden">True</property>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
 
=== modified file 'keryx/keryxconfig.py'
--- keryx/keryxconfig.py	2010-08-05 18:55:48 +0000
+++ keryx/keryxconfig.py	2010-09-23 21:27:41 +0000
@@ -73,7 +73,7 @@
 class Config:
     section = "keryx"
     defaults = [("data", get_data_path()), 
-                ("projects", os.path.join(get_data_path(), "projects")), 
+                ("profiles", os.path.join(get_data_path(), "profiles")), 
                 ("downloads", os.path.join(get_data_path(), "downloads")),
                 ("proxy", "False"),
                 ("proxy_url", "http://localhost"),
@@ -92,10 +92,10 @@
             self._set_defaults()
         self.config_file = config_path
         
-        projects_path = os.path.join(get_data_path(), "projects")
+        profiles_path = os.path.join(get_data_path(), "profiles")
         
-        if not os.path.exists(projects_path):
-            os.mkdir(projects_path)    
+        if not os.path.exists(profiles_path):
+            os.mkdir(profiles_path)    
     
     def get_filename(self):
         return self.config_file
 
=== removed symlink 'keryx/unwrapt'
=== target was u'/home/chris/projects/unwrapt/unwrapt/'