Rewrite media_data handling to use relationships

[mediagoblin.git] / mediagoblin / media_types / image / models.py

diff --git a/mediagoblin/media_types/image/models.py b/mediagoblin/media_types/image/models.py
index 96b5cdf20e44890956e3b565f627a74cf0701b02..63d80aa86ed53e756589626adbce826286ed625a 100644 (file)
--- a/mediagoblin/media_types/image/models.py
+++ b/mediagoblin/media_types/image/models.py
@@ -1,16 +1,47 @@
-from mediagoblin.db.sql.models import Base
+# GNU MediaGoblin -- federated, autonomous media hosting
+# Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# 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.db.base import Base
 
 from sqlalchemy import (
-    Column, Integer, Unicode, UnicodeText, DateTime, Boolean, ForeignKey,
-    UniqueConstraint)
+    Column, Integer, Float, ForeignKey)
+from sqlalchemy.orm import relationship, backref
+from mediagoblin.db.extratypes import JSONEncoded
+
+
+BACKREF_NAME = "image__media_data"
 
 
 class ImageData(Base):
-    __tablename__ = "image__data"
+    __tablename__ = "image__mediadata"
+
+    # The primary key *and* reference to the main media_entry
+    media_entry = Column(Integer, ForeignKey('core__media_entries.id'),
+        primary_key=True)
+    get_media_entry = relationship("MediaEntry",
+        backref=backref(BACKREF_NAME, cascade="all, delete-orphan"))
 
-    id = Column(Integer, primary_key=True)
     width = Column(Integer)
     height = Column(Integer)
+    exif_all = Column(JSONEncoded)
+    gps_longitude = Column(Float)
+    gps_latitude = Column(Float)
+    gps_altitude = Column(Float)
+    gps_direction = Column(Float)
 
 
 DATA_MODEL = ImageData