diff --git a/.gitignore b/.gitignore index 6517bf9..8a2eb62 100644 --- a/.gitignore +++ b/.gitignore @@ -4,9 +4,9 @@ config.py .device data data-* -secret.py +src/nenuscanner/secret.py +src/nenuscanner/static/calibration-visualiser.* node_modules -static/calibration-visualiser.* # Created by https://www.toptal.com/developers/gitignore/api/python # Edit at https://www.toptal.com/developers/gitignore?templates=python diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..0c6947c --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,10 @@ +[project] +name = "nenuscanner" +version = "0.1.0" +dependencies = ["flask"] + +[project.scripts] +nenuscanner = "nenuscanner.main:main" + +[tool.setuptools.package-data] +nenuscanner = ["templates/*.html", "static/*"] diff --git a/__init__.py b/src/nenuscanner/__init__.py similarity index 96% rename from __init__.py rename to src/nenuscanner/__init__.py index 151441d..e3b7d14 100644 --- a/__init__.py +++ b/src/nenuscanner/__init__.py @@ -52,4 +52,4 @@ def send_static(path): @app.route('/data/') def send_data(path): - return send_from_directory('data', path) + return send_from_directory(config.DATA_DIR, path) diff --git a/archive.py b/src/nenuscanner/archive.py similarity index 100% rename from archive.py rename to src/nenuscanner/archive.py diff --git a/calibration.py b/src/nenuscanner/calibration.py similarity index 100% rename from calibration.py rename to src/nenuscanner/calibration.py diff --git a/camera.py b/src/nenuscanner/camera.py similarity index 100% rename from camera.py rename to src/nenuscanner/camera.py diff --git a/config.darkroom.py b/src/nenuscanner/config.darkroom.py similarity index 100% rename from config.darkroom.py rename to src/nenuscanner/config.darkroom.py diff --git a/config.local.py b/src/nenuscanner/config.local.py similarity index 100% rename from config.local.py rename to src/nenuscanner/config.local.py diff --git a/dateutils.py b/src/nenuscanner/dateutils.py similarity index 100% rename from dateutils.py rename to src/nenuscanner/dateutils.py diff --git a/db.py b/src/nenuscanner/db.py similarity index 100% rename from db.py rename to src/nenuscanner/db.py diff --git a/leds.py b/src/nenuscanner/leds.py similarity index 100% rename from leds.py rename to src/nenuscanner/leds.py diff --git a/src/nenuscanner/main.py b/src/nenuscanner/main.py new file mode 100644 index 0000000..18f2627 --- /dev/null +++ b/src/nenuscanner/main.py @@ -0,0 +1,8 @@ +#!/usr/bin/env python + +from . import app +from waitress import serve + + +def main(): + serve(app, listen='*:8000') diff --git a/math_utils.py b/src/nenuscanner/math_utils.py similarity index 100% rename from math_utils.py rename to src/nenuscanner/math_utils.py diff --git a/routes/__init__.py b/src/nenuscanner/routes/__init__.py similarity index 100% rename from routes/__init__.py rename to src/nenuscanner/routes/__init__.py diff --git a/routes/acquisition.py b/src/nenuscanner/routes/acquisition.py similarity index 100% rename from routes/acquisition.py rename to src/nenuscanner/routes/acquisition.py diff --git a/routes/calibration.py b/src/nenuscanner/routes/calibration.py similarity index 100% rename from routes/calibration.py rename to src/nenuscanner/routes/calibration.py diff --git a/routes/object.py b/src/nenuscanner/routes/object.py similarity index 100% rename from routes/object.py rename to src/nenuscanner/routes/object.py diff --git a/scanner.py b/src/nenuscanner/scanner.py similarity index 100% rename from scanner.py rename to src/nenuscanner/scanner.py diff --git a/src/nenuscanner/static/__init__.py b/src/nenuscanner/static/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/static/bulma.min.css b/src/nenuscanner/static/bulma.min.css similarity index 100% rename from static/bulma.min.css rename to src/nenuscanner/static/bulma.min.css diff --git a/static/orbit-controls.js b/src/nenuscanner/static/orbit-controls.js similarity index 100% rename from static/orbit-controls.js rename to src/nenuscanner/static/orbit-controls.js diff --git a/static/three.module.js b/src/nenuscanner/static/three.module.js similarity index 100% rename from static/three.module.js rename to src/nenuscanner/static/three.module.js diff --git a/src/nenuscanner/templates/__init__.py b/src/nenuscanner/templates/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/templates/base.html b/src/nenuscanner/templates/base.html similarity index 100% rename from templates/base.html rename to src/nenuscanner/templates/base.html diff --git a/templates/calibrate.html b/src/nenuscanner/templates/calibrate.html similarity index 100% rename from templates/calibrate.html rename to src/nenuscanner/templates/calibrate.html diff --git a/templates/calibration.html b/src/nenuscanner/templates/calibration.html similarity index 100% rename from templates/calibration.html rename to src/nenuscanner/templates/calibration.html diff --git a/templates/index.html b/src/nenuscanner/templates/index.html similarity index 100% rename from templates/index.html rename to src/nenuscanner/templates/index.html diff --git a/templates/object.html b/src/nenuscanner/templates/object.html similarity index 100% rename from templates/object.html rename to src/nenuscanner/templates/object.html diff --git a/templates/scan.html b/src/nenuscanner/templates/scan.html similarity index 100% rename from templates/scan.html rename to src/nenuscanner/templates/scan.html diff --git a/utils.py b/src/nenuscanner/utils.py similarity index 100% rename from utils.py rename to src/nenuscanner/utils.py