Merge ~nteodosio/software-properties:comment-flood into software-properties:ubuntu/master

[Nathan Teodosio]

Don't show more than one comment in "other software", otherwise the interface is flooded.

The problem was surfaced by LP:2060915 (see attached screen shot[1]).

[1] https://bugs.launchpad.net/ubuntu/+source/software-properties/+bug/2060915/+attachment/5763610/+files/spimg.png

[Julian Andres Klode (juliank)]

Two things to sort out:

- The first line may be empty
- If we hide stuff should display [...]

I'd wager replacing newlines by spaces and picking a length to display would be easier avoids having to deal with empty lines at least, and can produce more details, something like:

source.comment.replace("\n", " ")[:80] + ("[...]" if len(source.comment) > 80 else "")

review: Needs Fixing

[Nathan Teodosio (nteodosio)]

Thanks for the review, I agree and implemented your suggestion.

I confirm that for a file with empty and space padded first lines, those are correctly collapsed after the processing so there is no excessive empty space in the display.

[Julian Andres Klode (juliank)]

review: Approve

[Jeremy Bícha (jbicha)]

Please use the Unicode ellipsis … instead of three periods/full stops.

[Nathan Teodosio (nteodosio)]

Done.

diff --git a/softwareproperties/SoftwareProperties.py b/softwareproperties/SoftwareProperties.py
index 25f1340..5cf771c 100644
--- a/softwareproperties/SoftwareProperties.py
+++ b/softwareproperties/SoftwareProperties.py
@@ -511,8 +511,11 @@ class SoftwareProperties(object):
     """Render a nice output to show the source in a treeview"""
     if source.template == None:
         if source.comment:
-            contents = "<b>%s</b> %s" % (escape(source.comment).strip(),
-                                         source.dist)
+            comment = (
+                source.comment.replace("\n", " ").strip()[:80]
+                + "[…]" if len(source.comment) > 80 else ""
+            )
+            contents = "<b>%s</b> %s" % (escape(comment), source.dist)
             # Only show the components if there are more than one
             if len(source.comps) > 1:
                 for c in source.comps: