Updated script, now names tmp and output files based upon initial DID input. Checks on input DID added.

Author: sjdkay

files/DIDlist_Parse.sh

@@ -25,33 +25,40 @@ if [[ $DID_Check == "" ]]; then
     echo "DID provided is blank! Please provide the DID for a dataset!"
     exit 2
 fi
-touch "DIDlist_Parse_tmp"
-rucio did list ${Scope}:${DID} > DIDlist_Parse_tmp
+Path=$(pwd)
+DID_Edit=$(echo "${DID}" | sed -r 's/\//_/g') # Edit the DID string, change / to _
+DID_Edit=${DID_Edit:1} # Remove the leading _
+tmp_file="${Path}/${DID_Edit}_DIDlist_tmp" # Name a tmp file based upon DID
+touch ${tmp_file} # Create file
+rucio did list ${Scope}:${DID} > $tmp_file # Dump info on DID to file
 # Check DID is a dataset
-if ! grep -q DATASET DIDlist_Parse_tmp; then
+if ! grep -q DATASET $tmp_file; then
     echo "DID is not a dataset! Please provide the DID for a dataset!"
     exit 3
 fi
 
 # Checks passed, now process the file
-rucio did content list --short ${Scope}:${DID} > DIDlist_Parse_tmp # Dump list of files in dataset to a file
-touch "DID_Pathlist" # Open the file which will contain the path lst
-NLines=$(wc --lines < tmp) # Check number of files to process in total
+rucio did content list --short ${Scope}:${DID} > $tmp_file # Dump list of files in dataset to a file
+PathListFile="${Path}/${DID_Edit}_DID_Pathlist"
+# Need to switch this to name the DID pathlist nicely
+touch "${PathListFile}" # Open the file which will contain the path list
+NLines=$(wc --lines < $tmp_file) # Check number of files to process in total
 NLinesRed=$(( ((${NLines%.*}+5)/10)*10 )) # Round to nearest value of 10 to make the progress counter simpler
 
-echo "Processing ${NLines} files in dataset ${Scope}:${DID}$ and creating file with list of paths."
+echo "Processing ${NLines} files in dataset ${Scope}:${DID}$ and creating file with list of paths - ${PathListFile}."
 i=0
 while IFS='' read -r line || [[ -n "$line" ]]; do
-    rucio replica list file --protocols root --pfns --rses isopenaccess $line >> DID_Pathlist
+    rucio replica list file --protocols root --pfns --rses isopenaccess $line >> ${PathListFile}
     i=$(( $i + 1 ))
     if [[ $(( $i % $(( ${NLinesRed}/10 )) )) == 0 ]]; then  # Go to the Microsoft school of progress tracking (aka, lying) and calculate progress
 	Prog=$(printf %.0f "$((10**2 * ${i}/${NLinesRed}))e-0")
 	echo "${Prog} % of file list processed"
     fi
-done < "DIDlist_Parse_tmp"
+done < $tmp_file
 echo "Parsed provided DID - $DID"
-echo "All files locations within this dataset have been printed to DID_Pathlist" # Need to automate this in future such that the file is named sensibly
+echo "All files locations within this dataset have been printed to ${PathListFile}" # Need to automate this in future such that the file is named sensibly
+sleep 3
 
-rm DIDlist_Parse_tmp # Delete the tmp file
+rm $tmp_file # Delete the tmp file
 
 exit 4