make the saved arch filter work on first start (#28)

timlau · Apr 30, 2015 · 114affe · 114affe
1 parent 969a160
commit 114affe
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/src/yumex/__init__.py b/src/yumex/__init__.py
@@ -313,7 +313,10 @@ def __init__(self, app, status):
         self.search_type = 'prefix'
         self.last_search_pkgs = []
         self.current_filter_search = None
-        self.active_archs = const.PLATFORM_ARCH
+        if CONFIG.conf.archs:
+            self.active_archs = CONFIG.conf.archs
+        else:
+            self.active_archs = list(const.PLATFORM_ARCH)
         self._grps = None   # Group and Category cache
         self.active_page = None  # Active content page
         self.search_fields = CONFIG.conf.search_fields
@@ -547,7 +550,7 @@ def setup_main_content(self):
         self.queue_view = views.QueueView(queue_menu)
         arch_menu_widget = self.ui.get_object('arch_menu')
         self.arch_menu = yumex.gui.widgets.ArchMenu(arch_menu_widget,
-                                                    self.active_archs)
+                                                    const.PLATFORM_ARCH)
         self.arch_menu.connect('arch-changed', self.on_arch_changed)
         self.package_view = views.PackageView(self.queue_view, self.arch_menu)
         self.package_view.connect(
@@ -759,6 +762,7 @@ def on_arch_changed(self, widget, data):
         """Arch changed in arch menu callback."""
         self.active_archs = data.split(',')
         logger.debug('arch-changed : %s' % self.active_archs)
+        self.arch_filter.change(self.active_archs)
         if self.last_search:
             data = self.last_search
             self.last_search = None

diff --git a/src/yumex/const.py b/src/yumex/const.py
@@ -47,7 +47,7 @@
     '/usr/bin/rpm --eval %_arch', shell=True).decode("utf-8")[:-1]
 
 ARCH_DICT = {
-    "x86_64": set(['86_64', 'i686', 'i386', 'noarch']),
+    "x86_64": set(['x86_64', 'i686', 'i386', 'noarch']),
     "i386": set(['i686', 'i386', 'noarch']),
     "armhfp": set(['armv7hl', 'noarch'])
 }

diff --git a/src/yumex/gui/widgets.py b/src/yumex/gui/widgets.py
@@ -124,11 +124,11 @@ class ArchMenu(GObject.GObject):
     def __init__(self, arch_menu_widget, archs):
         GObject.GObject.__init__(self)
         self.all_archs = archs
-        self.current_archs = archs
         self.arch_menu_widget = arch_menu_widget
         if not CONFIG.conf.archs:
             CONFIG.conf.archs = list(archs)
             CONFIG.write()
+        self.current_archs = set(CONFIG.conf.archs)
         self.arch_menu = self._setup_archmenu()
 
     def _setup_archmenu(self):