CIRCL
/
lookyloo
mirror of https://github.com/CIRCL/lookyloo
2
0
Fork 0
Code Issues Releases Wiki Activity

chg: Slight refactoring

pull/14/merge
Raphaël Vinot 2018-01-30 15:41:35 +01:00
parent 40569a3a73
commit 8955c9c7f7
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lookyloo/__init__.py
View File

@ -50,7 +50,7 @@ def load_tree(report_dir):
pickle.dump(ct, temp) pickle.dump(ct, temp)
temp.close() temp.close()
session["tree"] = temp.name session["tree"] = temp.name
return ct.jsonify(), ct.start_time.isoformat(), ct.user_agent, ct.root_url return ct.to_json(), ct.start_time.isoformat(), ct.user_agent, ct.root_url
@app.route('/scrape', methods=['GET', 'POST']) @app.route('/scrape', methods=['GET', 'POST'])
@ -94,7 +94,7 @@ def hostnode_details(node_uuid):
hostnode = ct.root_hartree.get_host_node_by_uuid(node_uuid) hostnode = ct.root_hartree.get_host_node_by_uuid(node_uuid)
urls = [] urls = []
for url in hostnode.urls: for url in hostnode.urls:
urls.append(url.jsonify()) urls.append(url.to_json())
return json.dumps(urls) return json.dumps(urls)
@ -103,7 +103,7 @@ def urlnode_details(node_uuid):
with open(session["tree"], 'rb') as f: with open(session["tree"], 'rb') as f:
ct = pickle.load(f) ct = pickle.load(f)
urlnode = ct.root_hartree.get_url_node_by_uuid(node_uuid) urlnode = ct.root_hartree.get_url_node_by_uuid(node_uuid)
return urlnode.jsonify() return urlnode.to_json()
@app.route('/tree/<int:tree_id>', methods=['GET']) @app.route('/tree/<int:tree_id>', methods=['GET'])

4
lookyloo/static/tree.js
View File

@ -240,7 +240,7 @@ function update(source) {
var icons = nodeEnter var icons = nodeEnter
.append('svg') .append('svg')
.attr('x', 10) .attr('x', 10)
.attr('y', 10); .attr('y', 12);
// Add JavaScript information // Add JavaScript information
var jsContent = icons var jsContent = icons
@ -340,7 +340,7 @@ function update(source) {
}).append('text') }).append('text')
.attr("dy", 8) .attr("dy", 8)
.attr('x', function(d) { return d.data.total_width ? d.data.total_width + 1 : 0 }) .attr('x', function(d) { return d.data.total_width ? d.data.total_width + 1 : 0 })
.text(function(d) { return d.data.redirect_to_nohing; }).call(getBB); .text(function(d) { return d.data.redirect_to_nothing; }).call(getBB);
// UPDATE // UPDATE
var nodeUpdate = nodeEnter.merge(node); var nodeUpdate = nodeEnter.merge(node);