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
10 changes: 5 additions & 5 deletions src/series.jl
Original file line number Diff line number Diff line change
Expand Up @@ -184,18 +184,18 @@ function RasterSeries(path::AbstractString, dims;
dirpath = path
filepaths = filter_ext(dirpath, ext)
length(filepaths) > 0 || error("No $(isnothing(ext) ? "" : ext) files found in \"$path\" dir")
full_filename, _ = splitext(basename(first(filepaths)))
full_filename, _ = Base.splitext(Base.basename(first(filepaths)))
common_filename = join(split(full_filename, separator)[1:end-1])
else
dirpath = dirname(path)
common_filename, path_ext = splitext(basename(path))
dirpath = Base.dirname(path)
common_filename, path_ext = Base.splitext(Base.basename(path))
ext = (isnothing(ext) && path_ext != "") ? path_ext : ext
filepaths = filter(filter_ext(dirpath, ext)) do fp
basename(fp)[1:length(common_filename)] == common_filename
Base.startswith(Base.basename(fp), common_filename)
end
length(filepaths) > 0 || error("No $(isnothing(ext) ? "" : ext) files found matching \"$common_filename\" stem and \"$ext\" extension")
end
basenames = map(fp -> basename(splitext(fp)[1]), filepaths)
basenames = map(fp -> Base.basename(Base.splitext(fp)[1]), filepaths)
v = val(dims)
# Try to get values of the wrapped type from the filenames
if dims isa Dimension && val(dims) isa Union{Type,AutoVal{<:Type}}
Expand Down
6 changes: 6 additions & 0 deletions test/series.jl
Original file line number Diff line number Diff line change
Expand Up @@ -127,5 +127,11 @@ end
@test Rasters.isdisk(series)
@test !Rasters.isdisk(read(series))
@test Rasters.isdisk(Rasters.combine(series))

path = dirname(first(filenames))
pattern = basename(first(filenames))[1:2]
filename_pattern = joinpath(dirname(first(filenames)), "$pattern.tif")
series2 = RasterSeries(filename_pattern, times; duplicate_first=true, lazy=true)
@test isequal(sort(Rasters.filename.(series2)), sort(filenames))
end
end
Loading