cyanfish/naps2
1
1
Fork 0
mirror of https://github.com/cyanfish/naps2.git synced 2024-11-10 14:28:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Handle missing image files in recovery

Browse Source
This commit is contained in:
Ben Olden-Cooligan 2022-06-25 16:25:01 -07:00
parent 685d953ef8
commit 8b7695a371
2 changed files with 44 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
NAPS2.Sdk.Tests/Recovery/RecoveryManagerTests.cs
View File

@ -138,14 +138,43 @@ public class RecoveryManagerTests : ContextualTexts
Assert.NotNull(folder2);
}
private void CreateFolderToRecoverFrom(string folderPath, int imageCount)
[Fact]
public void RecoverWithMissingFile()
{
string recovery1 = Path.Combine(_recoveryBasePath, Path.GetRandomFileName());
var uiImages = CreateFolderToRecoverFrom(recovery1, 2);
File.Delete(((ImageFileStorage) uiImages[0].GetImageWeakReference().ProcessedImage.Storage).FullPath);
var images = new List<ProcessedImage>();
void ImageCallback(ProcessedImage img) => images.Add(img);
var mockProgressCallback = new Mock<ProgressHandler>();
using var folder = _recoveryManager.GetLatestRecoverableFolder();
Assert.NotNull(folder);
var result = folder.TryRecover(ImageCallback, new RecoveryParams(), mockProgressCallback.Object,
CancellationToken.None);
Assert.True(result);
Assert.Single(images);
var expectedImage = new GdiImage(SharedData.color_image);
var actualImage = ImageContext.Render(images[0]);
ImageAsserts.Similar(expectedImage, actualImage, ImageAsserts.GENERAL_RMSE_THRESHOLD);
mockProgressCallback.Verify(callback => callback(0, 2));
mockProgressCallback.Verify(callback => callback(1, 2));
mockProgressCallback.Verify(callback => callback(2, 2));
mockProgressCallback.VerifyNoOtherCalls();
}
private List<UiImage> CreateFolderToRecoverFrom(string folderPath, int imageCount)
{
var rsm1 = RecoveryStorageManager.CreateFolder(folderPath);
var recoveryContext = new ScanningContext(new GdiImageContext(), new FileStorageManager(folderPath));
var images = Enumerable.Range(0, imageCount).Select(x => new UiImage(CreateRecoveryImage(recoveryContext)))
.ToArray();
.ToList();
rsm1.WriteIndex(images);
rsm1.ReleaseLockForTesting();
return images;
}
// TODO: Add tests for recovery params (i.e. thumbnail)

14
NAPS2.Sdk/Recovery/RecoverableFolder.cs
View File

@ -82,7 +82,19 @@ public class RecoverableFolder : IDisposable
var ext = Path.GetExtension(imagePath);
string newPath = _scanningContext.FileStorageManager!.NextFilePath() + ext;
File.Copy(imagePath, newPath);
try
{
File.Copy(imagePath, newPath);
}
catch (Exception e)
{
// TODO: Should we treat FileNotFound differently than other exceptions? i.e. continue on FNF, abort otherwise
Log.ErrorException("Could not recover image", e);
currentProgress++;
progressCallback(currentProgress, totalProgress);
continue;
}
var storage = new ImageFileStorage(newPath);
var recoveredImage = CreateRecoveredImage(recoveryParams, storage, indexImage);