Horizon – Diff between revs 1 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 1 Rev 3
Line 208... Line 208...
208   208  
209 fileDescriptors.Add(fileDescriptor); 209 fileDescriptors.Add(fileDescriptor);
210 } 210 }
Line 211... Line 211...
211 }); 211 });
Line 212... Line 212...
212   212  
213 await Task.Run(() => RetriveFileStream(rows, progress, _cancellationToken), _cancellationToken); 213 await Task.Run(() => RetrieveFileStream(rows, progress, _cancellationToken), _cancellationToken);
214   214  
215 if (!_cancellationToken.IsCancellationRequested) 215 if (_cancellationToken.IsCancellationRequested)
216 { 216 {
Line 229... Line 229...
229   229  
230 break; 230 break;
231 } 231 }
Line 232... Line 232...
232 } 232 }
233   233  
234 private async Task RetriveFileStream(IReadOnlyList<DataGridViewRow> rows, 234 private async Task RetrieveFileStream(IReadOnlyList<DataGridViewRow> rows,
235 IProgress<DataGridViewRowProgress> progress, 235 IProgress<DataGridViewRowProgress> progress,
236 CancellationToken cancellationToken) 236 CancellationToken cancellationToken)
Line 349... Line 349...
349 statusStrip1.Update(); 349 statusStrip1.Update();
350 }); 350 });
Line 351... Line 351...
351   351  
Line 352... Line 352...
352 await Task.Run(() => RemoveColorFiles(rows, progress, _cancellationToken), _cancellationToken); 352 await Task.Run(() => RemoveColorFiles(rows, progress, _cancellationToken), _cancellationToken);
353   353  
354 if (!_cancellationToken.IsCancellationRequested) 354 if (_cancellationToken.IsCancellationRequested)
355 { 355 {
356 toolStripProgressBar1.Value = toolStripProgressBar1.Maximum; 356 toolStripProgressBar1.Value = toolStripProgressBar1.Maximum;
357 toolStripStatusLabel1.Text = "Done."; 357 toolStripStatusLabel1.Text = "Done.";
Line 394... Line 394...
394 statusStrip1.Update(); 394 statusStrip1.Update();
395 }); 395 });
Line 396... Line 396...
396   396  
Line 397... Line 397...
397 await Task.Run(() => ColorFiles(rows, color, progress, _cancellationToken), _cancellationToken); 397 await Task.Run(() => ColorFiles(rows, color, progress, _cancellationToken), _cancellationToken);
398   398  
399 if (!_cancellationToken.IsCancellationRequested) 399 if (_cancellationToken.IsCancellationRequested)
400 { 400 {
401 toolStripProgressBar1.Value = toolStripProgressBar1.Maximum; 401 toolStripProgressBar1.Value = toolStripProgressBar1.Maximum;
402 toolStripStatusLabel1.Text = "Done."; 402 toolStripStatusLabel1.Text = "Done.";
Line 441... Line 441...
441 dataGridView1.Rows.Remove(rowProgress.Row); 441 dataGridView1.Rows.Remove(rowProgress.Row);
442 }); 442 });
Line 443... Line 443...
443   443  
Line 444... Line 444...
444 await Task.Run(() => DeleteFiles(rows, progress, _cancellationToken), _cancellationToken); 444 await Task.Run(() => DeleteFiles(rows, progress, _cancellationToken), _cancellationToken);
445   445  
446 if (!_cancellationToken.IsCancellationRequested) 446 if (_cancellationToken.IsCancellationRequested)
447 { 447 {
448 toolStripProgressBar1.Value = toolStripProgressBar1.Maximum; 448 toolStripProgressBar1.Value = toolStripProgressBar1.Maximum;
449 toolStripStatusLabel1.Text = "Done."; 449 toolStripStatusLabel1.Text = "Done.";
Line 557... Line 557...
557 statusStrip1.Update(); 557 statusStrip1.Update();
558 }); 558 });
Line 559... Line 559...
559   559  
Line 560... Line 560...
560 await Task.Run(() => RevertFile(rows, progress, _cancellationToken), _cancellationToken); 560 await Task.Run(() => RevertFile(rows, progress, _cancellationToken), _cancellationToken);
561   561  
562 if (!_cancellationToken.IsCancellationRequested) 562 if (_cancellationToken.IsCancellationRequested)
563 { 563 {
564 toolStripProgressBar1.Value = toolStripProgressBar1.Maximum; 564 toolStripProgressBar1.Value = toolStripProgressBar1.Maximum;
565 toolStripStatusLabel1.Text = "Done."; 565 toolStripStatusLabel1.Text = "Done.";
Line 890... Line 890...
890 statusStrip1.Update(); 890 statusStrip1.Update();
891 }); 891 });
Line 892... Line 892...
892   892  
Line 893... Line 893...
893 await Task.Run(() => RelocateFiles(rows, directory, progress, _cancellationToken), _cancellationToken); 893 await Task.Run(() => RelocateFiles(rows, directory, progress, _cancellationToken), _cancellationToken);
894   894  
895 if (!_cancellationToken.IsCancellationRequested) 895 if (_cancellationToken.IsCancellationRequested)
896 { 896 {
897 toolStripProgressBar1.Value = toolStripProgressBar1.Maximum; 897 toolStripProgressBar1.Value = toolStripProgressBar1.Maximum;
898 toolStripStatusLabel1.Text = "Done."; 898 toolStripStatusLabel1.Text = "Done.";
Line 965... Line 965...
965 statusStrip1.Update(); 965 statusStrip1.Update();
966 }); 966 });
Line 967... Line 967...
967   967  
Line 968... Line 968...
968 await Task.Run(() => UpdateNote(rows, e.Note, progress, _cancellationToken), _cancellationToken); 968 await Task.Run(() => UpdateNote(rows, e.Note, progress, _cancellationToken), _cancellationToken);
969   969  
970 if (!_cancellationToken.IsCancellationRequested) 970 if (_cancellationToken.IsCancellationRequested)
971 { 971 {
972 toolStripProgressBar1.Value = toolStripProgressBar1.Maximum; 972 toolStripProgressBar1.Value = toolStripProgressBar1.Maximum;
973 toolStripStatusLabel1.Text = "Done."; 973 toolStripStatusLabel1.Text = "Done.";
Line 1119... Line 1119...
1119 statusStrip1.Update(); 1119 statusStrip1.Update();
1120 }); 1120 });
Line 1121... Line 1121...
1121   1121  
Line 1122... Line 1122...
1122 await Task.Run(() => SaveFilesTo(rows, directory, progress, _cancellationToken), _cancellationToken); 1122 await Task.Run(() => SaveFilesTo(rows, directory, progress, _cancellationToken), _cancellationToken);
1123   1123  
1124 if (!_cancellationToken.IsCancellationRequested) 1124 if (_cancellationToken.IsCancellationRequested)
1125 { 1125 {
1126 toolStripProgressBar1.Value = toolStripProgressBar1.Maximum; 1126 toolStripProgressBar1.Value = toolStripProgressBar1.Maximum;
1127 toolStripStatusLabel1.Text = "Done."; 1127 toolStripStatusLabel1.Text = "Done.";
Line 1176... Line 1176...
1176 }); 1176 });
Line 1177... Line 1177...
1177   1177  
1178 await Task.Run(() => SaveDirectoryTo(rows, basePath, dialog.FileName, progress, _cancellationToken), 1178 await Task.Run(() => SaveDirectoryTo(rows, basePath, dialog.FileName, progress, _cancellationToken),
Line 1179... Line 1179...
1179 _cancellationToken); 1179 _cancellationToken);
1180   1180  
1181 if (!_cancellationToken.IsCancellationRequested) 1181 if (_cancellationToken.IsCancellationRequested)
1182 { 1182 {
1183 toolStripProgressBar1.Value = toolStripProgressBar1.Maximum; 1183 toolStripProgressBar1.Value = toolStripProgressBar1.Maximum;
1184 toolStripStatusLabel1.Text = "Done."; 1184 toolStripStatusLabel1.Text = "Done.";
Line 1250... Line 1250...
1250 statusStrip1.Update(); 1250 statusStrip1.Update();
1251 }); 1251 });
Line 1252... Line 1252...
1252   1252  
Line 1253... Line 1253...
1253 await Task.Run(() => RecomputeHashes(rows, progress, _cancellationToken), _cancellationToken); 1253 await Task.Run(() => RecomputeHashes(rows, progress, _cancellationToken), _cancellationToken);
1254   1254  
1255 if (!_cancellationToken.IsCancellationRequested) 1255 if (_cancellationToken.IsCancellationRequested)
1256 { 1256 {
1257 toolStripProgressBar1.Value = toolStripProgressBar1.Maximum; 1257 toolStripProgressBar1.Value = toolStripProgressBar1.Maximum;
1258 toolStripStatusLabel1.Text = "Done."; 1258 toolStripStatusLabel1.Text = "Done.";
Line 1290... Line 1290...
1290 statusStrip1.Update(); 1290 statusStrip1.Update();
1291 }); 1291 });
Line 1292... Line 1292...
1292   1292  
Line 1293... Line 1293...
1293 await Task.Run(() => NormalizeDateTime(rows, progress, _cancellationToken), _cancellationToken); 1293 await Task.Run(() => NormalizeDateTime(rows, progress, _cancellationToken), _cancellationToken);
1294   1294  
1295 if (!_cancellationToken.IsCancellationRequested) 1295 if (_cancellationToken.IsCancellationRequested)
1296 { 1296 {
1297 toolStripProgressBar1.Value = toolStripProgressBar1.Maximum; 1297 toolStripProgressBar1.Value = toolStripProgressBar1.Maximum;
1298 toolStripStatusLabel1.Text = "Done."; 1298 toolStripStatusLabel1.Text = "Done.";
Line 1619... Line 1619...
1619 statusStrip1.Update(); 1619 statusStrip1.Update();
1620 }); 1620 });
Line 1621... Line 1621...
1621   1621  
Line 1622... Line 1622...
1622 await Task.Run(() => DeleteScreenshots(rows, progress, _cancellationToken), _cancellationToken); 1622 await Task.Run(() => DeleteScreenshots(rows, progress, _cancellationToken), _cancellationToken);
1623   1623  
1624 if (!_cancellationToken.IsCancellationRequested) 1624 if (_cancellationToken.IsCancellationRequested)
1625 { 1625 {
1626 toolStripProgressBar1.Value = toolStripProgressBar1.Maximum; 1626 toolStripProgressBar1.Value = toolStripProgressBar1.Maximum;
1627 toolStripStatusLabel1.Text = "Done."; 1627 toolStripStatusLabel1.Text = "Done.";