From 37a092285b319c2ffb765a3ca8357443a79a9423 Mon Sep 17 00:00:00 2001 From: Mustafa Bal Date: Wed, 12 Feb 2020 12:39:58 -0800 Subject: [PATCH 1/3] Added exception for non-existant directory --- src/Microsoft.ML.ImageAnalytics/ImageLoader.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Microsoft.ML.ImageAnalytics/ImageLoader.cs b/src/Microsoft.ML.ImageAnalytics/ImageLoader.cs index 2cda6dd2cf..491716ebf0 100644 --- a/src/Microsoft.ML.ImageAnalytics/ImageLoader.cs +++ b/src/Microsoft.ML.ImageAnalytics/ImageLoader.cs @@ -105,7 +105,10 @@ internal ImageLoadingTransformer(IHostEnvironment env, string imageFolder = null { // Throws ArgumentException if given imageFolder path is invalid or empty. Note: imageFolder may be null in this case. if (imageFolder != null) - ImageFolder = Path.GetFullPath(imageFolder); + if (Directory.Exists(imageFolder)) + ImageFolder = Path.GetFullPath(imageFolder); + else + throw Host.Except(String.Format("Directory \"{0}\" does not exist.", imageFolder)); else ImageFolder = null; _useImageType = type; From 0e9c13d27015f3fe88369496143bffa963a2e4d0 Mon Sep 17 00:00:00 2001 From: Mustafa Bal Date: Wed, 12 Feb 2020 16:47:03 -0800 Subject: [PATCH 2/3] Added comments --- src/Microsoft.ML.ImageAnalytics/ImageLoader.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.ML.ImageAnalytics/ImageLoader.cs b/src/Microsoft.ML.ImageAnalytics/ImageLoader.cs index 491716ebf0..6fc24b54e3 100644 --- a/src/Microsoft.ML.ImageAnalytics/ImageLoader.cs +++ b/src/Microsoft.ML.ImageAnalytics/ImageLoader.cs @@ -103,7 +103,7 @@ internal ImageLoadingTransformer(IHostEnvironment env, string imageFolder = null internal ImageLoadingTransformer(IHostEnvironment env, string imageFolder = null, bool type = true, params (string outputColumnName, string inputColumnName)[] columns) : base(Contracts.CheckRef(env, nameof(env)).Register(nameof(ImageLoadingTransformer)), columns) { - // Throws ArgumentException if given imageFolder path is invalid or empty. Note: imageFolder may be null in this case. + // Throws System.InvalidOperationException if given imageFolder path is invalid or empty. Note: imageFolder may be null in this case. if (imageFolder != null) if (Directory.Exists(imageFolder)) ImageFolder = Path.GetFullPath(imageFolder); From 027346c50d712e0e333b5bad260d4288003056e8 Mon Sep 17 00:00:00 2001 From: Mustafa Bal Date: Thu, 13 Feb 2020 10:17:51 -0800 Subject: [PATCH 3/3] Update ImageLoader.cs --- src/Microsoft.ML.ImageAnalytics/ImageLoader.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Microsoft.ML.ImageAnalytics/ImageLoader.cs b/src/Microsoft.ML.ImageAnalytics/ImageLoader.cs index 6fc24b54e3..167996990c 100644 --- a/src/Microsoft.ML.ImageAnalytics/ImageLoader.cs +++ b/src/Microsoft.ML.ImageAnalytics/ImageLoader.cs @@ -103,12 +103,12 @@ internal ImageLoadingTransformer(IHostEnvironment env, string imageFolder = null internal ImageLoadingTransformer(IHostEnvironment env, string imageFolder = null, bool type = true, params (string outputColumnName, string inputColumnName)[] columns) : base(Contracts.CheckRef(env, nameof(env)).Register(nameof(ImageLoadingTransformer)), columns) { - // Throws System.InvalidOperationException if given imageFolder path is invalid or empty. Note: imageFolder may be null in this case. + // Throws ArgumentException if given imageFolder path is invalid or empty. Note: imageFolder may be null in this case. if (imageFolder != null) if (Directory.Exists(imageFolder)) ImageFolder = Path.GetFullPath(imageFolder); else - throw Host.Except(String.Format("Directory \"{0}\" does not exist.", imageFolder)); + throw new ArgumentException(String.Format("Directory \"{0}\" does not exist.", imageFolder)); else ImageFolder = null; _useImageType = type;