Skip to content

Allow passing '-' to 'reprounzip graph' to write to stdout #190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow passing '-' to 'reprounzip graph' to write to stdout #190

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 22 additions & 6 deletions reprounzip/reprounzip/unpackers/graph.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
from __future__ import division, print_function, unicode_literals

import argparse
import codecs
from distutils.version import LooseVersion
import heapq
import json
Expand Down Expand Up @@ -561,7 +562,11 @@ def graph_dot(target, runs, packages, other_files, package_map, edges,
inputs_outputs, level_pkgs, level_processes, level_other_files):
"""Writes a GraphViz DOT file from the collected information.
"""
with target.open('w', encoding='utf-8', newline='\n') as fp:
if target is None:
fp = codecs.getwriter('utf-8')(sys.stdout)
else:
fp = target.open('w', encoding='utf-8', newline='\n')
try:
fp.write('digraph G {\n /* programs */\n'
' node [shape=box fontcolor=white '
'fillcolor=black style=filled];\n')
Expand Down Expand Up @@ -627,6 +632,9 @@ def graph_dot(target, runs, packages, other_files, package_map, edges,
endp_file, endp_prog))

fp.write('}\n')
finally:
if target is not None:
fp.close()


def graph_json(target, runs, packages, other_files, package_map, edges,
Expand Down Expand Up @@ -656,10 +664,15 @@ def graph_json(target, runs, packages, other_files, package_map, edges,

json_other_files.sort()

if PY3:
fp = target.open('w', encoding='utf-8', newline='\n')
if target is None:
fp = sys.stdout
if PY3:
fp = codecs.getwriter('utf-8')(fp)
else:
fp = target.open('wb')
if PY3:
fp = target.open('w', encoding='utf-8', newline='\n')
else:
fp = target.open('wb')
try:
json.dump({'packages': sorted(json_packages,
key=lambda p: p['name']),
Expand All @@ -670,7 +683,8 @@ def graph_json(target, runs, packages, other_files, package_map, edges,
indent=2,
sort_keys=True)
finally:
fp.close()
if target is not None:
fp.close()


def graph(args):
Expand All @@ -680,7 +694,9 @@ def graph(args):
format or JSON.
"""
def call_generate(args, config, trace):
generate(Path(args.target[0]), config, trace, args.all_forks,
target = args.target[0]
target = None if target == '-' else Path(args.target[0])
generate(target, config, trace, args.all_forks,
args.format, args.packages, args.processes, args.otherfiles,
args.regex_filter, args.regex_replace, args.aggregate)

Expand Down