render: use list literal

This commit is contained in:
William Ballenthin
2020-07-03 20:51:41 -06:00
parent 9fe70dd19c
commit f7c460777f
3 changed files with 28 additions and 26 deletions

View File

@@ -17,11 +17,12 @@ def width(s, character_count):
def render_meta(doc, ostream): def render_meta(doc, ostream):
rows = [] rows = [
rows.append((width("md5", 22), width(doc["meta"]["sample"]["md5"], 82))) (width("md5", 22), width(doc["meta"]["sample"]["md5"], 82)),
rows.append(("path", doc["meta"]["sample"]["path"])) ("path", doc["meta"]["sample"]["path"]),
rows.append(("timestamp", doc["meta"]["timestamp"])) ("timestamp", doc["meta"]["timestamp"]),
rows.append(("capa version", doc["meta"]["version"])) ("capa version", doc["meta"]["version"]),
]
ostream.write(tabulate.tabulate(rows, tablefmt="psql")) ostream.write(tabulate.tabulate(rows, tablefmt="psql"))
ostream.write("\n") ostream.write("\n")

View File

@@ -36,20 +36,19 @@ def render_meta(ostream, doc):
function count 42 function count 42
total feature count 1918 total feature count 1918
""" """
rows = [] rows = [
rows.append(("md5", doc["meta"]["sample"]["md5"])) ("md5", doc["meta"]["sample"]["md5"]),
rows.append(("sha1", doc["meta"]["sample"]["sha1"])) ("sha1", doc["meta"]["sample"]["sha1"]),
rows.append(("sha256", doc["meta"]["sample"]["sha256"])) ("sha256", doc["meta"]["sample"]["sha256"]),
rows.append(("path", doc["meta"]["sample"]["path"])) ("path", doc["meta"]["sample"]["path"]),
rows.append(("timestamp", doc["meta"]["timestamp"])) ("timestamp", doc["meta"]["timestamp"]),
rows.append(("capa version", doc["meta"]["version"])) ("capa version", doc["meta"]["version"]),
rows.append(("format", doc["meta"]["analysis"]["format"])) ("format", doc["meta"]["analysis"]["format"]),
rows.append(("extractor", doc["meta"]["analysis"]["extractor"])) ("extractor", doc["meta"]["analysis"]["extractor"]),
rows.append(("base address", hex(doc["meta"]["analysis"]["base_address"]))) ("base address", hex(doc["meta"]["analysis"]["base_address"])),
rows.append(("function count", len(doc["meta"]["counts"]["functions"]))) ("function count", len(doc["meta"]["counts"]["functions"])),
rows.append( ("total feature count", doc["meta"]["counts"]["file"] + sum(doc["meta"]["counts"]["functions"].values())),
("total feature count", doc["meta"]["counts"]["file"] + sum(doc["meta"]["counts"]["functions"].values())) ]
)
ostream.writeln(tabulate.tabulate(rows, tablefmt="plain")) ostream.writeln(tabulate.tabulate(rows, tablefmt="plain"))

View File

@@ -41,13 +41,15 @@ setuptools.setup(
include_package_data=True, include_package_data=True,
install_requires=requirements, install_requires=requirements,
extras_require={ extras_require={
"dev": ["pytest", "dev": [
"pytest-sugar", "pytest",
"pytest-instafail", "pytest-sugar",
"pytest-cov", "pytest-instafail",
"pycodestyle", "pytest-cov",
"black ; python_version>'3.0'", "pycodestyle",
"isort"] "black ; python_version>'3.0'",
"isort",
]
}, },
zip_safe=False, zip_safe=False,
keywords="capa", keywords="capa",