Skip to content

allow additional image extensions #160

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

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

allow additional image extensions #160

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
9 changes: 7 additions & 2 deletions R/Validity.R
View file
Open in desktop
Copy link
Contributor

@LiNk-NY LiNk-NY May 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It may be better to use tools::file_ext() and tolower() to check the extension with vector of allowed extensions.

Copy link
Contributor

@LiNk-NY LiNk-NY May 13, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider doing something like:

## [... outside the function]
.ALLOWED_FORMATS <- c("png", "jpg", "jpeg", "tif", "tiff")
## [... inside the function]
ext <- tools::file_ext(x) |> tolower()
ext %in% .ALLOWED_FORMATS

Copy link
Author

@andrewGhazi andrewGhazi May 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, I also made this change as well 👍

Original file line number Diff line number Diff line change
Expand Up @@ -98,13 +98,18 @@ setValidity2("SpatialExperiment", .spe_validity)

# SpatialImage validity --------------------------------------------------------

.ALLOWED_FORMATS <- c("png", "jpg", "jpeg", "tif", "tiff")

.path_validity <- function(x) {

ext <- tools::file_ext(x) |> tolower()

is_valid <- all(c(
length(x) == 1,
is.character(x),
file.exists(x),
# TODO: any other possible image formats?
grepl("(\\.png|\\.jpg|\\.tif)$", x)))
ext %in% .ALLOWED_FORMATS
))

if (!is_valid)
stop("'path' should be a length-one character",
Expand Down