Merge branch 'master' of asdf.us:swimmer

4 files changed, 15 insertions, 15 deletions

diff --git a/cli/app/sql/models/graph.py b/cli/app/sql/models/graph.py
index 8e068a0..08f4d3c 100644
--- a/cli/app/sql/models/graph.py
+++ b/cli/app/sql/models/graph.py
@@ -23,6 +23,7 @@ class Graph(Base):
   updated_at = Column(UtcDateTime(), onupdate=utcnow())
 
   pages = relationship('Page', lazy='dynamic')
+  uploads = relationship('Upload', lazy='dynamic')
 
   def toJSON(self):
     return {
@@ -40,11 +41,13 @@ class Graph(Base):
   def toFullJSON(self):
     data = self.toJSON()
     data['pages'] = [ page.toLinkJSON() for page in self.pages ]
+    data['uploads'] = [ upload.toJSON() for upload in self.uploads ]
     return data
 
   def toSiteJSON(self):
     data = self.toJSON()
     data['pages'] = [ page.toFullJSON() for page in self.pages ]
+    data['uploads'] = [ upload.toJSON() for upload in self.uploads ]
     return data
 
 class GraphForm(ModelForm):
diff --git a/cli/app/sql/models/page.py b/cli/app/sql/models/page.py
index 2f7065b..35efa39 100644
--- a/cli/app/sql/models/page.py
+++ b/cli/app/sql/models/page.py
@@ -1,11 +1,11 @@
 from sqlalchemy import create_engine, Table, Column, Text, String, Integer, DateTime, JSON, ForeignKey
-from sqlalchemy.orm import relationship
+from sqlalchemy.orm import relationship, foreign, remote
 import sqlalchemy.sql.functions as func
 from sqlalchemy_utc import UtcDateTime, utcnow
 from wtforms_alchemy import ModelForm
 
 from app.sql.common import db, Base, Session
-# from app.sql.models.graph import Graph
+from app.sql.models.tile import Tile
 
 from app.settings import app_cfg
 
@@ -23,7 +23,7 @@ class Page(Base):
   updated_at = Column(UtcDateTime(), onupdate=utcnow())
 
   tiles = relationship("Tile", foreign_keys="Tile.page_id", lazy='dynamic', order_by="asc(Tile.sort_order)")
-  backlinks = relationship("Tile", foreign_keys="Tile.target_page_id", lazy='dynamic')
+  backlinks = relationship("Tile", primaryjoin=id == foreign(Tile.target_page_id), lazy='dynamic')
 
   def toJSON(self):
     return {
diff --git a/cli/app/sql/models/tile.py b/cli/app/sql/models/tile.py
index 3f6ce31..ed4a5f8 100644
--- a/cli/app/sql/models/tile.py
+++ b/cli/app/sql/models/tile.py
@@ -18,7 +18,7 @@ class Tile(Base):
   id = Column(Integer, primary_key=True)
   graph_id = Column(Integer, ForeignKey('graph.id'), nullable=True)
   page_id = Column(Integer, ForeignKey('page.id'), nullable=True)
-  target_page_id = Column(Integer, ForeignKey('page.id'), nullable=True)
+  target_page_id = Column(Integer, nullable=True)
   type = Column(String(16, convert_unicode=True), nullable=False)
   sort_order = Column(Integer, default=0)
   settings = Column(JSON, default={}, nullable=True)
diff --git a/cli/app/sql/models/upload.py b/cli/app/sql/models/upload.py
index 5863b07..d9307ff 100644
--- a/cli/app/sql/models/upload.py
+++ b/cli/app/sql/models/upload.py
@@ -1,4 +1,4 @@
-from sqlalchemy import create_engine, Table, Column, String, Integer, DateTime
+from sqlalchemy import create_engine, Table, Column, ForeignKey, String, Integer, DateTime
 import sqlalchemy.sql.functions as func
 from sqlalchemy_utc import UtcDateTime, utcnow
 from wtforms_alchemy import ModelForm
@@ -14,31 +14,28 @@ class Upload(Base):
   """Table for storing references to various media"""
   __tablename__ = 'upload'
   id = Column(Integer, primary_key=True)
+  graph_id = Column(Integer, ForeignKey('graph.id'), nullable=True)
   sha256 = Column(String(256), nullable=False)
   fn = Column(String(256), nullable=False)
   ext = Column(String(4, convert_unicode=True), nullable=False)
+  tag = Column(String(64, convert_unicode=True), nullable=True)
   username = Column(String(16, convert_unicode=True), nullable=False)
   created_at = Column(UtcDateTime(), default=utcnow())
 
   def toJSON(self):
     return {
       'id': self.id,
+      'graph_id': self.graph_id,
       'sha256': self.sha256,
       'fn': self.fn,
       'ext': self.ext,
+      'tag': self.tag,
       'username': self.username,
       'url': self.url(),
       'created_at': self.created_at,
     }
 
-  def filename(self):
-    return "{}{}".format(self.fn)
-
-  def filepath(self):
-    return join(app_cfg.DIR_UPLOADS, sha256_tree(self.sha256))
-
-  def fullpath(self):
-    return join(self.filepath(), self.filename())
-
   def url(self):
-    return join(app_cfg.URL_UPLOADS, sha256_tree(self.sha256), self.filename())
+    if self.tag:
+      return join('/static/uploads', str(self.graph_id), self.tag, self.fn)
+    return join('/static/uploads', str(self.graph_id), self.fn)