Skip to content

Commit 02c2320

Browse files
andreistaravoitauandreistaravoitau
authored
Code Quality: Convert into await using statement or declaration (#16694)
1 parent a4b2632 commit 02c2320

16 files changed

+57
-56
lines changed

‎src/Files.App/Extensions/ImageSourceExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ internal static async Task<byte[]> ToByteArrayAsync(this IInputStream stream)
2020
return null;
2121
}
2222

23-
using var readStream = stream.AsStreamForRead();
23+
await using var readStream = stream.AsStreamForRead();
2424

2525
return await readStream.ToByteArrayAsync();
2626
}

‎src/Files.App/Services/App/AppUpdateSideloadService.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@ public async Task CheckAndUpdateFilesLauncherAsync()
134134

135135
if (File.Exists(destHashFilePath))
136136
{
137-
using var srcStream = (await srcHashFile.OpenReadAsync()).AsStream();
138-
using var destStream = File.OpenRead(destHashFilePath);
137+
await using var srcStream = (await srcHashFile.OpenReadAsync()).AsStream();
138+
await using var destStream = File.OpenRead(destHashFilePath);
139139

140140
hashEqual = HashEqual(srcStream, destStream);
141141
}

‎src/Files.App/Services/App/AppUpdateStoreService.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,8 @@ public async Task CheckAndUpdateFilesLauncherAsync()
186186

187187
if (Path.Exists(destHashFilePath))
188188
{
189-
using var srcStream = (await srcHashFile.OpenReadAsync()).AsStream();
190-
using var destStream = File.OpenRead(destHashFilePath);
189+
await using var srcStream = (await srcHashFile.OpenReadAsync()).AsStream();
190+
await using var destStream = File.OpenRead(destHashFilePath);
191191

192192
hashEqual = HashEqual(srcStream, destStream);
193193
}

‎src/Files.App/Utils/Cloud/Detector/GoogleDriveCloudDetector.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ await FilesystemTasks.Wrap(() => StorageFile.GetFileFromPathAsync(Path.Combine(a
3838

3939
// Build the connection and sql command
4040
SQLitePCL.Batteries_V2.Init();
41-
using var database = new SqliteConnection($"Data Source='{syncDbPath}'");
42-
using var cmdRoot = new SqliteCommand("SELECT * FROM roots", database);
43-
using var cmdMedia = new SqliteCommand("SELECT * FROM media WHERE fs_type=10", database);
41+
await using var database = new SqliteConnection($"Data Source='{syncDbPath}'");
42+
await using var cmdRoot = new SqliteCommand("SELECT * FROM roots", database);
43+
await using var cmdMedia = new SqliteCommand("SELECT * FROM media WHERE fs_type=10", database);
4444

4545
// Open the connection and execute the command
4646
database.Open();

‎src/Files.App/Utils/Cloud/Detector/SynologyDriveCloudDetector.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ protected override async IAsyncEnumerable<ICloudProvider> GetProviders()
3333

3434
// Build the connection and SQL command
3535
SQLitePCL.Batteries_V2.Init();
36-
using var database = new SqliteConnection($"Data Source='{syncDbPath}'");
37-
using var cmdConnection = new SqliteCommand("SELECT * FROM connection_table", database);
38-
using var cmdTable = new SqliteCommand("SELECT * FROM session_table", database);
36+
await using var database = new SqliteConnection($"Data Source='{syncDbPath}'");
37+
await using var cmdConnection = new SqliteCommand("SELECT * FROM connection_table", database);
38+
await using var cmdTable = new SqliteCommand("SELECT * FROM session_table", database);
3939

4040
// Open the connection and execute the command
4141
database.Open();

‎src/Files.App/Utils/Shell/LaunchHelper.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,8 @@ private static async Task<bool> HandleApplicationLaunch(string application, stri
204204
if (!hFileSrc.IsInvalid && !hFileDst.IsInvalid)
205205
{
206206
// Copy ADS to temp folder and open
207-
using (var inStream = new FileStream(hFileSrc.DangerousGetHandle(), FileAccess.Read))
208-
using (var outStream = new FileStream(hFileDst.DangerousGetHandle(), FileAccess.Write))
207+
await using (var inStream = new FileStream(hFileSrc.DangerousGetHandle(), FileAccess.Read))
208+
await using (var outStream = new FileStream(hFileDst.DangerousGetHandle(), FileAccess.Write))
209209
{
210210
await inStream.CopyToAsync(outStream);
211211
await outStream.FlushAsync();

‎src/Files.App/Utils/Storage/Operations/ShellFilesystemOperations.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public async Task<IStorageHistory> CopyItemsAsync(IList<IStorageItemWithPath> so
6161

6262
var operationID = Guid.NewGuid().ToString();
6363

64-
using var r = cancellationToken.Register(CancelOperation, operationID, false);
64+
await using var r = cancellationToken.Register(CancelOperation, operationID, false);
6565

6666
var sourceReplace = sourceNoSkip.Zip(collisionsNoSkip, (src, coll) => new { src, coll }).Where(item => item.coll == FileNameConflictResolveOptionType.ReplaceExisting).Select(item => item.src);
6767
var destinationReplace = destinationNoSkip.Zip(collisionsNoSkip, (src, coll) => new { src, coll }).Where(item => item.coll == FileNameConflictResolveOptionType.ReplaceExisting).Select(item => item.src);
@@ -371,7 +371,7 @@ public async Task<IStorageHistory> DeleteItemsAsync(IList<IStorageItemWithPath>
371371
}
372372

373373
var operationID = Guid.NewGuid().ToString();
374-
using var r = cancellationToken.Register(CancelOperation, operationID, false);
374+
await using var r = cancellationToken.Register(CancelOperation, operationID, false);
375375

376376
var (success, response) = await FileOperationsHelpers.DeleteItemAsync(deleteFilePaths.ToArray(), permanently, MainWindow.Instance.WindowHandle.ToInt64(), asAdmin, progress, operationID);
377377

@@ -483,7 +483,7 @@ public async Task<IStorageHistory> MoveItemsAsync(IList<IStorageItemWithPath> so
483483
var collisionsNoSkip = collisions.Where(c => c != FileNameConflictResolveOptionType.Skip);
484484
var operationID = Guid.NewGuid().ToString();
485485

486-
using var r = cancellationToken.Register(CancelOperation, operationID, false);
486+
await using var r = cancellationToken.Register(CancelOperation, operationID, false);
487487

488488
var sourceReplace = sourceNoSkip.Zip(collisionsNoSkip, (src, coll) => new { src, coll }).Where(item => item.coll == FileNameConflictResolveOptionType.ReplaceExisting).Select(item => item.src);
489489
var destinationReplace = destinationNoSkip.Zip(collisionsNoSkip, (src, coll) => new { src, coll }).Where(item => item.coll == FileNameConflictResolveOptionType.ReplaceExisting).Select(item => item.src);
@@ -736,7 +736,7 @@ public async Task<IStorageHistory> RestoreItemsFromTrashAsync(IList<IStorageItem
736736
StatusCenterItemProgressModel fsProgress = new(progress, true, FileSystemStatusCode.InProgress);
737737
fsProgress.Report();
738738
var operationID = Guid.NewGuid().ToString();
739-
using var r = cancellationToken.Register(CancelOperation, operationID, false);
739+
await using var r = cancellationToken.Register(CancelOperation, operationID, false);
740740

741741
var moveResult = new ShellOperationResult();
742742
var (status, response) = await FileOperationsHelpers.MoveItemAsync(source.Select(s => s.Path).ToArray(), [.. destination], false, MainWindow.Instance.WindowHandle.ToInt64(), asAdmin, progress, operationID);

‎src/Files.App/Utils/Storage/StorageBaseItems/BaseStorageFile.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ public static IAsyncOperation<BaseStorageFile> GetFileFromPathAsync(string path)
158158
public async Task<string> ReadTextAsync(int maxLength = -1)
159159
{
160160
using var inputStream = await OpenReadAsync();
161-
using var stream = inputStream.AsStreamForRead();
161+
await using var stream = inputStream.AsStreamForRead();
162162
using var dataReader = new StreamReader(stream, true);
163163
StringBuilder builder = new();
164164
int charsRead, charsToRead;

‎src/Files.App/Utils/Storage/StorageItems/FtpStorageFile.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,13 +171,13 @@ public override IAsyncOperation<BaseStorageFile> CopyAsync(IStorageFolder destin
171171

172172
if (destFolder is ICreateFileWithStream cwsf)
173173
{
174-
using var inStream = await ftpClient.OpenRead(FtpPath, token: cancellationToken);
174+
await using var inStream = await ftpClient.OpenRead(FtpPath, token: cancellationToken);
175175
return await cwsf.CreateFileAsync(inStream, desiredNewName, option.Convert());
176176
}
177177
else
178178
{
179179
BaseStorageFile file = await destFolder.CreateFileAsync(desiredNewName, option.Convert());
180-
using var stream = await file.OpenStreamForWriteAsync();
180+
await using var stream = await file.OpenStreamForWriteAsync();
181181
return await ftpClient.DownloadStream(stream, FtpPath, token: cancellationToken) ? file : null;
182182
}
183183
}, ((IPasswordProtectedItem)this).RetryWithCredentialsAsync));
@@ -279,7 +279,7 @@ private async void FtpDataStreamingHandlerAsync(StreamedFileDataRequest request)
279279
return;
280280
}
281281

282-
using (var outStream = request.AsStreamForWrite())
282+
await using (var outStream = request.AsStreamForWrite())
283283
{
284284
await ftpClient.DownloadStream(outStream, FtpPath);
285285
await outStream.FlushAsync();

‎src/Files.App/Utils/Storage/StorageItems/NativeStorageFile.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ public override IAsyncOperation<BaseStorageFile> CopyAsync(IStorageFolder destin
8383
else
8484
{
8585
destFile.CreateFile();
86-
using (var inStream = await this.OpenStreamForReadAsync())
87-
using (var outStream = await destFile.OpenStreamForWriteAsync())
86+
await using (var inStream = await this.OpenStreamForReadAsync())
87+
await using (var outStream = await destFile.OpenStreamForWriteAsync())
8888
{
8989
await inStream.CopyToAsync(outStream);
9090
await outStream.FlushAsync();
@@ -248,8 +248,8 @@ public override IAsyncAction RenameAsync(string desiredName, NameCollisionOption
248248
else
249249
{
250250
destFile.CreateFile();
251-
using (var inStream = await this.OpenStreamForReadAsync())
252-
using (var outStream = await destFile.OpenStreamForWriteAsync())
251+
await using (var inStream = await this.OpenStreamForReadAsync())
252+
await using (var outStream = await destFile.OpenStreamForWriteAsync())
253253
{
254254
await inStream.CopyToAsync(outStream);
255255
await outStream.FlushAsync();

0 commit comments

Comments
 (0)