x-move/iconograph
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Static list of image types.

Browse Source
This commit is contained in:
Ian Gulliver
2016-05-03 23:58:48 +00:00
parent 5e1a8861ea
commit bcf2af221d
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
server/https_server.py
View File

@@ -23,6 +23,11 @@ parser.add_argument(
dest='image_path', dest='image_path',
action='store', action='store',
required=True) required=True)
parser.add_argument(
'--image-type',
dest='image_types',
action='append',
required=True)
parser.add_argument( parser.add_argument(
'--listen-host', '--listen-host',
dest='listen_host', dest='listen_host',
@@ -83,8 +88,9 @@ class HTTPRequestHandler(object):
} }
_BLOCK_SIZE = 2 ** 16 _BLOCK_SIZE = 2 ** 16
def __init__(self, image_path, websockets): def __init__(self, image_path, image_types, websockets):
self._image_path = image_path self._image_path = image_path
self._image_types = image_types
inner_handler = GetWebSocketHandler(websockets) inner_handler = GetWebSocketHandler(websockets)
self._websocket_handler = wsgiutils.WebSocketWSGIApplication(handler_cls=inner_handler) self._websocket_handler = wsgiutils.WebSocketWSGIApplication(handler_cls=inner_handler)
@@ -110,6 +116,7 @@ class HTTPRequestHandler(object):
image_name = os.path.basename(image_name) image_name = os.path.basename(image_name)
assert not image_type.startswith('.') assert not image_type.startswith('.')
assert not image_name.startswith('.') assert not image_name.startswith('.')
assert image_type in self._image_types
file_path = os.path.join(self._image_path, image_type, image_name) file_path = os.path.join(self._image_path, image_type, image_name)
try: try:
@@ -129,15 +136,17 @@ class HTTPRequestHandler(object):
class Server(object): class Server(object):
def __init__(self, listen_host, listen_port, server_key, server_cert, ca_cert, image_path): def __init__(self, listen_host, listen_port, server_key, server_cert, ca_cert, image_path, image_types):
websockets = set() websockets = set()
wm = pyinotify.WatchManager() wm = pyinotify.WatchManager()
inotify_handler = INotifyHandler(websockets) inotify_handler = INotifyHandler(websockets)
self._notifier = pyinotify.Notifier(wm, inotify_handler) self._notifier = pyinotify.Notifier(wm, inotify_handler)
wm.add_watch(image_path, pyinotify.IN_MOVED_TO, rec=True, auto_add=True) for image_type in image_types:
type_path = os.path.join(image_path, image_type)
wm.add_watch(type_path, pyinotify.IN_MOVED_TO)
http_handler = HTTPRequestHandler(image_path, websockets) http_handler = HTTPRequestHandler(image_path, image_types, websockets)
self._httpd = geventserver.WSGIServer( self._httpd = geventserver.WSGIServer(
(listen_host, listen_port), (listen_host, listen_port),
http_handler, http_handler,
@@ -161,7 +170,8 @@ def main():
FLAGS.server_key, FLAGS.server_key,
FLAGS.server_cert, FLAGS.server_cert,
FLAGS.ca_cert, FLAGS.ca_cert,
FLAGS.image_path) FLAGS.image_path,
set(FLAGS.image_types))
server.Serve() server.Serve()