aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarius <atrius@pannekake.org>2019-04-09 20:34:39 +0200
committerGitHub <noreply@github.com>2019-04-09 20:34:39 +0200
commit925b119711e7f6460ad136e6c0b914a445ec6eb6 (patch)
treec4861bada1b0c5df27bd5de3ed520c09f4f86c6a
parentc7b42acb17de66f7ed246dfba4feed0a45f4ef47 (diff)
parente3abb616164a049bd29561996a02bb4aa5580951 (diff)
Merge pull request #104 from sklirg/fix/default-outfile
fix: Decide outfile in the label function.
-rw-r--r--tech-support/labels/main.py12
1 files changed, 8 insertions, 4 deletions
diff --git a/tech-support/labels/main.py b/tech-support/labels/main.py
index a8a0ed7..c7d1f14 100644
--- a/tech-support/labels/main.py
+++ b/tech-support/labels/main.py
@@ -20,7 +20,7 @@ parser.add_argument("--gondul-switches", type=str,
help="Gondul switches endpoint. Overrides env GONDUL_SWITCHES_ENDPOINT")
parser.add_argument("--match-switches", type=str, default="^e(.*)",
help="Regex for matching switches")
-parser.add_argument("--outfile", "-o", type=str, default="cable_labels.csv",
+parser.add_argument("--outfile", "-o", type=str, default=None,
help="Output (base) file name. Might be appended with numbers for cables.")
cables_args = parser.add_argument_group("cables")
@@ -46,15 +46,19 @@ if __name__ == "__main__":
match=args.match_switches,
)
+ kwargs = {}
+ if args.outfile is not None:
+ kwargs['outfile'] = args.outfile
+
if args.labler[0] == "c":
make_cable_labels(switches,
aps=args.ap if args.ap is not None else [],
ap_file=args.aps_file,
copies=args.copies,
- outfile=args.outfile,
- split_per_num=args.split)
+ split_per_num=args.split,
+ **kwargs)
elif args.labler[0] == "s":
- make_switch_labels(switches, outfile=args.outfile)
+ make_switch_labels(switches, **kwargs)
else:
parser.print_help()
sys.exit("Invalid labler operation.")