more source fixes

src/array.jl

@@ -251,7 +251,7 @@ end
 function Raster(filename::AbstractString;
  name=nothing, key=name, source=nothing, kw...
 )::Raster
- source = isnothing(source) ? _sourcetype(filename) : _sourcetype(source)
+ source = _sourcetype(filename, source)
  Base.invokelatest() do
  _open(filename; source) do ds
  key = filekey(ds, key)
@@ -265,7 +265,7 @@ function Raster(ds, filename::AbstractString, key=nothing;
  source=nothing, write=false, lazy=false, dropband=true,
  metadata=_metadata(ds), missingval=missingval(ds)
 )::Raster
- source = isnothing(source) ? _sourcetype(filename) : _sourcetype(source)
+ source = _sourcetype(filename, source)
  crs = defaultcrs(source, crs)
  mappedcrs = defaultmappedcrs(source, mappedcrs)
  dims = dims isa Nothing ? _dims(ds, crs, mappedcrs) : dims

src/sources/sources.jl

@@ -59,9 +59,11 @@ function Base.showerror(io::IO, e::BackendException)
 end
 
 # Get the source backend for a file extension, falling back to GDALsource
+_sourcetype(filename::AbstractString, s::Source) = s
+_sourcetype(filename::AbstractString, s) = _sourcetype(s)
+_sourcetype(filename::AbstractString, ::Nothing) = _sourcetype(filename)
 _sourcetype(filename::AbstractString) = get(EXT2SOURCE, splitext(filename)[2], GDALsource())
 _sourcetype(filenames::NamedTuple) = _sourcetype(first(filenames))
-_sourcetype(filename, ext::Nothing) = _sourcetype(filename)
 _sourcetype(filename, ext) = get(EXT2SOURCE, ext, GDALsource())
 _sourcetype(source::Source) = source
 _sourcetype(source::Type{<:Source}) = source()

src/stack.jl

@@ -175,7 +175,7 @@ function RasterStack(filenames::NamedTuple{K,<:Tuple{<:AbstractString,Vararg}};
  crs=nothing, mappedcrs=nothing, source=nothing, lazy=false, dropband=true, kw...
 ) where K
  layers = map(keys(filenames), values(filenames)) do key, fn
- source = source isa Nothing ? _sourcetype(fn) : _sourcetype(source)
+ source = _sourcetype(fn, source)
  crs = defaultcrs(source, crs)
  mappedcrs = defaultmappedcrs(source, mappedcrs)
  _open(source, fn; key) do ds
@@ -237,7 +237,7 @@ end
 function RasterStack(filename::AbstractString;
  source=nothing, name=nothing, keys=name, lazy=false, dropband=true, kw...
 )
- source = isnothing(source) ? _sourcetype(filename) : _sourcetype(source)
+ source = _sourcetype(filename, source)
  st = if isdir(filename)
  # Load as a whole directory
  filenames = readdir(filename)
@@ -298,7 +298,7 @@ function _layer_stack(filename;
  missingval = missingval isa Nothing ? Rasters.missingval(ds) : missingval
  tuplekeys = Tuple(map(Symbol, layers.keys))
  data = if lazy
- FileStack{source}(ds, filename; keys=tuplekeys, vars=Tuple(layers.vars))
+ FileStack{typeof(source)}(ds, filename; keys=tuplekeys, vars=Tuple(layers.vars))
  else
  NamedTuple{tuplekeys}(map(Array, layers.vars))
  end