tanner/3Dshock
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://git.tannercollin.com/tanner/3Dshock

Browse Source
This commit is contained in:
E 2021-03-07 22:51:36 -07:00
commit 534a3fe632
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/download.py
View File

@ -18,10 +18,12 @@ def download(ip, dest):
for f in files: for f in files:
source_file = '/3dscan/' + f source_file = '/3dscan/' + f
dest_file = dest / f dest_file = dest / (f + '.tmp')
print('Grabbing file', source_file) print('Grabbing file', source_file)
sftp.get(source_file, dest_file) sftp.get(source_file, dest_file)
#sftp.remove(source_file) sftp.remove(source_file)
done_file = dest / f
dest_file.rename(done_file)
if sftp: sftp.close() if sftp: sftp.close()
if transport: transport.close() if transport: transport.close()

22
server/main.py
View File

@ -12,6 +12,12 @@ output_folder = Path('./output')
app = Flask(__name__, static_folder=str(build_folder), static_url_path='') app = Flask(__name__, static_folder=str(build_folder), static_url_path='')
CORS(app) CORS(app)
status = 'Standby'
@app.route('/api/status', methods=['GET'])
def status_get():
return {'status': status}
@app.route('/api/clients', methods=['POST']) @app.route('/api/clients', methods=['POST'])
def clients_post(): def clients_post():
content = request.json content = request.json
@ -61,7 +67,7 @@ def session_get(cid):
photo_glob = path.glob('*.jpg') photo_glob = path.glob('*.jpg')
res = {} res = {}
res['photos'] = [x.name for x in photo_glob] res['photos'] = sorted([x.name for x in photo_glob])
return res return res
@ -82,6 +88,8 @@ def session_delete(cid):
@app.route('/api/clients/<cid>/session', methods=['POST']) @app.route('/api/clients/<cid>/session', methods=['POST'])
def session_post(cid): def session_post(cid):
global status
folder = cid folder = cid
path = output_folder / cid path = output_folder / cid
@ -89,6 +97,7 @@ def session_post(cid):
abort(404) abort(404)
# go through the photo taking process # go through the photo taking process
status = 'Warming up'
# warmup # warmup
power.lights_on() power.lights_on()
@ -96,6 +105,8 @@ def session_post(cid):
power.lights_off() power.lights_off()
time.sleep(0.5) time.sleep(0.5)
status = 'Capturing'
# capture # capture
power.lights_on() power.lights_on()
time.sleep(0.25) time.sleep(0.25)
@ -108,14 +119,23 @@ def session_post(cid):
power.grid_off() power.grid_off()
power.lights_off() power.lights_off()
status = 'Writing to files'
time.sleep(3)
status = 'Downloading'
download.download_all_photos(path) download.download_all_photos(path)
status = 'Standby'
return '' return ''
@app.route('/') @app.route('/')
def index(): def index():
return app.send_static_file('index.html') return app.send_static_file('index.html')
@app.errorhandler(404)
def not_found(e):
return app.send_static_file('index.html')
@app.route('/output/<path:filename>') @app.route('/output/<path:filename>')
def output(filename): def output(filename):
return send_from_directory('output/', filename) return send_from_directory('output/', filename)