Move modules into an actual package

etiquette/__init__.py

@@ -0,0 +1 @@
+pass

etiquette/constants.py

@@ -100,7 +100,7 @@ SQL_USER = _sql_dictify(SQL_USER_COLUMNS)
 
 
 # Errors and warnings
-ERROR_DATABASE_OUTOFDATE = 'Database is out-of-date. {current} should be {new}. Please use etiquette_upgrader.py'
+ERROR_DATABASE_OUTOFDATE = 'Database is out-of-date. {current} should be {new}. Please use utilities\\etiquette_upgrader.py'
 ERROR_INVALID_ACTION = 'Invalid action'
 ERROR_NO_SUCH_TAG = 'Doesn\'t exist'
 ERROR_NO_TAG_GIVEN = 'No tag name supplied'

etiquette/decorators.py

@@ -4,7 +4,7 @@ import functools
 import time
 import warnings
 
-import jsonify
+from . import jsonify
 
 
 def required_fields(fields):

etiquette/helpers.py

@@ -3,8 +3,8 @@ import math
 import mimetypes
 import os
 
-import constants
+from . import constants
-import exceptions
+from . import exceptions
 
 from voussoirkit import bytestring
 

etiquette/jsonify.py

@@ -1,7 +1,8 @@
 import flask
-import helpers
 import json
 
+from . import helpers
+
 def make_json_response(j, *args, **kwargs):
     dumped = json.dumps(j)
     response = flask.Response(dumped, *args, **kwargs)

etiquette/objects.py

@@ -2,10 +2,10 @@ import os
 import PIL.Image
 import traceback
 
-import constants
+from . import constants
-import decorators
+from . import decorators
-import exceptions
+from . import exceptions
-import helpers
+from . import helpers
 
 from voussoirkit import bytestring
 from voussoirkit import pathclass

etiquette/phototagger.py

@@ -9,12 +9,12 @@ import sqlite3
 import string
 import time
 
-import constants
+from . import constants
-import decorators
+from . import decorators
-import exceptions
+from . import exceptions
-import helpers
+from . import helpers
-import objects
+from . import objects
-import searchhelpers
+from . import searchhelpers
 
 from voussoirkit import pathclass
 from voussoirkit import safeprint
@@ -551,11 +551,16 @@ class PDBPhotoMixin:
             self.commit()
         return photo
 
-    def purge_deleted_files(self, *, commit=True):
+    def purge_deleted_files(self, photos=None, *, commit=True):
         '''
         Remove Photo entries if their corresponding file is no longer found.
+
+        photos: An iterable of Photo objects to check.
+        If not provided, everything is checked.
         '''
-        photos = self.get_photos_by_recent()
+        if photos is None:
+            photos = self.get_photos_by_recent()
+
         for photo in photos:
             if os.path.exists(photo.real_filepath):
                 continue

etiquette/searchhelpers.py

@@ -1,9 +1,9 @@
 import shlex
 
-import constants
+from . import constants
-import exceptions
+from . import exceptions
-import helpers
+from . import helpers
-import objects
+from . import objects
 
 def build_query(orderby):
     query = 'SELECT * FROM photos'

etiquette/sessions.py

@@ -1,9 +1,10 @@
 import flask
 from flask import request
 import functools
-import helpers
 import uuid
 
+from . import helpers
+
 def _generate_token():
     token = str(uuid.uuid4())
     #print('MAKE SESSION', token)

etiquette_repl.py

@@ -1,10 +1,10 @@
 # Use with
 # py -i etiquette_easy.py
 
-import phototagger
+import etiquette.phototagger
 import os
 import sys
-P = phototagger.PhotoDB()
+P = etiquette.phototagger.PhotoDB()
 import traceback
 
 def easytagger():

etiquette_site.py

@@ -8,17 +8,25 @@ import urllib.parse
 import warnings
 import zipstream
 
-import constants
+from etiquette import constants
-import decorators
+from etiquette import decorators
-import exceptions
+from etiquette import exceptions
-import helpers
+from etiquette import helpers
-import jsonify
+from etiquette import jsonify
-import objects
+from etiquette import objects
-import phototagger
+from etiquette import phototagger
-import searchhelpers
+from etiquette import searchhelpers
-import sessions
+from etiquette import sessions
 
-site = flask.Flask(__name__)
+
+TEMPLATE_DIR = 'C:\\git\\Etiquette\\templates'
+STATIC_DIR = 'C:\\git\\Etiquette\\static'
+
+site = flask.Flask(
+    __name__,
+    template_folder=TEMPLATE_DIR,
+    static_folder=STATIC_DIR,
+)
 site.config.update(
     SEND_FILE_MAX_AGE_DEFAULT=180,
     TEMPLATES_AUTO_RELOAD=True,
@@ -249,7 +257,7 @@ def logout():
 @site.route('/favicon.ico')
 @site.route('/favicon.png')
 def favicon():
-    filename = os.path.join('static', 'favicon.png')
+    filename = os.path.join(STATIC_DIR, 'favicon.png')
     return flask.send_file(filename)
 
 
@@ -549,14 +557,6 @@ def get_search_json():
     return jsonify.make_json_response(search_results)
 
 
-@site.route('/static/<filename>')
-def geft_static(filename):
-    filename = filename.replace('\\', os.sep)
-    filename = filename.replace('/', os.sep)
-    filename = os.path.join('static', filename)
-    return flask.send_file(filename)
-
-
 def get_tags_core(specific_tag=None):
     try:
         tags = P.export_tags(phototagger.tag_export_easybake, specific_tag=specific_tag)

etiquette_site_launch.py

@@ -1,7 +1,7 @@
 import gevent.monkey
 gevent.monkey.patch_all()
 
-import etiquette
+import etiquette_site
 import gevent.pywsgi
 import gevent.wsgi
 import sys
@@ -14,14 +14,14 @@ else:
 if port == 443:
     http = gevent.pywsgi.WSGIServer(
         listener=('0.0.0.0', port),
-        application=etiquette.site,
+        application=etiquette_site.site,
         keyfile='C:\\git\\etiquette\\etiquette\\https\\etiquette.key',
         certfile='C:\\git\\etiquette\\etiquette\\https\\etiquette.crt',
     )
 else:
     http = gevent.pywsgi.WSGIServer(
         listener=('0.0.0.0', port),
-        application=etiquette.site,
+        application=etiquette_site.site,
     )