archive/blender-asset-manager
Archived
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bam cli: add --json argument

Browse Source
This commit is contained in:
Campbell Barton
2014-11-12 18:08:04 +01:00
parent c4b07d2962
commit 2542aa9aa8
1 changed files with 37 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
client/cli/bam.py
View File

@@ -23,9 +23,6 @@ Blender asset manager
""" """
if __name__ != "__main__":
raise Exception("must be imported directly")
# ------------------ # ------------------
# Ensure module path # Ensure module path
import os import os
@@ -38,11 +35,14 @@ del os, sys, path
def fatal(msg): def fatal(msg):
if __name__ == "__main__":
import sys import sys
sys.stderr.write("fatal: ") sys.stderr.write("fatal: ")
sys.stderr.write(msg) sys.stderr.write(msg)
sys.stderr.write("\n") sys.stderr.write("\n")
sys.exit(1) sys.exit(1)
else:
raise RuntimeError(msg)
class bam_config: class bam_config:
@@ -570,7 +570,7 @@ class bam_commands:
print(" D: %s" % fn) print(" D: %s" % fn)
@staticmethod @staticmethod
def list_dir(paths): def list_dir(paths, use_json=False):
import requests import requests
# Load project configuration # Load project configuration
@@ -597,6 +597,14 @@ class bam_commands:
items.sort() items.sort()
if use_json:
ret = []
for (name_short, name_full, file_type) in items:
ret.append((name_short, file_type))
import json
print(json.dumps(ret))
else:
for (name_short, name_full, file_type) in items: for (name_short, name_full, file_type) in items:
if file_type == "dir": if file_type == "dir":
print(" %s/" % name_short) print(" %s/" % name_short)
@@ -604,6 +612,7 @@ class bam_commands:
if file_type != "dir": if file_type != "dir":
print(" %s" % name_short) print(" %s" % name_short)
@staticmethod @staticmethod
def deps(paths, recursive=False): def deps(paths, recursive=False):
import blendfile_path_walker import blendfile_path_walker
@@ -648,13 +657,20 @@ def subcommand_status_cb(args):
def subcommand_list_cb(args): def subcommand_list_cb(args):
bam_commands.list_dir(args.paths or ["."]) bam_commands.list_dir(args.paths or ["."], use_json=args.json)
def subcommand_deps_cb(args): def subcommand_deps_cb(args):
bam_commands.deps(args.paths or ["."], args.recursive) bam_commands.deps(args.paths or ["."], args.recursive)
def generic_argument_json(subparse):
subparse.add_argument(
"-j", "--json", dest="json", action='store_true',
help="Generate JSON output",
)
def create_argparse_init(subparsers): def create_argparse_init(subparsers):
subparse = subparsers.add_parser("init") subparse = subparsers.add_parser("init")
subparse.add_argument( subparse.add_argument(
@@ -755,6 +771,9 @@ def create_argparse_list(subparsers):
dest="paths", nargs="*", dest="paths", nargs="*",
help="Path(s) to operate on", help="Path(s) to operate on",
) )
generic_argument_json(subparse)
subparse.set_defaults(func=subcommand_list_cb) subparse.set_defaults(func=subcommand_list_cb)
@@ -809,8 +828,8 @@ def main(argv=None):
import sys import sys
argv = sys.argv argv = sys.argv
parser = create_argparse(argv) parser = create_argparse()
args = parser.parse_args() args = parser.parse_args(argv)
# call subparser callback # call subparser callback
if not hasattr(args, "func"): if not hasattr(args, "func"):