Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support for image/x-icon (.ico) #1038 #1086

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support for image/x-icon (.ico) #1038 #1086

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Common/KnownImgPatterns.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
{
public static class KnownImgPatterns
{
public static readonly string[] ImgExtensions = { ".png", ".jpg", ".jpeg", ".gif", ".svg" };
public static readonly string[] ImgExtensions = { ".png", ".jpg", ".jpeg", ".gif", ".svg", ".ico" };
}
}
2 changes: 1 addition & 1 deletion CompressImagesFunction/Compressors/ImageMagickCompress.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public ImageMagickCompress()
};
}

public string[] SupportedExtensions => new[] { ".png", ".jpg", ".jpeg", ".gif" };
public string[] SupportedExtensions => new[] { ".png", ".jpg", ".jpeg", ".gif", ".ico" };

public void LosslessCompress(string path)
{
Expand Down
16 changes: 16 additions & 0 deletions Test/ImageQueryTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,11 @@ public void GivenDefaultConfiguration_ShouldFindAllImages()
Assert.IsTrue(images.Any(s => s == "data/a.jpg"));
Assert.IsTrue(images.Any(s => s == "data/b.png"));
Assert.IsTrue(images.Any(s => s == "data/c.png"));
Assert.IsTrue(images.Any(s => s == "data/d.ico"));
Assert.IsTrue(images.Any(s => s == "data/folder/item1.png"));
Assert.IsTrue(images.Any(s => s == "data/folder/item2.png"));
Assert.IsTrue(images.Any(s => s == "data/folder/item3.jpg"));
Assert.IsTrue(images.Any(s => s == "data/folder/item4.ico"));
Assert.IsTrue(images.Any(s => s == "data/folder/deep/nested/deepimage.png"));
}

Expand Down Expand Up @@ -63,8 +65,10 @@ public void GivenFullIgnoreFullPath_ShouldIgnoreImage()
Assert.IsTrue(images.Any(s => s == "data/a.jpg"));
Assert.IsTrue(images.Any(s => s == "data/b.png"));
Assert.IsTrue(images.Any(s => s == "data/c.png"));
Assert.IsTrue(images.Any(s => s == "data/d.ico"));
Assert.IsTrue(images.Any(s => s == "data/folder/item1.png"));
Assert.IsTrue(images.Any(s => s == "data/folder/item3.jpg"));
Assert.IsTrue(images.Any(s => s == "data/folder/item4.ico"));
Assert.IsTrue(images.Any(s => s == "data/folder/deep/nested/deepimage.png"));
}

Expand All @@ -83,6 +87,7 @@ public void GivenFolderSlash_ShouldIgnoreImages()
Assert.IsTrue(images.Any(s => s == "data/a.jpg"));
Assert.IsTrue(images.Any(s => s == "data/b.png"));
Assert.IsTrue(images.Any(s => s == "data/c.png"));
Assert.IsTrue(images.Any(s => s == "data/d.ico"));
}

[TestMethod]
Expand All @@ -100,6 +105,7 @@ public void GivenFolderWildcard_ShouldIgnoreImages()
Assert.IsTrue(images.Any(s => s == "data/a.jpg"));
Assert.IsTrue(images.Any(s => s == "data/b.png"));
Assert.IsTrue(images.Any(s => s == "data/c.png"));
Assert.IsTrue(images.Any(s => s == "data/d.ico"));
}

[TestMethod]
Expand All @@ -117,6 +123,7 @@ public void GivenFolderWildcardWithNoSlash_ShouldIgnoreImages()
Assert.IsTrue(images.Any(s => s == "data/a.jpg"));
Assert.IsTrue(images.Any(s => s == "data/b.png"));
Assert.IsTrue(images.Any(s => s == "data/c.png"));
Assert.IsTrue(images.Any(s => s == "data/d.ico"));
}

[TestMethod]
Expand Down Expand Up @@ -164,6 +171,7 @@ public void GivenWildcardExtension_ShouldIgnoreImages()
Assert.AreEqual(2, images.Length, $"Images found {string.Join("; ", images)}.");
Assert.IsTrue(images.Any(s => s == "data/a.jpg"));
Assert.IsTrue(images.Any(s => s == "data/folder/item3.jpg"));
Assert.IsTrue(images.Any(s => s == "data/d.ico"));
}

[TestMethod]
Expand Down Expand Up @@ -210,7 +218,9 @@ public void GivenDifferentSlashPath_ShouldIgnoreImages()
Assert.IsTrue(images.Any(s => s == "data/a.jpg"));
Assert.IsTrue(images.Any(s => s == "data/b.png"));
Assert.IsTrue(images.Any(s => s == "data/c.png"));
Assert.IsTrue(images.Any(s => s == "data/d.ico"));
Assert.IsTrue(images.Any(s => s == "data/folder/item1.png"));
Assert.IsTrue(images.Any(s => s == "data/folder/item4.ico"));
Assert.IsTrue(images.Any(s => s == "data/folder/deep/nested/deepimage.png"));
}

Expand All @@ -229,9 +239,11 @@ public void GivenDeeplyNestedImage_ShouldIgnoreImage()
Assert.IsTrue(images.Any(s => s == "data/a.jpg"));
Assert.IsTrue(images.Any(s => s == "data/b.png"));
Assert.IsTrue(images.Any(s => s == "data/c.png"));
Assert.IsTrue(images.Any(s => s == "data/d.ico"));
Assert.IsTrue(images.Any(s => s == "data/folder/item1.png"));
Assert.IsTrue(images.Any(s => s == "data/folder/item2.png"));
Assert.IsTrue(images.Any(s => s == "data/folder/item3.jpg"));
Assert.IsTrue(images.Any(s => s == "data/folder/item4.ico"));
}

[TestMethod]
Expand All @@ -249,9 +261,11 @@ public void GivenDeeplyNestedPath_ShouldIgnoreImages()
Assert.IsTrue(images.Any(s => s == "data/a.jpg"));
Assert.IsTrue(images.Any(s => s == "data/b.png"));
Assert.IsTrue(images.Any(s => s == "data/c.png"));
Assert.IsTrue(images.Any(s => s == "data/d.ico"));
Assert.IsTrue(images.Any(s => s == "data/folder/item1.png"));
Assert.IsTrue(images.Any(s => s == "data/folder/item2.png"));
Assert.IsTrue(images.Any(s => s == "data/folder/item3.jpg"));
Assert.IsTrue(images.Any(s => s == "data/folder/item4.ico"));
}

[TestMethod]
Expand All @@ -269,9 +283,11 @@ public void GivenDeeplyNestedPathOneUp_ShouldIgnoreImages()
Assert.IsTrue(images.Any(s => s == "data/a.jpg"));
Assert.IsTrue(images.Any(s => s == "data/b.png"));
Assert.IsTrue(images.Any(s => s == "data/c.png"));
Assert.IsTrue(images.Any(s => s == "data/d.ico"));
Assert.IsTrue(images.Any(s => s == "data/folder/item1.png"));
Assert.IsTrue(images.Any(s => s == "data/folder/item2.png"));
Assert.IsTrue(images.Any(s => s == "data/folder/item3.jpg"));
Assert.IsTrue(images.Any(s => s == "data/folder/item4.ico"));
}
}
}
Binary file added Test/data/d.ico
View file
Open in desktop
Binary file not shown.
Binary file added Test/data/folder/item4.ico
View file
Open in desktop
Binary file not shown.