diff --git a/__pycache__/sharedfunctions.cpython-36.pyc b/__pycache__/sharedfunctions.cpython-36.pyc index e4c7ea3..6a17302 100644 Binary files a/__pycache__/sharedfunctions.cpython-36.pyc and b/__pycache__/sharedfunctions.cpython-36.pyc differ diff --git a/getfolderid.py b/getfolderid.py index ae0b696..67b82a6 100755 --- a/getfolderid.py +++ b/getfolderid.py @@ -9,7 +9,8 @@ # # Change History # -# 27JAN2017 Comments added +# 27JAN2017 Comments added +# 08FEB2020 Added the option to return full json # # # Copyright © 2018, SAS Institute Inc., Cary, NC, USA. All Rights Reserved. @@ -29,19 +30,27 @@ import argparse -from sharedfunctions import getfolderid +from sharedfunctions import getfolderid, printresult # setup command-line arguements parser = argparse.ArgumentParser() parser.add_argument("-f","--folderpath", help="Enter the path to the viya folder.",required='True') +parser.add_argument("-o","--output", help="Output Style", choices=['csv','json','simple'],default='simple') + args = parser.parse_args() path_to_folder=args.folderpath +output_style=args.output # call the get folderid function and pass it the entered path targets=getfolderid(path_to_folder) -#print results if any are returned -if targets[0] is not None: - print("Id = "+targets[0]) - print("URI = "+targets[1]) - print("Path = "+targets[2]) \ No newline at end of file +# default simple output style prints with original print method +# but can also choose json or csv +if output_style=='simple': + + #print results if any are returned + if targets[0] is not None: + print("Id = "+targets[0]) + print("URI = "+targets[1]) + print("Path = "+targets[2]) +else: printresult(targets[3],output_style) \ No newline at end of file diff --git a/sharedfunctions.py b/sharedfunctions.py index d73b2e7..5cc85a6 100755 --- a/sharedfunctions.py +++ b/sharedfunctions.py @@ -148,6 +148,7 @@ def callrestapi(reqval, reqtype, acceptType='application/json', contentType='app # when a Viya content path is passed in return the id, path and uri # change history # 01dec2017 initial development +# 08Feb2020 return full json as 4 item in list that is returned def getfolderid(path): @@ -167,7 +168,7 @@ def getfolderid(path): targetname=result['name'] targeturi="/folders/folders/"+targetid - return [targetid,targeturi,targetname] + return [targetid,targeturi,targetname,result] # getbaseurl