|
4 | 4 | using Microsoft.Extensions.Logging; |
5 | 5 | using System.IO; |
6 | 6 | using System.Net.Http; |
7 | | -using System.Runtime.InteropServices; |
8 | 7 | using System.Xml.Serialization; |
9 | 8 | using Windows.ApplicationModel; |
10 | 9 | using Windows.Management.Deployment; |
@@ -138,49 +137,23 @@ public async Task CheckAndUpdateFilesLauncherAsync() |
138 | 137 |
|
139 | 138 | if (File.Exists(destHashFilePath)) |
140 | 139 | { |
141 | | - try |
142 | | - { |
143 | | - await using var srcStream = (await srcHashFile.OpenReadAsync().AsTask().ConfigureAwait(false)).AsStream(); |
144 | | - await using var destStream = File.OpenRead(destHashFilePath); |
145 | | - hashEqual = HashEqual(srcStream, destStream); |
146 | | - } |
147 | | - catch (COMException ex) |
148 | | - { |
149 | | - Logger?.LogWarning(ex, "Failed to compare hash files"); |
150 | | - return; |
151 | | - } |
152 | | - catch (IOException ex) |
153 | | - { |
154 | | - Logger?.LogWarning(ex, "IO error while reading hash files"); |
155 | | - return; |
156 | | - } |
| 140 | + await using var srcStream = (await srcHashFile.OpenReadAsync().AsTask().ConfigureAwait(false)).AsStream(); |
| 141 | + await using var destStream = File.OpenRead(destHashFilePath); |
| 142 | + hashEqual = HashEqual(srcStream, destStream); |
157 | 143 | } |
158 | 144 |
|
159 | 145 | if (!hashEqual) |
160 | 146 | { |
161 | | - try |
162 | | - { |
163 | | - var srcExeFile = await StorageFile.GetFileFromApplicationUriAsync(new Uri("ms-appx:///Assets/FilesOpenDialog/Files.App.Launcher.exe")) |
164 | | - .AsTask().ConfigureAwait(false); |
165 | | - var destFolder = await StorageFolder.GetFolderFromPathAsync(destFolderPath).AsTask().ConfigureAwait(false); |
166 | | - |
167 | | - await srcExeFile.CopyAsync(destFolder, "Files.App.Launcher.exe", NameCollisionOption.ReplaceExisting) |
168 | | - .AsTask().ConfigureAwait(false); |
169 | | - await srcHashFile.CopyAsync(destFolder, "Files.App.Launcher.exe.sha256", NameCollisionOption.ReplaceExisting) |
170 | | - .AsTask().ConfigureAwait(false); |
171 | | - |
172 | | - Logger?.LogInformation("Files.App.Launcher updated."); |
173 | | - } |
174 | | - catch (COMException ex) |
175 | | - { |
176 | | - Logger?.LogError(ex, ex.Message); |
177 | | - return; |
178 | | - } |
179 | | - catch (UnauthorizedAccessException ex) |
180 | | - { |
181 | | - Logger?.LogError(ex, ex.Message); |
182 | | - return; |
183 | | - } |
| 147 | + var srcExeFile = await StorageFile.GetFileFromApplicationUriAsync(new Uri("ms-appx:///Assets/FilesOpenDialog/Files.App.Launcher.exe")) |
| 148 | + .AsTask().ConfigureAwait(false); |
| 149 | + var destFolder = await StorageFolder.GetFolderFromPathAsync(destFolderPath).AsTask().ConfigureAwait(false); |
| 150 | + |
| 151 | + await srcExeFile.CopyAsync(destFolder, "Files.App.Launcher.exe", NameCollisionOption.ReplaceExisting) |
| 152 | + .AsTask().ConfigureAwait(false); |
| 153 | + await srcHashFile.CopyAsync(destFolder, "Files.App.Launcher.exe.sha256", NameCollisionOption.ReplaceExisting) |
| 154 | + .AsTask().ConfigureAwait(false); |
| 155 | + |
| 156 | + Logger?.LogInformation("Files.App.Launcher updated."); |
184 | 157 | } |
185 | 158 | } |
186 | 159 | catch (Exception ex) |
|
0 commit comments