forked from Dniel97/artemis
fixing handle_data for Crossbeats
This commit is contained in:
parent
94c326a27d
commit
4b22bd734e
@ -124,35 +124,42 @@ class CxbServlet(BaseServlet):
|
|||||||
func_to_find = "handle_data_"
|
func_to_find = "handle_data_"
|
||||||
version_string = "Base"
|
version_string = "Base"
|
||||||
internal_ver = 0
|
internal_ver = 0
|
||||||
|
version = 0
|
||||||
|
|
||||||
if req_json == {}:
|
if req_json == {}:
|
||||||
self.logger.warning(f"Empty json request to /data")
|
self.logger.warning(f"Empty json request to /data")
|
||||||
return b""
|
return b""
|
||||||
|
|
||||||
if (
|
subcmd = list(req_json.keys())[0]
|
||||||
not type(req_json["dldate"]) is dict
|
if subcmd == "dldate":
|
||||||
or "filetype" not in req_json["dldate"]
|
|
||||||
):
|
|
||||||
self.logger.warning(f"Malformed dldate request: {req_json}")
|
|
||||||
return b""
|
|
||||||
|
|
||||||
filetype = req_json["dldate"]["filetype"]
|
if (
|
||||||
filetype_split = filetype.split("/")
|
not type(req_json["dldate"]) is dict
|
||||||
|
or "filetype" not in req_json["dldate"]
|
||||||
|
):
|
||||||
|
self.logger.warning(f"Malformed dldate request: {req_json}")
|
||||||
|
return b""
|
||||||
|
|
||||||
if len(filetype_split) < 2 or not filetype_split[0].isnumeric():
|
filetype = req_json["dldate"]["filetype"]
|
||||||
self.logger.warning(f"Malformed dldate request: {req_json}")
|
filetype_split = filetype.split("/")
|
||||||
return b""
|
|
||||||
|
|
||||||
version = int(filetype_split[0])
|
if len(filetype_split) < 2 or not filetype_split[0].isnumeric():
|
||||||
filename = filetype_split[len(filetype_split) - 1]
|
self.logger.warning(f"Malformed dldate request: {req_json}")
|
||||||
|
return b""
|
||||||
|
|
||||||
match = re.match(
|
version = int(filetype_split[0])
|
||||||
"^([A-Za-z]*)(\d\d\d\d)$", filetype_split[len(filetype_split) - 1]
|
filename = filetype_split[len(filetype_split) - 1]
|
||||||
)
|
|
||||||
if match:
|
match = re.match(
|
||||||
func_to_find += f"{inflection.underscore(match.group(1))}xxxx"
|
"^([A-Za-z]*)(\d\d\d\d)$", filetype_split[len(filetype_split) - 1]
|
||||||
|
)
|
||||||
|
if match:
|
||||||
|
func_to_find += f"{inflection.underscore(match.group(1))}xxxx"
|
||||||
|
else:
|
||||||
|
func_to_find += f"{inflection.underscore(filename)}"
|
||||||
else:
|
else:
|
||||||
func_to_find += f"{inflection.underscore(filename)}"
|
filetype = subcmd
|
||||||
|
func_to_find += filetype
|
||||||
|
|
||||||
func_to_find += "_request"
|
func_to_find += "_request"
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user