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

[Aaron Peachey]

Fixes lp:#794060 which was resulting in review duplication after a review activity (e.g. submit usefulness) as pagination code introduced in 4.0.3 no longer clears the reviews in the app details view before reloading them.

Once (and if) this branch is approved, I'll re-write the fix separately for trunk too (since the refactoring has changed alot of the structure in trunk since 4.0).

[Michael Vogt (mvo)]

On Fri, Jun 10, 2011 at 01:38:36PM -0000, Aaron Peachey wrote:
> Aaron Peachey has proposed merging lp:~aaronp/software-center/fix-794060-for-4.0 into lp:software-center/4.0.
>
> Requested reviews:
> software-store-developers (software-store-developers)
> Related bugs:
> Bug #794060 in software-center (Ubuntu): "Software Centre duplicate reviews"
> https://bugs.launchpad.net/ubuntu/+source/software-center/+bug/794060
>
> For more details, see:
> https://code.launchpad.net/~aaronp/software-center/fix-794060-for-4.0/+merge/64183
>
> Fixes lp:#794060 which was resulting in review duplication after a review activity (e.g. submit usefulness) as pagination code introduced in 4.0.3 no longer clears the reviews in the app details view before reloading them.
>
> Once (and if) this branch is approved, I'll re-write the fix separately for trunk too (since the refactoring has changed alot of the structure in trunk since 4.0).
[..]

Indeed, thanks a lot for this! This is a good catch. I merged it now
and will push it to proposed next.

Thanks,
 Michael

=== modified file 'softwarecenter/db/reviews.py'
--- softwarecenter/db/reviews.py	2011-05-10 13:35:36 +0000
+++ softwarecenter/db/reviews.py	2011-06-10 13:38:30 +0000
@@ -299,7 +299,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)):
@@ -322,7 +322,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" % (
@@ -331,7 +331,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/view/appdetailsview_gtk.py'
--- softwarecenter/view/appdetailsview_gtk.py	2011-05-10 14:40:05 +0000
+++ softwarecenter/view/appdetailsview_gtk.py	2011-06-10 13:38:30 +0000
@@ -785,8 +785,17 @@
         self.review_loader.get_reviews(
             self.app, self._reviews_ready_callback,
             page=self._reviews_server_page)
+    
+    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 _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
         """
@@ -819,8 +828,11 @@
         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:
+            for review in reviews_data:
+                self.reviews.add_review(review)
         self.reviews.configure_reviews_ui()
 
     def on_test_drive_clicked(self, button):

=== modified file 'softwarecenter/view/widgets/reviews.py'
--- softwarecenter/view/widgets/reviews.py	2011-05-31 06:23:01 +0000
+++ softwarecenter/view/widgets/reviews.py	2011-06-10 13:38:30 +0000
@@ -881,6 +881,22 @@
     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 clear(self):
         self.reviews = []