9 files changed, 116 insertions, 28 deletions
diff --git a/cli/app/sql/common.py b/cli/app/sql/common.py
index c8bd557..8e1d2b3 100644
--- a/cli/app/sql/common.py
+++ b/cli/app/sql/common.py
@@ -2,7 +2,6 @@ import os
 import glob
 import time
 
-# import mysql.connector
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker
 from sqlalchemy.ext.declarative import declarative_base
@@ -11,16 +10,16 @@ from flask_sqlalchemy import SQLAlchemy
 
 from app.settings import app_cfg
 
-# connection_url = "mysql+mysqlconnector://{}:{}@{}/{}?charset=utf8mb4".format(
-#   os.getenv("DB_USER"),
-#   os.getenv("DB_PASS"),
-#   os.getenv("DB_HOST"),
-#   os.getenv("DB_NAME")
-# )
-
-os.makedirs(app_cfg.DIR_DATABASE, exist_ok=True)
-
-connection_url = "sqlite:///{}".format(os.path.join(app_cfg.DIR_DATABASE, 'swimmer.sqlite3'))
+if app_cfg.USE_SQLITE:
+  os.makedirs(app_cfg.DIR_DATABASE, exist_ok=True)
+  connection_url = "sqlite:///{}".format(os.path.join(app_cfg.DIR_DATABASE, 'swimmer.sqlite3'))
+else:
+  connection_url = "mysql+pymysql://{}:{}@{}/{}?charset=utf8mb4".format(
+    os.getenv("DB_USER"),
+    os.getenv("DB_PASS"),
+    os.getenv("DB_HOST"),
+    os.getenv("DB_NAME")
+  )
 
 engine = create_engine(connection_url, encoding="utf-8", pool_recycle=3600)
 
@@ -31,7 +30,7 @@ Base.metadata.bind = engine
 db = SQLAlchemy()
 
 # include the models in reverse dependency order, so relationships work
+from app.sql.models.upload import Upload
 from app.sql.models.tile import Tile
 from app.sql.models.page import Page
 from app.sql.models.graph import Graph
-from app.sql.models.upload import Upload
diff --git a/cli/app/sql/env.py b/cli/app/sql/env.py
index 7753565..3e015b5 100644
--- a/cli/app/sql/env.py
+++ b/cli/app/sql/env.py
@@ -14,10 +14,10 @@ config.set_main_option("sqlalchemy.url", connection_url)
 target_metadata = Base.metadata
 
 # include the models in reverse dependency order, so relationships work
+from app.sql.models.upload import Upload
 from app.sql.models.tile import Tile
 from app.sql.models.page import Page
 from app.sql.models.graph import Graph
-from app.sql.models.upload import Upload
 
 def run_migrations_offline():
   """Run migrations in 'offline' mode.
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)
diff --git a/cli/app/sql/versions/202103161637_make_uploads_like_on_animism.py b/cli/app/sql/versions/202103161637_make_uploads_like_on_animism.py
new file mode 100644
index 0000000..18bf0bc
--- /dev/null
+++ b/cli/app/sql/versions/202103161637_make_uploads_like_on_animism.py
@@ -0,0 +1,31 @@
+"""make uploads like on animism
+
+Revision ID: 645f315e651d
+Revises: d929da3e398b
+Create Date: 2021-03-16 16:37:08.985792
+
+"""
+from alembic import op
+import sqlalchemy as sa
+import sqlalchemy_utc
+
+
+# revision identifiers, used by Alembic.
+revision = '645f315e651d'
+down_revision = 'd929da3e398b'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('upload', sa.Column('graph_id', sa.Integer(), nullable=True))
+    op.add_column('upload', sa.Column('tag', sa.String(length=64, _expect_unicode=True), nullable=True))
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('upload', 'tag')
+    op.drop_column('upload', 'graph_id')
+    # ### end Alembic commands ###
diff --git a/cli/app/sql/versions/202103161645_add_foreign_key_constraint.py b/cli/app/sql/versions/202103161645_add_foreign_key_constraint.py
new file mode 100644
index 0000000..673f9e4
--- /dev/null
+++ b/cli/app/sql/versions/202103161645_add_foreign_key_constraint.py
@@ -0,0 +1,29 @@
+"""add foreign key constraint
+
+Revision ID: 3f7df6bf63b8
+Revises: 645f315e651d
+Create Date: 2021-03-16 16:45:39.455892
+
+"""
+from alembic import op
+import sqlalchemy as sa
+import sqlalchemy_utc
+
+
+# revision identifiers, used by Alembic.
+revision = '3f7df6bf63b8'
+down_revision = '645f315e651d'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_foreign_key(None, 'upload', 'graph', ['graph_id'], ['id'])
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_constraint(None, 'upload', type_='foreignkey')
+    # ### end Alembic commands ###
diff --git a/cli/app/sql/versions/202103201916_remove_foreign_key_constraint_from_.py b/cli/app/sql/versions/202103201916_remove_foreign_key_constraint_from_.py
new file mode 100644
index 0000000..ed19feb
--- /dev/null
+++ b/cli/app/sql/versions/202103201916_remove_foreign_key_constraint_from_.py
@@ -0,0 +1,29 @@
+"""remove foreign key constraint from target_page_id
+
+Revision ID: 9b687880918d
+Revises: 3f7df6bf63b8
+Create Date: 2021-03-20 19:16:21.582373
+
+"""
+from alembic import op
+import sqlalchemy as sa
+import sqlalchemy_utc
+
+
+# revision identifiers, used by Alembic.
+revision = '9b687880918d'
+down_revision = '3f7df6bf63b8'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_constraint('tile_ibfk_3', 'tile', type_='foreignkey')
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_foreign_key('tile_ibfk_3', 'tile', 'page', ['target_page_id'], ['id'])
+    # ### end Alembic commands ###