Merge lp:~aaronp/software-center/fix-794060-oneiric into lp:software-center

[Aaron Peachey]

same as v4.0 fix for bug lp: #794060, written for trunk

=== modified file 'debian/changelog'
--- debian/changelog	2011-06-17 22:17:12 +0000
+++ debian/changelog	2011-06-19 10:48:35 +0000
@@ -37,7 +37,14 @@
     - use "normalize_package_description()" here for the description
       building
 
- -- Gary Lasker <[e-mail]>  Fri, 17 Jun 2011 18:15:52 -0400
+  [ Aaron Peachey ]
+  * softwarecenter/backend/reviews.py,
+    softwarecenter/ui/gtk/appdetailsview_gtk.py,
+    softwarecenter/ui/gtk/widgets/reviews.py:
+    - fix duplication of reviews after user has submitted
+      usefulness, flagged or submitted a review (LP: #794060)
+
+ -- Aaron Peachey <[e-mail]>  Sun, 19 Jun 2011 20:41:40 +1000
 
 software-center (4.1.5) oneiric; urgency=low
 
 
=== modified file 'softwarecenter/backend/reviews.py'
--- softwarecenter/backend/reviews.py	2011-06-01 08:04:32 +0000
+++ softwarecenter/backend/reviews.py	2011-06-19 10:48:35 +0000
@@ -366,7 +366,7 @@
                     if str(review.id) == str(review_id):
                         # remove the one we don't want to see anymore
                         self._reviews[app].remove(review)
-                        callback(app, self._reviews[app])
+                        callback(app, self._reviews[app], None, 'remove', review)
                         break
 
     def _on_submit_usefulness_finished(self, pid, status, (review_id, is_useful, stdout_fd, callback)):
@@ -389,7 +389,7 @@
                         review.usefulness_total = getattr(review, "usefulness_total", 0) + 1
                         if is_useful:
                             review.usefulness_favorable = getattr(review, "usefulness_favorable", 0) + 1
-                        callback(app, self._reviews[app], useful_votes)
+                        callback(app, self._reviews[app], useful_votes, 'replace', review)
                         break
         else:
             LOG.debug("submit usefulness id=%s failed with exitcode %s" % (
@@ -398,7 +398,7 @@
                 for review in reviews:
                     if str(review.id) == str(review_id):
                         review.usefulness_submit_error = exitcode
-                        callback(app, self._reviews[app])
+                        callback(app, self._reviews[app], None, 'replace', review)
                         break
 
 
 
=== modified file 'softwarecenter/ui/gtk/appdetailsview_gtk.py'
--- softwarecenter/ui/gtk/appdetailsview_gtk.py	2011-06-17 14:55:07 +0000
+++ softwarecenter/ui/gtk/appdetailsview_gtk.py	2011-06-19 10:48:35 +0000
@@ -805,6 +805,13 @@
             self.app, self._reviews_ready_callback, 
             page=self._reviews_server_page,
             language=self._reviews_server_language)
+    
+    def _review_update_single(self, action, review):
+        if action == 'replace':
+            self.reviews.replace_review(review)
+        elif action == 'remove':
+            self.reviews.remove_review(review)
+        return
 
     def _update_review_stats_widget(self, stats):
         if stats:
@@ -817,7 +824,8 @@
         else:
             self.review_stats_widget.hide()
 
-    def _reviews_ready_callback(self, app, reviews_data, my_votes=None):
+    def _reviews_ready_callback(self, app, reviews_data, my_votes=None,
+                                action=None, single_review=None):
         """ callback when new reviews are ready, cleans out the
             old ones
         """
@@ -850,8 +858,13 @@
         if my_votes:
             self.reviews.update_useful_votes(my_votes)
         
-        for review in reviews_data:
-            self.reviews.add_review(review)
+        if action:
+            self._review_update_single(action, single_review)
+        else:
+            curr_list = self.reviews.get_all_review_ids()
+            for review in reviews_data:
+                if not review.id in curr_list:
+                    self.reviews.add_review(review)
         self.reviews.configure_reviews_ui()
 
     def on_weblive_progress(self, weblive, progress):
 
=== modified file 'softwarecenter/ui/gtk/widgets/reviews.py'
--- softwarecenter/ui/gtk/widgets/reviews.py	2011-06-05 22:50:04 +0000
+++ softwarecenter/ui/gtk/widgets/reviews.py	2011-06-19 10:48:35 +0000
@@ -869,10 +869,13 @@
             button.show()
             self.vbox.pack_start(button)                
 
-        # only show the "More" button if there is a chance that there
-        # are more
-        if self.reviews and len(self.reviews) % REVIEWS_BATCH_PAGE_SIZE == 0:
-            button = gtk.Button(_("Show more reviews"))
+        # aaronp: removed check to see if the length of reviews is divisible by
+        # the batch size to allow proper fixing of LP: #794060 as when a review
+        # is submitted and appears in the list, the pagination will break this
+        # check and make it unreliable
+        # if self.reviews and len(self.reviews) % REVIEWS_BATCH_PAGE_SIZE == 0:
+        if self.reviews:
+            button = gtk.Button(_("Check for more reviews"))
             button.connect("clicked", self._on_more_reviews_clicked)
             button.show()
             self.vbox.pack_start(button)                
@@ -891,6 +894,28 @@
     def add_review(self, review):
         self.reviews.append(review)
         return
+        
+    def replace_review(self, review):
+        for r in self.reviews:
+            if r.id == review.id:
+                pos = self.reviews.index(r)
+                self.reviews.remove(r)
+                self.reviews.insert(pos, review)
+                break
+        return
+
+    def remove_review(self, review):
+        for r in self.reviews:
+            if r.id == review.id:
+                self.reviews.remove(r)
+                break
+        return
+
+    def get_all_review_ids(self):
+        ids = []
+        for review in self.reviews:
+            ids.append(review.id)
+        return ids 
 
     def clear(self):
         self.reviews = []
 
=== modified file 'utils/submit_review.py'
--- utils/submit_review.py	2011-06-06 08:49:12 +0000
+++ utils/submit_review.py	2011-06-19 10:48:35 +0000
@@ -606,7 +606,7 @@
         try:
             icon = self.icons.load_icon(iconname, self.APP_ICON_SIZE, 0)
         except:
-            icon = self.icons.load_icon(Icons.MISSING_APP_ICON, self.APP_ICON_SIZE, 0)
+            icon = self.icons.load_icon(Icons.MISSING_APP, self.APP_ICON_SIZE, 0)
         self.review_appicon.set_from_pixbuf(icon)
 
         # title