From 3aa2264be48ee6c04d3525cf3e55b4d590afc42a Mon Sep 17 00:00:00 2001
From: dave <dave@davepedu.com>
Date: Sat, 6 Jul 2019 13:47:42 -0700
Subject: [PATCH] Fix img assets missing in docker

---
 {styles/dist => assets/img}/unknown.svg | 0
 photoapp/daemon.py                      | 2 +-
 photoapp/dbutils.py                     | 4 ++--
 setup.py                                | 5 +++--
 4 files changed, 6 insertions(+), 5 deletions(-)
 rename {styles/dist => assets/img}/unknown.svg (100%)

diff --git a/styles/dist/unknown.svg b/assets/img/unknown.svg
similarity index 100%
rename from styles/dist/unknown.svg
rename to assets/img/unknown.svg
diff --git a/photoapp/daemon.py b/photoapp/daemon.py
index a27c0d4..2529b65 100644
--- a/photoapp/daemon.py
+++ b/photoapp/daemon.py
@@ -264,7 +264,7 @@ class ThumbnailView(object):
         if thumb_path:
             return cherrypy.lib.static.serve_file(thumb_path, "image/jpeg")
         else:
-            return cherrypy.lib.static.serve_file(os.path.join(APPROOT, "styles/dist/unknown.svg"), "image/svg+xml")
+            return cherrypy.lib.static.serve_file(os.path.join(APPROOT, "assets/img/unknown.svg"), "image/svg+xml")
 
 
 @cherrypy.popargs('item_type', 'uuid')
diff --git a/photoapp/dbutils.py b/photoapp/dbutils.py
index 34adef0..9620f04 100644
--- a/photoapp/dbutils.py
+++ b/photoapp/dbutils.py
@@ -22,8 +22,8 @@ def get_engine_options(uri):
     return {}
 
 
-def get_db_engine(uri):
-    engine = sqlalchemy.create_engine(uri, **get_engine_options(uri))
+def get_db_engine(uri, debug=False):
+    engine = sqlalchemy.create_engine(uri, **get_engine_options(uri), echo=debug)
     Base.metadata.create_all(engine)
     return engine
 
diff --git a/setup.py b/setup.py
index 9572467..e667a43 100644
--- a/setup.py
+++ b/setup.py
@@ -22,11 +22,12 @@ setup(name='photoapp',
               "photocli = photoapp.cli:main",
               # "photoimport = photoapp.ingest:main",  # broken for now
               # "photovalidate = photoapp.validate:main",
-              #"photooffset = photoapp.dateoffset:main",
+              # "photooffset = photoapp.dateoffset:main",
           ]
       },
       include_package_data=True,
       package_data={'photoapp': ['../templates/*.html',
                                  '../templates/fragments/*.html',
-                                 '../styles/dist/*']},
+                                 '../styles/dist/*',
+                                 '../assets/img/*']},
       zip_safe=False)