Add to GUI the ability to delete charms & bundles.

charmworld/scripts/remove_charm.py

 # Copyright 2012, 2013 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 from __future__ import print_function
 
 __metaclass__ = type
 
 import sys
-from pyelasticsearch.exceptions import ElasticHttpNotFoundError
-from charmworld.utils import get_ini
+from charmworld.utils import (
+    delete_charm,
+    get_ini,
+)
 from charmworld.models import (
-    CharmSource,
-    FeaturedSource,
     getconnection,
     getdb,
 )
 from charmworld.search import ElasticSearchClient
 
 
 CHARM_ID_MESSAGE = (
-    'Please provide a charm ID, including revision. E.g., '
+    'Please provide a charm ID, including revision, e.g., '
     '~charmers/precise/apache2/14')
 
 
 def main(argv, stderr=sys.stderr, db=None, index_client=None):
-    """The main function for the server start timestamp removal script."""
+    """The main function for the charm removal script."""
     if len(argv) != 2:
         print(
             'Please provide the ID of the charm you wish to remove.',
             file=stderr)
         return 1
 
     charm_id = argv[1]
 
     if db is None:
         settings = get_ini()
         connection = getconnection(settings)
         db = getdb(connection, settings.get('mongo.database'))
 
     # If the specified charm does not exist, tell the user.
     charm_query = {'_id': charm_id}
     charm_data = db.charms.find_one(charm_query)
     if charm_data is None:
         print('Unknown charm ID: %r' % charm_id, file=stderr)
         print(CHARM_ID_MESSAGE, file=stderr)
         return 1
 
     if index_client is None:
         index_client = ElasticSearchClient.from_settings(settings)
 
-    # The charm needs to be removed from the search engine.
-    try:
-        index_client.delete_charm(charm_data)
-    except ElasticHttpNotFoundError:
-        # It is fine if the charm was not indexed.
-        pass
-
-    # If the charm is featured, we want to unfeature it.
-    source = FeaturedSource.from_db(db)
-    source.clear_featured(charm_data, 'charm')
-
-    # Finally, remove all the revisions of the charm document from the
-    # database.
-    charm_query = CharmSource.make_all_revisions_query(charm_data)
-    db.charms.remove(charm_query)
+    delete_charm(charm_data, db, index_client)
     return 0
 
 
 def entry_point():
     """Script entry point for removing a server's start up timestamp."""
     sys.exit(main(sys.argv))