D4
/
d4-core
mirror of https://github.com/D4-project/d4-core
2
0
Fork 0
Code Issues Releases Wiki Activity

chg: [server_management UI v0.3] add analyzer description, fix #11, description can be updated by adding the same uuid

pull/23/head
Terrtia 2019-04-01 11:19:31 +02:00
parent 8dbd2cd0b1
commit 01c9d99273
No known key found for this signature in database
GPG Key ID: 1E1B1F50D84613D0
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/web/Flask_server.py
View File

@ -233,10 +233,13 @@ def server_management():
last_updated = 'Never' last_updated = 'Never'
else: else:
last_updated = datetime.datetime.fromtimestamp(float(last_updated)).strftime('%Y-%m-%d %H:%M:%S') last_updated = datetime.datetime.fromtimestamp(float(last_updated)).strftime('%Y-%m-%d %H:%M:%S')
description_analyzer = redis_server_metadata.hget('analyzer:{}'.format(analyzer_uuid), 'description')
if description_analyzer is None:
description_analyzer = ''
len_queue = redis_server_analyzer.llen('analyzer:{}:{}'.format(type, analyzer_uuid)) len_queue = redis_server_analyzer.llen('analyzer:{}:{}'.format(type, analyzer_uuid))
if len_queue is None: if len_queue is None:
len_queue = 0 len_queue = 0
list_analyzer_uuid.append({'uuid': analyzer_uuid, 'size_limit': size_limit,'last_updated': last_updated, 'length': len_queue}) list_analyzer_uuid.append({'uuid': analyzer_uuid, 'description': description_analyzer, 'size_limit': size_limit,'last_updated': last_updated, 'length': len_queue})
list_accepted_types.append({"id": int(type), "description": description, 'list_analyzer_uuid': list_analyzer_uuid}) list_accepted_types.append({"id": int(type), "description": description, 'list_analyzer_uuid': list_analyzer_uuid})
@ -390,6 +393,7 @@ def add_new_analyzer():
type = request.args.get('type') type = request.args.get('type')
user = request.args.get('redirect') user = request.args.get('redirect')
metatype_name = request.args.get('metatype_name') metatype_name = request.args.get('metatype_name')
analyzer_description = request.args.get('analyzer_description')
analyzer_uuid = request.args.get('analyzer_uuid') analyzer_uuid = request.args.get('analyzer_uuid')
if is_valid_uuid_v4(analyzer_uuid): if is_valid_uuid_v4(analyzer_uuid):
try: try:
@ -403,6 +407,8 @@ def add_new_analyzer():
redis_server_metadata.sadd('analyzer:{}:{}'.format(type, metatype_name), analyzer_uuid) redis_server_metadata.sadd('analyzer:{}:{}'.format(type, metatype_name), analyzer_uuid)
else: else:
redis_server_metadata.sadd('analyzer:{}'.format(type), analyzer_uuid) redis_server_metadata.sadd('analyzer:{}'.format(type), analyzer_uuid)
if redis_server_metadata.exists('analyzer:{}:{}'.format(type, metatype_name)) or redis_server_metadata.exists('analyzer:{}'.format(type)):
redis_server_metadata.hset('analyzer:{}'.format(analyzer_uuid), 'description', analyzer_description)
if user: if user:
return redirect(url_for('server_management')) return redirect(url_for('server_management'))
else: else:

8
server/web/templates/server_management.html
View File

@ -249,9 +249,12 @@
<div class="d-flex"> <div class="d-flex">
{{analyzer['uuid']}} {{analyzer['uuid']}}
<a href="{{ url_for('remove_analyzer') }}?redirect=1&type={{type['id']}}&analyzer_uuid={{analyzer['uuid']}}" class="ml-auto"> <a href="{{ url_for('remove_analyzer') }}?redirect=1&type={{type['id']}}&analyzer_uuid={{analyzer['uuid']}}" class="ml-auto">
<button type="button" class="btn btn-outline-danger"><i class="fa fa-trash"></i></button> <button type="button" class="btn btn-outline-danger px-2 py-0"><i class="fa fa-trash"></i></button>
</a> </a>
</div> </div>
{%if analyzer['description']%}
<div class="text-info mt-0"><small>{{analyzer['description']}}</small></div>
{%endif%}
</td> </td>
<td>{{analyzer['last_updated']}}</td> <td>{{analyzer['last_updated']}}</td>
<td> <td>
@ -332,7 +335,8 @@
</div> </div>
<input class="form-control" type="text" id="analyzer_uuid" required placeholder="Analyzer uuid"> <input class="form-control" type="text" id="analyzer_uuid" required placeholder="Analyzer uuid">
</div> </div>
<button type="button" class="btn btn-outline-primary mt-1" onclick="window.location.href ='{{ url_for('add_new_analyzer') }}?redirect=1&type='+$('#analyzer_type').val()+'&analyzer_uuid='+$('#analyzer_uuid').val()+'&metatype_name='+$('#analyzer_metatype_name').val();">Add New Analyzer</button> <input class="form-control" type="text" id="analyzer_description" required placeholder="Optional Description">
<button type="button" class="btn btn-outline-primary mt-1" onclick="window.location.href ='{{ url_for('add_new_analyzer') }}?redirect=1&type='+$('#analyzer_type').val()+'&analyzer_uuid='+$('#analyzer_uuid').val()+'&metatype_name='+$('#analyzer_metatype_name').val()+'&analyzer_description='+$('#analyzer_description').val();">Add New Analyzer</button>
</div> </div>
</div> </div>
</div> </div>