From 5c62848288b006267d414a3ed83e4df002c6e4f9 Mon Sep 17 00:00:00 2001
From: Daniele Serafini <danseraf@softwareheritage.org>
Date: Fri, 20 Mar 2020 12:16:36 +0100
Subject: [PATCH] dump json instead of dict
---
swh/scanner/model.py | 7 ++++---
swh/scanner/tests/test_model.py | 6 +++---
swh/scanner/tests/test_scanner.py | 2 +-
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/swh/scanner/model.py b/swh/scanner/model.py
index 836dae7..94d4006 100644
--- a/swh/scanner/model.py
+++ b/swh/scanner/model.py
@@ -5,6 +5,7 @@
from __future__ import annotations
import sys
+import json
from pathlib import PosixPath
from typing import Any, Dict
from enum import Enum
@@ -54,7 +55,7 @@ class Tree:
def show(self, format) -> None:
"""Print all the tree"""
if format == 'json':
- print(self.getJsonTree())
+ print(json.dumps(self.getTree(), indent=4, sort_keys=True))
elif format == 'text':
isatty = sys.stdout.isatty()
@@ -83,7 +84,7 @@ class Tree:
print(f'{begin}{rel_path}{end}')
- def getJsonTree(self):
+ def getTree(self):
"""Walk through the tree to discover content or directory that have
a persistent identifier. If a persistent identifier is found it saves
the path with the relative PID.
@@ -98,7 +99,7 @@ class Tree:
if child_node.pid:
child_tree[rel_path] = child_node.pid
else:
- next_tree = child_node.getJsonTree()
+ next_tree = child_node.getTree()
if next_tree:
child_tree[rel_path] = next_tree
diff --git a/swh/scanner/tests/test_model.py b/swh/scanner/tests/test_model.py
index 5e4eee2..ebb3817 100644
--- a/swh/scanner/tests/test_model.py
+++ b/swh/scanner/tests/test_model.py
@@ -36,7 +36,7 @@ def test_get_json_tree_all_not_present(example_tree, temp_folder):
for path, pid in temp_folder['paths'].items():
example_tree.addNode(path)
- json_tree = example_tree.getJsonTree()
+ json_tree = example_tree.getTree()
assert len(json_tree) == 0
@@ -45,7 +45,7 @@ def test_get_json_tree_all_present(example_tree, temp_folder):
for path, pid in temp_folder['paths'].items():
example_tree.addNode(path, pid)
- tree_dict = example_tree.getJsonTree()
+ tree_dict = example_tree.getTree()
assert len(tree_dict) == 3
# since subdir have a pid, it can't have a children path
@@ -61,7 +61,7 @@ def test_get_json_tree_only_one_present(example_tree, temp_folder):
else:
example_tree.addNode(path)
- tree_dict = example_tree.getJsonTree()
+ tree_dict = example_tree.getTree()
assert len(tree_dict) == 1
assert tree_dict['subdir0']['filesample.txt']
diff --git a/swh/scanner/tests/test_scanner.py b/swh/scanner/tests/test_scanner.py
index 6165aec..e6200c9 100644
--- a/swh/scanner/tests/test_scanner.py
+++ b/swh/scanner/tests/test_scanner.py
@@ -74,6 +74,6 @@ def test_scanner_result(live_server, event_loop, test_folder):
event_loop.run_until_complete(
run(sample_folder, api_url, source_tree))
- actual_result = source_tree.getJsonTree()
+ actual_result = source_tree.getTree()
assert actual_result == expected_result
--
GitLab