Ticket #1499: actutils.patch

actutils.py

@@ -100 +100 @@
     """This class helps with the installation/upgrade of activity and
     content bundles."""
     def __init__(self, filename):
+        if os.path.isdir(filename):
+            self._init_dir(filename)
+        else:
+            self._init_zip(filename)
+
+    def _init_dir(self, dirname):
+        # check for a activity.info file to determine whether this is an
+        # activity or content bundle.
+        if os.path.exists("%s/activity/activity.info" % dirname):
+            self.bundle = ActivityBundle(dirname)
+            self.is_activity = True
+        else:
+            self.bundle = ContentBundle(dirname)
+            self.is_activity = False
+
+    def _init_zip(self, filename):
         # check for a activity.info file to determine whether this is an
         # activity or content bundle.
         zf = ZipFile(filename)
@@ -161 +177 @@
             self._activity_install_or_upgrade(registry)
         else:
             self._library_install_or_upgrade()
+
+    def handle_inplace_upgrade(self, registry, old_path):
+        """Perform any post-upgrade tasks needed when an activity has been
+        updated in-place on the filesystem."""
+        if not self.is_activity:
+            # just regenerate the index
+            self.bundle._run_indexer()
+            return
+
+        # update activity registry
+        fav = registry.get_activity(self.bundle.get_bundle_id()).favorite
+        registry.remove_bundle(old_path)
+        registry.add_bundle(self.bundle.get_path())
+        registry.set_activity_favorite(self.bundle.get_bundle_id(),
+                                       self.bundle.get_activity_version(),
+                                       fav)
+