# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1468479922 -7200
# Node ID 7e6afa0beaf6df44914f76f67659b6dd425d18b4
# Parent  fabf7820d1f194149f15f0d40123dda498db5e08
samples: improved handling of special characters in paths

diff -r fabf7820d1f1 -r 7e6afa0beaf6 Resources/Samples/Python/ArchiveStudiesInTimeRange.py
--- a/Resources/Samples/Python/ArchiveStudiesInTimeRange.py	Wed Jul 13 16:52:39 2016 +0200
+++ b/Resources/Samples/Python/ArchiveStudiesInTimeRange.py	Thu Jul 14 09:05:22 2016 +0200
@@ -49,6 +49,12 @@
 CheckIsDate(START)
 CheckIsDate(END)
 
+def GetTag(tags, key):
+    if key in tags:
+        return tags[key]
+    else:
+        return 'No%s' % key
+
 # Loop over the studies
 for studyId in RestToolbox.DoGet('%s/studies' % URL):
     # Retrieve the DICOM tags of the current study
@@ -61,13 +67,13 @@
     studyDate = study['StudyDate'][:8]
     if studyDate >= START and studyDate <= END:
         # Create a filename
-        filename = '%s - %s %s - %s.zip' % (study['StudyDate'],
-                                            patient['PatientID'],
-                                            patient['PatientName'],
-                                            study['StudyDescription'])
+        filename = '%s - %s %s - %s.zip' % (GetTag(study, 'StudyDate'),
+                                            GetTag(patient, 'PatientID'),
+                                            GetTag(patient, 'PatientName'),
+                                            GetTag(study, 'StudyDescription'))
 
         # Remove any non-ASCII character in the filename
-        filename = filename.encode('ascii', errors = 'replace')
+        filename = filename.encode('ascii', errors = 'replace').translate(None, r"'\/:*?\"<>|!=").strip()
 
         # Download the ZIP archive of the study
         print('Downloading %s' % filename)
diff -r fabf7820d1f1 -r 7e6afa0beaf6 Resources/Samples/Python/AutoClassify.py
--- a/Resources/Samples/Python/AutoClassify.py	Wed Jul 13 16:52:39 2016 +0200
+++ b/Resources/Samples/Python/AutoClassify.py	Thu Jul 14 09:05:22 2016 +0200
@@ -45,7 +45,7 @@
 
 
 def FixPath(p):
-    return p.encode('ascii', 'ignore').strip().decode()
+    return p.encode('ascii', errors = 'replace').translate(None, r"'\/:*?\"<>|!=").strip()
 
 def GetTag(resource, tag):
     if ('MainDicomTags' in resource and
diff -r fabf7820d1f1 -r 7e6afa0beaf6 Resources/Samples/Python/DownloadAnonymized.py
--- a/Resources/Samples/Python/DownloadAnonymized.py	Wed Jul 13 16:52:39 2016 +0200
+++ b/Resources/Samples/Python/DownloadAnonymized.py	Thu Jul 14 09:05:22 2016 +0200
@@ -44,6 +44,5 @@
         # Trigger the download
         print('Downloading %s' % name)
         zipContent = RestToolbox.DoGet('%s/patients/%s/archive' % (URL, patient))
-        f = open(os.path.join('/tmp', name + '.zip'), 'wb')
-        f.write(zipContent)
-        f.close()
+        with open(os.path.join('/tmp', name + '.zip'), 'wb') as f:
+            f.write(zipContent)