From e2e0010eb013a660f11e5cec96e05b01eb8c5d6b Mon Sep 17 00:00:00 2001 From: Gerry Nelson <45608078+gerrynelson63@users.noreply.github.com> Date: Wed, 16 Dec 2020 20:57:25 -0500 Subject: [PATCH] Update snapshotreports.py --- snapshotreports.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/snapshotreports.py b/snapshotreports.py index b9ccece..22e80b0 100755 --- a/snapshotreports.py +++ b/snapshotreports.py @@ -40,7 +40,7 @@ # Import Python modules import argparse, sys, subprocess, uuid, time, os, glob from datetime import datetime as dt, timedelta as td -from sharedfunctions import getfolderid, callrestapi, getpath, getapplicationproperties +from sharedfunctions import getfolderid, callrestapi, getpath, getapplicationproperties, get_valid_filename # get python version version=int(str(sys.version_info[0])) @@ -151,11 +151,7 @@ if areyousure.upper() =='Y': path_to_report=path_to_report.replace("/","_") package_name=str(uuid.uuid1()) - json_name=path_to_report+resultdata['items'][i]["name"].replace(" ","")+'_'+str(i) - - json_name=json_name.replace("(","_") - json_name=json_name.replace(")","_") - json_name=json_name.replace(" ","-") + 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) @@ -178,8 +174,8 @@ if areyousure.upper() =='Y': remTransferObject.wait() - print("NOTE: "+str(reports_exported)+" Viya report(s) exported to json files in "+path) + print("NOTE: "+str(reports_exported)+" report(s) exported to json files in "+path) else: - print("NOTE: Operation cancelled") \ No newline at end of file + print("NOTE: Operation cancelled")