[gnome-tweak-tool] Generalize zip file handling and extraction

[John Stowers <jstowers src gnome org>]

commit 9744adc1cbe3e98cb4f25540c5024d0e63d9cc7d
Author: John Stowers <john stowers gmail com>
Date:   Wed May 11 09:03:34 2011 +1200

    Generalize zip file handling and extraction
    
    	* Add widgets.ZipFileChooserButton
    	* Add utils.extract_zip_file
    	* Use these in the shell theme install code

 gtweak/tweaks/tweak_shell.py |   59 ++++++++++-------------------------------
 gtweak/utils.py              |   24 +++++++++++++++++
 gtweak/widgets.py            |   11 ++++++++
 3 files changed, 50 insertions(+), 44 deletions(-)
---
diff --git a/gtweak/tweaks/tweak_shell.py b/gtweak/tweaks/tweak_shell.py
index dd211db..40400f7 100644
--- a/gtweak/tweaks/tweak_shell.py
+++ b/gtweak/tweaks/tweak_shell.py
@@ -16,7 +16,6 @@
 # along with gnome-tweak-tool.  If not, see <http://www.gnu.org/licenses/>.
 
 import os.path
-import shutil
 import zipfile
 import tempfile
 import logging
@@ -25,11 +24,11 @@ import json
 from gi.repository import Gtk
 from gi.repository import GLib
 
-from gtweak.utils import walk_directories
+from gtweak.utils import walk_directories, extract_zip_file
 from gtweak.gsettings import GSettingsSetting
 from gtweak.gshellwrapper import GnomeShell
 from gtweak.tweakmodel import Tweak, TweakGroup
-from gtweak.widgets import GConfComboTweak, GSettingsComboEnumTweak, GSettingsSwitchTweak, build_label_beside_widget, build_horizontal_sizegroup, build_combo_box_text
+from gtweak.widgets import ZipFileChooserButton, GConfComboTweak, GSettingsComboEnumTweak, GSettingsSwitchTweak, build_label_beside_widget, build_horizontal_sizegroup, build_combo_box_text
 
 class ShowWindowButtons(GConfComboTweak):
     def __init__(self, **options):
@@ -42,17 +41,6 @@ class ShowWindowButtons(GConfComboTweak):
             (':minimize,maximize,close', 'All')),
             **options)
 
-class _ThemeZipChooser(Gtk.FileChooserButton):
-    def __init__(self):
-        Gtk.FileChooserButton.__init__(self, title="Select theme file")
-
-        f = Gtk.FileFilter()
-        f.add_mime_type("application/zip")
-        self.set_filter(f)
-
-        #self.set_width_chars(15)
-        self.set_local_only(True)
-
 class ShellThemeTweak(Tweak):
 
     THEME_EXT_NAME = "user-theme gnome-shell-extensions gnome org"
@@ -119,33 +107,13 @@ class ShellThemeTweak(Tweak):
             hb.pack_start(cb, False, False, 5)
             self.combo = cb
 
-            chooser = _ThemeZipChooser()
+            chooser = ZipFileChooserButton("Select a theme file")
             chooser.connect("file-set", self._on_file_set)
             hb.pack_start(chooser, False, False, 0)
 
             self.widget = build_label_beside_widget(self.name, hb)
             self.widget_for_size_group = chooser
     
-    def _extract_theme_zip(self, z, theme_name, theme_members_path):
-        """ returns (theme_name, true_if_updated) """
-        tmp = tempfile.mkdtemp()
-        dest = os.path.join(ShellThemeTweak.THEME_DIR, theme_name, "gnome-shell")
-
-        logging.info("Extracting theme %s to %s" % (theme_name, tmp))
-
-        updated = False
-        try:
-            if os.path.exists(dest):
-                shutil.rmtree(dest)
-                updated = True
-            z.extractall(tmp)
-            shutil.copytree(os.path.join(tmp, theme_members_path), dest)
-        except OSError:
-            self.notify_error("Error installing theme")
-            theme_name = None
-
-        return theme_name, updated
-
     def _on_file_set(self, chooser):
         f = chooser.get_filename()
 
@@ -180,21 +148,24 @@ class ShellThemeTweak(Tweak):
 
                 theme_members_path = "/".join(fragment)
 
-                installed_name, updated = self._extract_theme_zip(
-                                                z,
-                                                theme_name,
-                                                theme_members_path)
-                if installed_name:
+                ok, updated = extract_zip_file(
+                                z,
+                                theme_members_path,
+                                os.path.join(ShellThemeTweak.THEME_DIR, theme_name, "gnome-shell"))
+
+                if ok:
                     if updated:
-                        self.notify_info("%s theme updated successfully" % installed_name)
+                        self.notify_info("%s theme updated successfully" % theme_name)
                     else:
-                        self.notify_info("%s theme installed successfully" % installed_name)
+                        self.notify_info("%s theme installed successfully" % theme_name)
 
                     #I suppose I could rely on updated as indicating whether to add the theme
                     #name to the combo, but just check to see if it is already there
                     model = self.combo.get_model()
-                    if installed_name not in [r[0] for r in model]:
-                        model.append( (installed_name, installed_name) )
+                    if theme_name not in [r[0] for r in model]:
+                        model.append( (theme_name, theme_name) )
+                else:
+                    self.notify_error("Error installing theme")
 
 
             except:
diff --git a/gtweak/utils.py b/gtweak/utils.py
index beea622..8c52df7 100644
--- a/gtweak/utils.py
+++ b/gtweak/utils.py
@@ -17,6 +17,8 @@
 
 import os.path
 import logging
+import tempfile
+import shutil
 
 from gi.repository import GLib
 
@@ -32,6 +34,28 @@ def walk_directories(dirs, filter_func):
         logging.critical("Error parsing directories", exc_info=True)
     return valid
 
+def extract_zip_file(z, members_path, dest):
+    """ returns (true_if_extracted_ok, true_if_updated) """
+    tmp = tempfile.mkdtemp()
+    tmpdest = os.path.join(tmp, members_path)
+
+    ok = True
+    updated = False
+    try:
+        if os.path.exists(dest):
+            shutil.rmtree(dest)
+            updated = True
+        z.extractall(tmp)
+        shutil.copytree(tmpdest, dest)
+    except OSError:
+        ok = False
+        logging.warning("Error extracting zip", exc_info=True)
+
+    if ok:
+        logging.info("Extracted zip to %s, copied to %s" % (tmpdest, dest))
+
+    return ok, updated
+
 class AutostartManager:
     def __init__(self, DATA_DIR, desktop_filename, exec_cmd="", extra_exec_args=""):
         self._desktop_filename = desktop_filename
diff --git a/gtweak/widgets.py b/gtweak/widgets.py
index ae6b442..a077da2 100644
--- a/gtweak/widgets.py
+++ b/gtweak/widgets.py
@@ -200,3 +200,14 @@ class GConfFontButtonTweak(_GConfTweak):
     def _on_fontbutton_changed(self, btn, param):
         self.gconf.set_value(btn.props.font_name)
 
+class ZipFileChooserButton(Gtk.FileChooserButton):
+    def __init__(self, title):
+        Gtk.FileChooserButton.__init__(self, title=title)
+
+        f = Gtk.FileFilter()
+        f.add_mime_type("application/zip")
+        self.set_filter(f)
+
+        #self.set_width_chars(15)
+        self.set_local_only(True)
+