From: Josie <josephine.bartholoma@mgail.com>
Date: Tue, 19 Nov 2013 01:05:15 +0000 (-0500)
Subject: Addressed ticket number 630 by removing MediaEntry.collected
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=7dfcc538d3a5f9aaedee294d4a870c2676470d68;p=mediagoblin.git

Addressed ticket number 630 by removing MediaEntry.collected
---

diff --git a/mediagoblin/db/migrations.py b/mediagoblin/db/migrations.py
index 966817fc..339bc963 100644
--- a/mediagoblin/db/migrations.py
+++ b/mediagoblin/db/migrations.py
@@ -706,4 +706,18 @@ def create_moderation_tables(db):
         email_verified.drop()
         is_admin.drop()
 
+    db.commit()
+@RegisterMigration(19, MIGRATIONS)
+def drop_MediaEntry_collected(db):
+    """
+    Drop unused MediaEntry.collected column
+    """
+    metadata = MetaData(bind=db.bind)
+    media_collected= inspect_table(metadata, 'core__media_entries')
+
+    media_collected = media_collected.columns['collected']
+
+        
+    media_collected.drop()
+        
     db.commit()
diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py
index 1514a3aa..079578a2 100644
--- a/mediagoblin/db/models.py
+++ b/mediagoblin/db/models.py
@@ -219,12 +219,11 @@ class MediaEntry(Base, MediaEntryMixin):
     state = Column(Unicode, default=u'unprocessed', nullable=False)
         # or use sqlalchemy.types.Enum?
     license = Column(Unicode)
-    collected = Column(Integer, default=0)
+
     file_size = Column(Integer, default=0)
 
     fail_error = Column(Unicode)
     fail_metadata = Column(JSONEncoded)
-
     transcoding_progress = Column(SmallInteger)
 
     queued_media_file = Column(PathTupleWithSlashes)
diff --git a/mediagoblin/user_pages/lib.py b/mediagoblin/user_pages/lib.py
index 80eb30bd..16da89d6 100644
--- a/mediagoblin/user_pages/lib.py
+++ b/mediagoblin/user_pages/lib.py
@@ -1,4 +1,4 @@
-# GNU MediaGoblin -- federated, autonomous media hosting
+# GNU MediaGobli:n -- federated, autonomous media hosting
 # Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
 #
 # This program is free software: you can redistribute it and/or modify
@@ -72,7 +72,7 @@ def add_media_to_collection(collection, media, note=None, commit=True):
     collection.items = collection.items + 1
     Session.add(collection)
 
-    media.collected = media.collected + 1
+   
     Session.add(media)
 
     if commit:
diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py
index 73823e4d..64fa793e 100644
--- a/mediagoblin/user_pages/views.py
+++ b/mediagoblin/user_pages/views.py
@@ -389,7 +389,6 @@ def collection_item_confirm_remove(request, collection_item):
 
         if form.confirm.data is True:
             entry = collection_item.get_media_entry
-            entry.collected = entry.collected - 1
             entry.save()
 
             collection_item.delete()
@@ -436,7 +435,6 @@ def collection_confirm_delete(request, collection):
             # Delete all the associated collection items
             for item in collection.get_collection_items():
                 entry = item.get_media_entry
-                entry.collected = entry.collected - 1
                 entry.save()
                 item.delete()