Merge pull request #11 from slimgroup/misc

Fix types for generalization

Author: mloubout

Project.toml

@@ -1,7 +1,7 @@
 name = "SegyIO"
 uuid = "157a0f19-4d44-4de5-a0d0-07e2f0ac4dfa"
 authors = ["Henryk Modzelewski <[email protected]>"]
-version = "0.8.0"
+version = "0.8.1"
 
 [deps]
 Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b"

src/read/segy_read.jl

@@ -3,7 +3,7 @@ export segy_read
 """
 block = segy_read(file::String)
 """
-function segy_read(file::String; buffer::Bool = true, warn_user::Bool = true)
+function segy_read(file::AbstractString; buffer::Bool = true, warn_user::Bool = true)
 
     if buffer
         s = IOBuffer(read(open(file)))
@@ -17,7 +17,7 @@ end
 """
 block = segy_read(file::String, keys::Array{String,1})
 """
-function segy_read(file::String, keys::Array{String,1}; buffer::Bool = true, warn_user::Bool = true)
+function segy_read(file::AbstractString, keys::Array{String,1}; buffer::Bool = true, warn_user::Bool = true)
 
     if buffer
         s = IOBuffer(read(open(file)))

src/scan/scan_file.jl

@@ -74,7 +74,7 @@ function scan_file(file::AbstractString, keys::Array{String, 1};
                    verbosity::Int = 1)
 
     # Put fileheader in memory and read
-    verbosity==1 && println("Scanning ... $file") 
+    verbosity==1 && println("Scanning ... $file")
     s = open(file)
     fh = read_fileheader(s)
 

src/scan/segy_scan.jl

@@ -19,7 +19,7 @@ in `pool`, the default pool is all workers.
 `verbosity` set to 0 silences updates on the current file being scanned.
 
 """
-function segy_scan(dir::String, filt::Union{String, Regex}, keys::Array{String,1}, blocksize::Int; 
+function segy_scan(dir::AbstractString, filt::Union{String, Regex}, keys::Array{String,1}, blocksize::Int; 
                    chunksize::Int = CHUNKSIZE,
                    pool::WorkerPool = WorkerPool(workers()),
                    verbosity::Int = 1,
@@ -44,13 +44,13 @@ end
 Scans all files whose name contains `filt` in each directory of `dirs` using `blocksize`.
 
 """
-function segy_scan(dirs::Array{String,1}, filt::Union{String, Regex}, keys::Array{String,1}, blocksize::Int; 
+function segy_scan(dirs::Array{<:AbstractString,1}, filt::Union{String, Regex}, keys::Array{String,1}, blocksize::Int; 
                    chunksize::Int = CHUNKSIZE,
                    pool::WorkerPool = WorkerPool(workers()),
                    verbosity::Int = 1,
                    filter::Bool = true)
 
-    files = Array{String,1}()
+    files = Array{supertype(typeof(dirs[1]*"")), 1}()
     for dir in dirs 
         endswith(dir, "/") ? nothing : dir *= "/"
         filter ? (filenames = searchdir(dir, filt)) : (filenames = [filt])
@@ -73,7 +73,7 @@ If no `blocksize` is specified, the scanner automatically detects source locatio
 blocks of continguous traces for each source location, but each block no larger then CHUNKSIZE. 
 
 """
-function segy_scan(dir::String, filt::Union{String, Regex}, keys::Array{String,1}; 
+function segy_scan(dir::AbstractString, filt::Union{String, Regex}, keys::Array{String,1}; 
                    chunksize::Int = CHUNKSIZE,
                    pool::WorkerPool = WorkerPool(workers()),
                    verbosity::Int = 1,
@@ -98,13 +98,13 @@ end
 Scans all files whose name contains `filt` in each directory of `dirs`.
 
 """
-function segy_scan(dirs::Array{String,1}, filt::Union{String, Regex}, keys::Array{String,1}; 
+function segy_scan(dirs::Array{<:AbstractString,1}, filt::Union{String, Regex}, keys::Array{String,1}; 
                    chunksize::Int = CHUNKSIZE,
                    pool::WorkerPool = WorkerPool(workers()),
                    verbosity::Int = 1,
                    filter::Bool = true)
 
-    files = Array{String,1}()
+    files = Array{supertype(typeof(dirs[1]*"")), 1}()
     for dir in dirs 
         endswith(dir, "/") ? nothing : dir *= "/"
         filter ? (filenames = searchdir(dir, filt)) : (filenames = [filt])