aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/db
diff options
context:
space:
mode:
Diffstat (limited to 'mediagoblin/db')
-rw-r--r--mediagoblin/db/migrations.py34
-rw-r--r--mediagoblin/db/models.py7
2 files changed, 39 insertions, 2 deletions
diff --git a/mediagoblin/db/migrations.py b/mediagoblin/db/migrations.py
index f1f625b7..712f8ab4 100644
--- a/mediagoblin/db/migrations.py
+++ b/mediagoblin/db/migrations.py
@@ -14,6 +14,8 @@
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from mediagoblin.util import cleaned_markdown_conversion
+
from mongokit import DocumentMigration
@@ -33,5 +35,35 @@ class MediaEntryMigration(DocumentMigration):
self.collection.update(
self.target, self.update, multi=True, safe=True)
+ def allmigration02_add_description_html(self):
+ """
+ Now that we can have rich descriptions via Markdown, we should
+ update all existing entries to record the rich description versions.
+ """
+ self.target = {'description_html': {'$exists': False},
+ 'description': {'$exists': True}}
-MIGRATE_CLASSES = ['MediaEntry']
+ if not self.status:
+ for doc in self.collection.find(self.target):
+ self.update = {
+ '$set': {
+ 'description_html': cleaned_markdown_conversion(
+ doc['description'])}}
+
+class UserMigration(DocumentMigration):
+ def allmigration01_add_bio_and_url_profile(self):
+ """
+ User can elaborate profile with home page and biography
+ """
+ self.target = {'url': {'$exists': False},
+ 'bio': {'$exists': False}}
+ if not self.status:
+ for doc in self.collection.find(self.target):
+ self.update = {
+ '$set': {'url': '',
+ 'bio': ''}}
+ self.collection.update(
+ self.target, self.update, multi=True, safe=True)
+
+
+MIGRATE_CLASSES = ['MediaEntry', 'User']
diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py
index d77cf619..600b79ff 100644
--- a/mediagoblin/db/models.py
+++ b/mediagoblin/db/models.py
@@ -46,6 +46,8 @@ class User(Document):
'status': unicode,
'verification_key': unicode,
'is_admin': bool,
+ 'url' : unicode,
+ 'bio' : unicode
}
required_fields = ['username', 'created', 'pw_hash', 'email']
@@ -56,6 +58,8 @@ class User(Document):
'status': u'needs_email_verification',
'verification_key': lambda: unicode(uuid.uuid4()),
'is_admin': False}
+
+ migration_handler = migrations.UserMigration
def check_login(self, password):
"""
@@ -73,7 +77,8 @@ class MediaEntry(Document):
'title': unicode,
'slug': unicode,
'created': datetime.datetime,
- 'description': unicode,
+ 'description': unicode, # May contain markdown/up
+ 'description_html': unicode, # May contain plaintext, or HTML
'media_type': unicode,
'media_data': dict, # extra data relevant to this media_type
'plugin_data': dict, # plugins can dump stuff here.