handle keyword arguments for multi-file dataset

Author: Alexander-Barth

src/defer.jl

@@ -61,16 +61,16 @@ function DeferDataset(TDS,r::Resource,groupname::String,data::OrderedDict)
    return dds
 end
 
-function DeferDataset(TDS,filename::AbstractString,mode::AbstractString,info::OrderedDict)
-    r = Resource(filename,mode,info)
+function DeferDataset(TDS,filename::AbstractString,mode::AbstractString,info::OrderedDict; kwargs...)
+    r = Resource(filename,mode,Dict(kwargs),info)
     groupname = "/"
     return DeferDataset(TDS,r,groupname,info)
 end
 
-function DeferDataset(TDS,filename::AbstractString,mode = "r")
+function DeferDataset(TDS,filename::AbstractString,mode = "r"; kwargs...)
     TDS(filename,mode) do ds
         info = metadata(ds)
-        r = Resource(filename,mode,info)
+        r = Resource(filename,mode,Dict(kwargs),info)
         groupname = "/"
         return DeferDataset(TDS,r,groupname,info)
     end
@@ -84,7 +84,7 @@ path(dds::DeferDataset) = dds.r.filename
 varnames(dds::DeferDataset) = collect(keys(dds.data[:var]))
 
 function Variable(f::Function, dv::DeferVariable{T,N,TDS}) where {T,N,TDS}
-    TDS(dv.r.filename,dv.r.mode) do ds
+    TDS(dv.r.filename,dv.r.mode; dv.r.args...) do ds
         f(variable(ds,dv.varname))
     end
 end
@@ -103,7 +103,7 @@ end
 variable(dds::DeferDataset,varname::Symbol) = variable(dds,string(varname))
 
 dataset(dv::DeferVariable{T,N,TDS}) where {T,N,TDS} =
-    DeferDataset(TDS,dv.r.filename,dv.r.mode)
+    DeferDataset(TDS,dv.r.filename,dv.r.mode; dv.r.args...)
 
 function Base.getindex(dv::DeferVariable,indexes::Union{Int,Colon,AbstractRange{<:Integer}}...)
     Variable(dv) do v

src/multifile.jl

@@ -92,6 +92,7 @@ function MFDataset(TDS,fnames::AbstractArray{<:AbstractString,N},mode = "r";
                    _aggdimconstant = false,
                    isnewdim = false,
                    constvars = Union{Symbol,String}[],
+                   kwargs...
                    ) where N
     if !(mode == "r" || mode == "a")
         throw(ArgumentError("""Unsupported mode for multi-file dataset (mode = $(mode)). Mode must be "r" or "a"."""))
@@ -103,20 +104,20 @@ function MFDataset(TDS,fnames::AbstractArray{<:AbstractString,N},mode = "r";
         if _aggdimconstant
             # load only metadata from master
             master_index = 1
-            ds_master = TDS(fnames[master_index],mode);
+            ds_master = TDS(fnames[master_index],mode; kwargs...);
             data_master = metadata(ds_master)
             ds = Vector{Union{TDS,DeferDataset}}(undef,length(fnames))
             #ds[master_index] = ds_master
             for (i,fname) in enumerate(fnames)
                 #if i !== master_index
-                ds[i] = DeferDataset(TDS,fname,mode,data_master)
+                ds[i] = DeferDataset(TDS,fname,mode,data_master; kwargs...)
                 #end
             end
         else
-            ds = DeferDataset.(TDS,fnames,mode)
+            ds = DeferDataset.(TDS,fnames,mode; kwargs...)
         end
     else
-        ds = TDS.(fnames,mode);
+        ds = TDS.(fnames,mode,kwargs...);
     end
 
     if (aggdim == nothing) && !isnewdim
@@ -133,7 +134,7 @@ function MFDataset(ds::AbstractVector{<:AbstractDataset};
                    deferopen = true,
                    _aggdimconstant = false,
                    isnewdim = false,
-                   constvars = Union{Symbol,String}[],
+                   constvars = Union{Symbol,String}[]
                    )
 
     MFDataset(ds,aggdim,isnewdim,Symbol.(constvars))

src/types.jl

@@ -136,6 +136,7 @@ end
 struct Resource
     filename::String
     mode::String
+    args::Dict{Symbol,Any}
     metadata::OrderedDict
 end