Early error checking and file name generation

bonsai-rx · Jun 22, 2023 · bfd334d · bfd334d
1 parent b3797c1
commit bfd334d
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/Bonsai.System/IO/FileSink.cs b/Bonsai.System/IO/FileSink.cs
@@ -117,6 +117,11 @@ protected IObservable<TElement> Process<TElement>(
             Func<TElement, TSource> selector,
             string fileName)
         {
+            if (string.IsNullOrEmpty(fileName))
+            {
+                throw new InvalidOperationException("A valid file path must be specified.");
+            }
+
             if (source == null)
             {
                 throw new ArgumentNullException(nameof(source));
@@ -129,6 +134,13 @@ protected IObservable<TElement> Process<TElement>(
 
             return Observable.Create<TElement>(observer =>
             {
+                PathHelper.EnsureDirectory(fileName);
+                fileName = PathHelper.AppendSuffix(fileName, Suffix);
+                if (File.Exists(fileName) && !Overwrite)
+                {
+                    throw new IOException(string.Format("The file '{0}' already exists.", fileName));
+                }
+
                 var disposable = new WriterDisposable<TWriter>(Buffered);
                 var process = source.Do(element =>
                 {
@@ -140,18 +152,6 @@ protected IObservable<TElement> Process<TElement>(
                             var runningWriter = disposable.Writer;
                             if (runningWriter == null)
                             {
-                                if (string.IsNullOrEmpty(fileName))
-                                {
-                                    throw new InvalidOperationException("A valid file path must be specified.");
-                                }
-
-                                PathHelper.EnsureDirectory(fileName);
-                                fileName = PathHelper.AppendSuffix(fileName, Suffix);
-                                if (File.Exists(fileName) && !Overwrite)
-                                {
-                                    throw new IOException(string.Format("The file '{0}' already exists.", fileName));
-                                }
-
                                 runningWriter = disposable.Writer = CreateWriter(fileName, input);
                             }