Merge lp:~andrewmccarthy/unity-lens-photos/less-tags-in-preview-raring into lp:unity-lens-photos/raring

[Andrew McCarthy]

Tidies up the display of tags in shotwell photo previews by changing to a newline-separated list, and also removing duplicate prefixes in hierarchical tags. Cosmetic change only.

[David Callé (davidc3)]

Looks good.

[Michael Terry (mterry)]

Did you mean to approve, David? Do we want design feedback on this?

[lp:~andrewmccarthy/unity-lens-photos/less-tags-in-preview-raring]

138. By Andrew McCarthy on 2013-06-14

Remove leading slash in Shotwell's hierarchical tags.

Unmerged revisions

138. By Andrew McCarthy on 2013-06-14

Remove leading slash in Shotwell's hierarchical tags.

137. By Andrew McCarthy on 2013-06-12

Tidy up tagging in preview by using newline-separated list and removing tags with common prefixes

=== modified file 'src/shotwell_scope.py'
--- src/shotwell_scope.py	2012-11-06 16:36:53 +0000
+++ src/shotwell_scope.py	2013-06-14 20:32:26 +0000
@@ -180,8 +180,8 @@
                                 height = str(photo[3])
                                 filesize = self.humanize_bytes(photo[4])
                                 dimensions = _("%s x %s pixels") % (width, height)
-                                tags_raw = self.getTagsForPhotoId(db, photo[0])
-                                tags = ', '.join(tags_raw.split("__"))[2:]
+                                tags_raw = self.getMinTagsForPhotoId(db, photo[0])
+                                tags = '\n'.join(tags_raw)
                                 if dimensions:
                                     preview.add_info(Unity.InfoHint.new("dimensions", _("Dimensions"), None, dimensions))
                                 if filesize:
@@ -497,6 +497,23 @@
         return string_of_tags
 
 
+    def getMinTagsForPhotoId (self, db, photo):
+        """Get minimal tags related to a photo, removing repeated tags in a hierarchy"""
+        thumb_id = "thumb%016x" % photo
+        sql='SELECT LTRIM(name,\'/\') FROM TagTable WHERE photo_id_list LIKE ? ORDER BY name'
+        args=['%'+thumb_id+'%']
+        cursor = db.cursor ()
+        tags = cursor.execute(sql, args).fetchall()
+        cursor.close ()
+        results = [t[0] for t in tags]
+        i = 1
+        while i < len(results):
+            if results[i].startswith(results[i-1]):
+                del results[i-1]
+            else:
+                i += 1
+        return results
+
     def humanize_bytes(self, bytes, precision=1):
         """Get a humanized string representation of a number of bytes."""
         abbrevs = ((10**15, 'PB'),(10**12, 'TB'),(10**9, 'GB'),(10**6, 'MB'),(10**3, 'kB'),(1, 'b'))