gkeys actions: Migrate self.category setting to _set_category()

1 files changed, 10 insertions, 8 deletions

diff --git a/gkeys/gkeys/actions.py b/gkeys/gkeys/actions.py
index 07dba7a..a9d2b69 100644
--- a/gkeys/gkeys/actions.py
+++ b/gkeys/gkeys/actions.py
@@ -108,6 +108,7 @@ class Actions(ActionBase):
         if args.uid is None:
             args.uid = []
         gkey = self.seedhandler.new(args, checkgkey=True)
+        self._set_category(args.category)
         if not gkey:
             return (False, ["Failed to create a valid GKEY instance.",
                 "Check for invalid data entries"])
@@ -198,7 +199,7 @@ class Actions(ActionBase):
         # fill in code here
         if not args.category:
             args.category = 'gentoo'
-        self.category = args.category
+        self._set_category(args.category)
         if args.keydir:
             self.gpg.set_keydir(args.keydir, "list-keys")
             self.gpg.set_keyseedfile()
@@ -267,7 +268,7 @@ class Actions(ActionBase):
                     return (False, ["Search failed for search term"])
             # get confirmation
             # fill in code here
-            self.category = args.category
+            self._set_category(args.category)
             for gkey in gkeys:
                 self.gpg.set_keydir(gkey.keydir, "recv-keys")
                 self.gpg.set_keyseedfile()
@@ -325,7 +326,7 @@ class Actions(ActionBase):
             return (False, [_unicode("Please specify seeds category.")])
         self.logger.debug(_unicode("ACTIONS: checkkey; args: %s") % _unicode(args))
         seeds = self.seedhandler.load_category(args.category)
-        self.category = args.category
+        self._set_category(args.category)
         results = {}
         failed = defaultdict(list)
         kwargs = self.seedhandler.build_gkeydict(args)
@@ -375,7 +376,7 @@ class Actions(ActionBase):
             return (False, ["Please specify seeds category."])
         self.logger.debug(_unicode("ACTIONS: speccheck; args: %s")
             % _unicode(args))
-        self.category = args.category
+        self._set_category(args.category)
         catdir, keyresults = self.keyhandler.determine_keys(args)
         self.logger.debug(_unicode("ACTIONS: speccheck; catdir = %s") % catdir)
         results = {}
@@ -524,6 +525,7 @@ class Actions(ActionBase):
         self.logger.debug(_unicode("ACTIONS: removekey; kwargs: %s")
             % _unicode(kwargs))
         seeds = self.seedhandler.load_category(args.category)
+        self._set_category(args.category)
         messages = []
         if args.nick == '*':
             self.output([''],_unicode('Remove All keys in category: %s')
@@ -620,9 +622,9 @@ class Actions(ActionBase):
         '''Lists the installed key directories'''
         if args.category:
             keyring = self.config.get_key('keyring')
-            catdir = os.path.join(keyring, args.category)
         else:
             return (False, ["Please specify a category."])
+        catdir = self._set_category(args.category)
         self.logger.debug("ACTIONS: installed; catdir = %s" % catdir)
         installed_keys = []
         try:
@@ -697,7 +699,7 @@ class Actions(ActionBase):
     def _verify(self, args, key, messages=None):
         if messages == None:
             messages = []
-        self.category = args.category
+        self._set_category(args.category)
         filepath, signature  = args.filename, args.signature
         timestamp_path = None
         isurl = success = verified = False
@@ -831,9 +833,9 @@ class Actions(ActionBase):
         else:
             nicks = args.nick
         args.category = 'sign'
+        self._set_category(args.category)
         # load our installed signing keys db
         self.seeds = self.seedhandler.load_category('sign', nicks)
-        self.category = args.category
         if not self.seeds.seeds:
             return (False, ['No installed keys, try installkey action.', ''])
         keydir  = self.config.get_key("sign", "keydir")
@@ -877,7 +879,7 @@ class Actions(ActionBase):
         self.logger.debug(_unicode("ACTIONS: refreshkey; args: %s")
             % _unicode(args))
         seeds = self.seedhandler.load_category(args.category, refresh=True)
-        self.category = args.category
+        self._set_category(args.category)
         results = {}
         kwargs = self.seedhandler.build_gkeydict(args)
         keyresults = seeds.list(**kwargs)