Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions ImageDescriber.Test/ImportTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -288,4 +288,36 @@ public void ParseCsvRecordsKeepsLineBreaksInsideQuotedFields()
Assert.AreSequenceEqual(ExpectedEscapedQuoteRecord, records[2].Fields);
Assert.AreEqual(5, records[2].LineNumber);
}

[TestMethod]
[DataRow("{\"not\":\"array\"}")]
[DataRow("[{\"Hash\":\"aaaa")]
[DataRow("[{\"Hash\":\"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\"FileSizeBytes\":\"abc\"}]")]
[DataRow("[{\"Hash\":\"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\"KnownPaths\":[\"relative/photo.jpg\"]}]")]
public void RunReportsAMalformedJsonFileWithoutThrowingOrChangingTheStore(string json)
{
PersistentState originalSettings = Program.Settings;
TextWriter originalOut = Console.Out;
string file = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString("N") + ".json");
File.WriteAllText(file, json);
try
{
Program.Settings = new PersistentState();
using StringWriter output = new();
Console.SetOut(output);

Import import = new();
import.Run(new Import { InputPath = file });

Assert.IsTrue(import.Failed);
Assert.IsEmpty(Program.Settings.Descriptions);
Assert.Contains(file, output.ToString());
}
finally
{
Console.SetOut(originalOut);
Program.Settings = originalSettings;
File.Delete(file);
}
}
}
20 changes: 18 additions & 2 deletions ImageDescriber/Verbs/Import.cs
Original file line number Diff line number Diff line change
Expand Up @@ -162,10 +162,26 @@ internal static bool MergeKnownPaths(ImageDescription source, ImageDescription t
return pathsAdded;
}

private static List<ImageDescription> ImportJson(AbsoluteFilePath inputPath)
private static List<ImageDescription>? ImportJson(AbsoluteFilePath inputPath)
{
string json = File.ReadAllText(inputPath.WeakString);
return JsonSerializer.Deserialize<List<ImageDescription>>(json, JsonOptions) ?? [];

// A truncated or hand-edited file, or one that isn't an export at all, has to end the
// import before anything is merged or saved, not end the process with a stack trace.
try
{
return JsonSerializer.Deserialize<List<ImageDescription>>(json, JsonOptions) ?? [];
}
catch (JsonException ex)
{
Console.WriteLine($"Error: {inputPath} is not a valid ImageDescriber JSON export: {ex.Message}");
return null;
}
catch (ArgumentException ex)
{
Console.WriteLine($"Error: {inputPath} is not a valid ImageDescriber JSON export: {ex.Message}");
return null;
}
}

private static List<ImageDescription> ImportCsv(AbsoluteFilePath inputPath) =>
Expand Down
Loading