Skip to content

Commit a0fe8c2

Browse files
committed
Ensure base path is not modified on resubscription
1 parent 26277c8 commit a0fe8c2

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

Bonsai.System/Bonsai.System.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Description>Bonsai System Library containing reactive infrastructure to interface with the underlying operating system.</Description>
66
<PackageTags>Bonsai Rx Reactive Extensions IO Serial Port Resources</PackageTags>
77
<TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
8-
<VersionPrefix>2.8.0</VersionPrefix>
8+
<VersionPrefix>2.8.1</VersionPrefix>
99
</PropertyGroup>
1010
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
1111
<PackageReference Include="System.IO.Ports" Version="6.0.0" />

Bonsai.System/IO/FileSink.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -135,10 +135,10 @@ protected IObservable<TElement> Process<TElement>(
135135
return Observable.Create<TElement>(observer =>
136136
{
137137
PathHelper.EnsureDirectory(fileName);
138-
fileName = PathHelper.AppendSuffix(fileName, Suffix);
139-
if (File.Exists(fileName) && !Overwrite)
138+
var filePath = PathHelper.AppendSuffix(fileName, Suffix);
139+
if (File.Exists(filePath) && !Overwrite)
140140
{
141-
throw new IOException(string.Format("The file '{0}' already exists.", fileName));
141+
throw new IOException(string.Format("The file '{0}' already exists.", filePath));
142142
}
143143

144144
var disposable = new WriterDisposable<TWriter>(Buffered);
@@ -152,7 +152,7 @@ protected IObservable<TElement> Process<TElement>(
152152
var runningWriter = disposable.Writer;
153153
if (runningWriter == null)
154154
{
155-
runningWriter = disposable.Writer = CreateWriter(fileName, input);
155+
runningWriter = disposable.Writer = CreateWriter(filePath, input);
156156
}
157157

158158
Write(runningWriter, input);

Bonsai.System/IO/StreamSink.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,8 @@ protected IObservable<TElement> Process<TElement>(
162162
try
163163
{
164164
if (!path.StartsWith(@"\\")) PathHelper.EnsureDirectory(path);
165-
path = PathHelper.AppendSuffix(path, Suffix);
166-
stream = CreateStream(path, Overwrite, cancellationSource.Token);
165+
var streamPath = PathHelper.AppendSuffix(path, Suffix);
166+
stream = CreateStream(streamPath, Overwrite, cancellationSource.Token);
167167
disposable.Writer = CreateWriter(stream);
168168
}
169169
catch (Exception ex)

0 commit comments

Comments
 (0)