Commit cea9fbc1 authored by Richard Torenvliet's avatar Richard Torenvliet

Short term solution for getting files from disk, sort them

parent 25baa363
...@@ -32,6 +32,9 @@ class ImageWebSocketHandler(websocket.WebSocketHandler): ...@@ -32,6 +32,9 @@ class ImageWebSocketHandler(websocket.WebSocketHandler):
self.images = glob('{}/*.jpg'.format(FACE_DB)) self.images = glob('{}/*.jpg'.format(FACE_DB))
self.asf = glob('{}/*.asf'.format(FACE_DB)) self.asf = glob('{}/*.asf'.format(FACE_DB))
self.images.sort()
self.asf.sort()
# todo get from settings # todo get from settings
model_texture_file = '{}/pca_{}_texture_model.npy'.format( model_texture_file = '{}/pca_{}_texture_model.npy'.format(
FILES_DIR, DATASET) FILES_DIR, DATASET)
...@@ -55,7 +58,7 @@ class ImageWebSocketHandler(websocket.WebSocketHandler): ...@@ -55,7 +58,7 @@ class ImageWebSocketHandler(websocket.WebSocketHandler):
return True return True
def open(self): def open(self):
print("WebSocket opened") logger.info("Websocket opened")
def __return_error(self, message): def __return_error(self, message):
self.write_message(json.dumps( self.write_message(json.dumps(
...@@ -125,6 +128,9 @@ class ApiHandler(web.RequestHandler): ...@@ -125,6 +128,9 @@ class ApiHandler(web.RequestHandler):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
self.images = glob('{}/*.jpg'.format(FACE_DB)) self.images = glob('{}/*.jpg'.format(FACE_DB))
self.asf_files = glob('{}/*.asf'.format(FACE_DB)) self.asf_files = glob('{}/*.asf'.format(FACE_DB))
self.images.sort()
self.asf_files.sort()
web.RequestHandler.__init__(self, *args, **kwargs) web.RequestHandler.__init__(self, *args, **kwargs)
def set_default_headers(self): def set_default_headers(self):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment