source
/
nenuscanner
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Working

This commit is contained in:
Nicolas Bertrand 2025-10-10 00:42:36 +02:00
parent 5fba1ce900
commit 7c5ab98553
8 changed files with 79 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nenuscanner/__init__.py
View File

@ -2,6 +2,8 @@ from flask import Flask, send_from_directory, session
import os
from . import db, config, routes, utils, leds
leds.get().enter()
app = Flask(__name__)
# Manage secret key

34
src/nenuscanner/camera.py
View File

@ -6,6 +6,8 @@ import shutil
from . import leds, config
import subprocess
import json
from PIL import Image
import io
def parse_config(lines):
@ -62,14 +64,18 @@ class Camera:
class RealCamera(Camera):
def __init__(self):
self._entered = False
self.inner = gp.Camera()
def __enter__(self):
self.inner.init()
if not self._entered:
self._entered = True
self.inner.init()
return self
def __exit__(self, *args):
self.inner.exit()
# self.inner.exit()
pass
def capture(self):
try:
@ -79,14 +85,11 @@ class RealCamera(Camera):
return None
def capture_preview(self):
try:
subprocess.run(
"gphoto2 --capture-preview --stdout > src/nenuscanner/static/feed.jpg",
shell=True, check=True
)
except subprocess.CalledProcessError as e:
print('An error occured when capturing photo', e)
raise CameraException(f"Erreur lors de la capture de l'image: {e}")
capture = gp.check_result(gp.gp_camera_capture_preview(self.inner))
file_data = gp.check_result(gp.gp_file_get_data_and_size(capture))
data = memoryview(file_data)
image = Image.open(io.BytesIO(file_data))
image.save("src/nenuscanner/static/feed.jpg")
def save(self, capture, output_file):
preview = self.inner.file_get(capture.folder, capture.name[:-3] + 'JPG', gp.GP_FILE_TYPE_NORMAL)
@ -97,8 +100,17 @@ class RealCamera(Camera):
raw.save(output_file + '.cr2')
def config(self):
was_entered = self._entered
if self._entered:
self._entered = False
self.inner.exit()
res = subprocess.run(["gphoto2", "--list-all-config"], capture_output=True, encoding="utf-8")
if was_entered:
self.__enter__()
# print(res.stdout[:200])
configs = res.stdout.split("\n")
@ -162,4 +174,4 @@ def set_config(parameter, value):
class CameraException(Exception):
"""Exception personnalisée pour les erreurs liées à la caméra."""
def __init__(self, message):
super().__init__(message)
super().__init__(message)

14
src/nenuscanner/leds.py
View File

@ -46,19 +46,25 @@ class GpioLed:
class GpioLeds(Leds):
def __init__(self, chip: str, gpio_pins: list[int]):
self._entered = False
self.chip = gpiod.Chip(chip)
self.leds = []
for pin in gpio_pins:
self.leds.append(GpioLed(pin))
def __enter__(self):
for led in self.leds:
led.enter(self.chip)
if not self._entered:
self._entered = True
for led in self.leds:
led.enter(self.chip)
return self
def __exit__(self, *args):
for led in self.leds:
led.exit()
# for led in self.leds:
# led.exit()
# self._entered = False
pass
def off(self):
for led in self.leds:

16
src/nenuscanner/routes/__init__.py
View File

@ -1,3 +1,4 @@
import subprocess
from flask import Blueprint, render_template
from .. import db
@ -16,6 +17,21 @@ def index():
projects = db.Object.all_by_project(conn)
return render_template('index.html', projects=projects)
# Route that restarts the server
@blueprint.route("/restart")
def restart():
"""
Serves the index of nenuscanner.
"""
subprocess.Popen(
["bash", "-c", "sleep 1 && systemctl restart nenuscanner --user"],
stdout=subprocess.DEVNULL,
stderr=subprocess.DEVNULL,
start_new_session=True
)
return render_template('restart.html')
blueprint.register_blueprint(object.blueprint, url_prefix='/object')
blueprint.register_blueprint(calibration.blueprint, url_prefix='/calibration')

16
src/nenuscanner/routes/camera.py
View File

@ -44,13 +44,11 @@ def set_camera_settings():
return {'status': 'ok', **updated}
@blueprint.route('/feed.jpg')
@blueprint.route('/feed.jpg', methods=['GET'])
def camera_feed():
capture_preview()
return send_file('static/feed.jpg', mimetype='image/jpeg')
@blueprint.route('/config', methods=['GET'])
def get_camera_config():
"""
@ -96,14 +94,14 @@ def get_camera_config():
return jsonify(grouped_params)
@blueprint.route('/capture_preview', methods=['POST'])
# @blueprint.route('/capture_preview', methods=['POST'])
def capture_preview():
"""
Capture un aperçu avec gphoto2 et sauvegarde dans static/feed.jpg
"""
try:
cam = C.get()
cam.capture_preview()
return jsonify({'status': 'ok'})
with C.get() as cam:
cam.capture_preview()
return jsonify({'status': 'ok'})
except C.CameraException as e:
return jsonify({'status': 'error', 'error': str(e)}), 500
return jsonify({'status': 'error', 'error': str(e)}), 500

33
src/nenuscanner/routes/leds.py
View File

@ -9,36 +9,6 @@ from .. import leds,config
blueprint = Blueprint('leds', __name__)
def _get_gpio_leds():
"""Return a singleton leds controller stored in app.extensions."""
app = current_app._get_current_object()
ext_key = 'nenuscanner_gpio_leds'
if ext_key not in app.extensions:
# create and store the resource
app.extensions[ext_key] = leds.get().enter()
return app.extensions[ext_key]
# WARNING : how to release
#@blueprint.record_once
#def _register_cleanup(state):
# """
#Register a teardown handler on the app that will try to exit the leds controller
# when the app context is torn down.
# """
# app = state.app
# ext_key = 'nenuscanner_gpio_leds'
# @app.teardown_appcontext
# def _cleanup(exception=None):
# gpio = app.extensions.get(ext_key)
# if gpio:
# try:
# gpio.exit()
# except Exception:
# # best effort cleanup, don't raise during teardown
# pass
# Routes for object management
@blueprint.route('/')
@ -61,10 +31,11 @@ def set_led():
led = data.get('led')
state = data.get('state')
# get the controller (lazy, stored on app.extensions)
gpio_leds = _get_gpio_leds()
gpio_leds = leds.get()
try:
# parse led id/name according to your naming convention
print([x.gpio_pin for x in gpio_leds.leds])
gpio_led = gpio_leds.get_by_uuid(int(led))
print(f"Setting {led} / {gpio_led} to {state}")
if state == "on":

5
src/nenuscanner/templates/base.html
View File

@ -23,7 +23,12 @@
</a>
</div>
<div id="navbarBasicExample" class="navbar-menu">
<div class="navbar-start">
<a class="navbar-item" href="/camera">Caméra</a>
<a class="navbar-item" href="/leds">Leds</a>
</div>
<div class="navbar-end">
<a class="navbar-item" href="/restart">Redémarrer le serveur</a>
<a id="calibration-tag-0" class="calibration-tag navbar-item" href="/calibration/calibrate" {% if calibration.state != 0 %}style="display: none;"{% endif %}>
<span id="calibration-tag-0" class="tags has-addons">
<span class="tag is-dark">étalonnage</span>

21
src/nenuscanner/templates/camera.html
View File

@ -11,7 +11,7 @@
</div>
<div class="column is-half has-text-centered">
<figure class="image is-4by3" style="max-width: 480px; margin: auto;">
<img class="preview" id="camera-preview" src="/static/feed.jpg?{{ range(1000000)|random }}" alt="Camera Preview"
<img class="preview" id="camera-preview" alt="Camera Preview"
style="border: 1px solid #ccc;">
</figure>
<button class="button is-small is-info mt-2" type="button" onclick="refreshPreview()">Rafraîchir
@ -64,13 +64,16 @@
body: JSON.stringify({ [paramName]: value })
}).then(() => location.reload());
}
const img = document.getElementById('camera-preview');
img.onload = function() {
requestAnimationFrame(refreshPreview);
}
window.refreshPreview = function () {
const img = document.getElementById('camera-preview');
const url = '/static/feed.jpg?' + new Date().getTime();
function refreshPreview() {
const url = '/camera/feed.jpg?' + new Date().getTime();
img.src = url;
}
setInterval(window.refreshPreview, 1000); // Refresh every second
document.addEventListener('DOMContentLoaded', function () {
fetch('/camera/config')
@ -146,7 +149,11 @@
});
container.appendChild(box);
});
});
// When ready, load preview
refreshPreview();
});
});
function CapturePreview() {
fetch('/camera/capture_preview', {method: 'POST'})
@ -160,4 +167,4 @@
});
}
</script>
{% endblock extrajs %}
{% endblock extrajs %}