diff --git a/sharedfunctions.py b/sharedfunctions.py index 4b76734..7d66e6f 100755 --- a/sharedfunctions.py +++ b/sharedfunctions.py @@ -33,6 +33,7 @@ # 20dec2018 Fixed standard csv output # 14JAN2019 Added getpath # 20SEP2019 Added getidsanduris +# 09dec2020 Added get_valid_filename function to deal with invalid characters for Linux filesystem # # Copyright © 2018, SAS Institute Inc., Cary, NC, USA. All Rights Reserved. # @@ -58,6 +59,8 @@ import pprint import os import collections import inspect +import re + pp = pprint.PrettyPrinter(indent=4) diff --git a/snapshotreports.py b/snapshotreports.py index 22e80b0..af9ec93 100755 --- a/snapshotreports.py +++ b/snapshotreports.py @@ -21,6 +21,7 @@ # 16may2020 add folder path to report name # 16may2020 allow to subset reports exported by the path of the report folder # 10aug2020 add option to auto delete transport file after download completes +# 09dec2020 add get_valid_filename function to deal with invalid characters for Linux filesystem # # Copyright © 2019, SAS Institute Inc., Cary, NC, USA. All Rights Reserved. # @@ -38,10 +39,12 @@ # # Import Python modules +import re import argparse, sys, subprocess, uuid, time, os, glob from datetime import datetime as dt, timedelta as td from sharedfunctions import getfolderid, callrestapi, getpath, getapplicationproperties, get_valid_filename + # get python version version=int(str(sys.version_info[0])) @@ -151,7 +154,8 @@ if areyousure.upper() =='Y': path_to_report=path_to_report.replace("/","_") package_name=str(uuid.uuid1()) - json_name=get_valid_filename(path_to_report+resultdata['items'][i]["name"].replace(" ","")+'_'+str(i)) + + json_name=get_valid_filename(path_to_report+resultdata['items'][i]["name"].replace(" ","")+'_'+str(i)) command=clicommand+' transfer export -u /reports/reports/'+id+' --name "'+package_name+'"' print(command) @@ -174,8 +178,7 @@ if areyousure.upper() =='Y': remTransferObject.wait() - print("NOTE: "+str(reports_exported)+" report(s) exported to json files in "+path) - + print("NOTE: "+str(total_items)+" total reports found, "+str(reports_exported)+" reports exported to json files in "+path) else: print("NOTE: Operation cancelled")