Merge lp:~mfisch/ubuntu-accomplishments-daemon/ubuntu-accomplishments-daemon-small-fixes into lp:ubuntu-accomplishments-daemon

[Matt Fischer]

Fixes two small bugs:

if icon has no "." in the name, you get an exception - 10240512
get_block_ubuntuone_notification_bubbles() parses config on it's own, should use config.get_boolean() - 1024052

=== modified file 'accomplishments/daemon/api.py'
--- accomplishments/daemon/api.py	2012-07-19 18:30:37 +0000
+++ accomplishments/daemon/api.py	2012-07-19 19:55:25 +0000
@@ -1182,24 +1182,26 @@
             return None
         else:
             return res
-        
+
     def get_acc_icon(self,accomID):
         return self.accDB[accomID]['icon']
-        
+
     def get_acc_icon_path(self,accomID):
         imagesdir = os.path.join(self.dir_cache,'trophyimages')
         imagesdir = os.path.join(imagesdir,self.get_acc_collection(accomID))
         iconfile = self.get_acc_icon(accomID)
-        # XXX - this will fail if the icon passed in does not have a .
-        # in the file name - LP: 1024012
-        iconfilename, iconfileext = iconfile.split(".")
+        iconfilename, iconfileext = os.path.splitext(iconfile)
+
+        # safely handle files without extensions
+        if not iconfileext:
+            iconfileext = ""
         if not self.get_acc_is_unlocked(accomID):
             iconfilename = iconfilename + '-locked'
         elif not self.get_acc_is_completed(accomID):
             iconfilename = iconfilename + '-opportunity'
-        iconfile = iconfilename + "." + iconfileext
+        iconfile = iconfilename + iconfileext
         return os.path.join(imagesdir,iconfile)
-    
+
     def get_acc_needs_info(self,accomID):
         if not 'needs-information' in self.accDB[accomID]:
             return []
@@ -1554,10 +1556,10 @@
         elif value == False:
             if config.has_section("notifications"):
                 config.set('notifications', 'show_all_notifications', "True")
-        
+
         with open(cfile, 'wb') as configfile:
             config.write(configfile)
-            
+
     def get_block_ubuntuone_notification_bubbles(self):
         u1configdir = os.path.join(
             xdg.BaseDirectory.xdg_config_home, "ubuntuone")
@@ -1568,15 +1570,13 @@
             config = ConfigParser.ConfigParser()
             config.read(cfile)
 
-            if(config.read(cfile)):
+            if (config.read(cfile)):
                 if config.has_section("notifications"):
-                    val = config.get('notifications', 'show_all_notifications')
-                    if val == "false" or val == "False":
-                        return True
-                    else:
-                        return False
-        else:
-            return False
+                    val = config.getboolean('notifications',
+                            'show_all_notifications')
+                    return val
+
+        return False
 
     def _coll_from_accomID(self,accomID):
         return accomID.split("/")[0]

=== modified file 'accomplishments/daemon/tests/accomps/second.accomplishment'
--- accomplishments/daemon/tests/accomps/second.accomplishment	2012-07-13 23:00:12 +0000
+++ accomplishments/daemon/tests/accomps/second.accomplishment	2012-07-19 19:55:25 +0000
@@ -1,6 +1,6 @@
 [accomplishment]
 title=My Second Accomplishment
-icon=second.jpg
+icon=second
 description=An example accomplishment for the test suite, with dependency
 depends=testaccomp/first
 needs-signing=True

=== modified file 'accomplishments/daemon/tests/tests.py'
--- accomplishments/daemon/tests/tests.py	2012-07-19 16:35:51 +0000
+++ accomplishments/daemon/tests/tests.py	2012-07-19 19:55:25 +0000
@@ -449,12 +449,19 @@
     # also tests get_acc_icon_path
     def test_get_acc_icon(self):
         self.util_copy_accomp(self.accomp_dir, "first")
+        self.util_copy_accomp(self.accomp_dir, "second")
         a = api.Accomplishments(None, None, True)
         self.assertEquals(a.get_acc_icon('%s/first' % self.ACCOMP_SET),
            'first.jpg')
         icon_path = a.get_acc_icon_path('%s/first' % self.ACCOMP_SET)
         self.assertTrue(icon_path.endswith("first-opportunity.jpg"))
 
+        # LP 1024052 - make sure this works without a . in the filename
+        self.assertEquals(a.get_acc_icon('%s/second' % self.ACCOMP_SET),
+           'second')
+        icon_path = a.get_acc_icon_path('%s/second' % self.ACCOMP_SET)
+        self.assertTrue(icon_path.endswith("second-locked"))
+
     def test_build_viewer_database(self):
         self.util_remove_all_accomps(self.accomp_dir)
         self.util_copy_accomp(self.accomp_dir, "first")