include changes to make load(query(x)) work

- load(::File/Stream) dispatches now to the correct library
- if file is unknown it throws a UnknownFormat error
- moved all load/save functions in tests into module to give them their
own scope ( better support the idea, that FileIO shouldn't define
load/save functions)

Author: SimonDanisch

src/FileIO.jl

@@ -38,8 +38,8 @@ export DataFormat,
 
 import Base.showerror
 
-include("error_handling.jl")
 include("query.jl")
+include("error_handling.jl")
 include("loadsave.jl")
 include("registry.jl")
 

src/error_handling.jl

@@ -25,7 +25,6 @@ Base.showerror(io::IO, e::WriterError) = println(
     msg, "\n  Will try next writer."
 )
 
-
 @doc """
 `NotInstalledError` should be thrown when a library is currently not installed.
 """ ->
@@ -35,6 +34,15 @@ immutable NotInstalledError <: Exception
 end
 Base.showerror(io::IO, e::NotInstalledError) = println(io, e.library, " is not installed.")
 
+@doc """
+`UnknownFormat` gets thrown when FileIO can't recognize the format of a file.
+""" ->
+immutable UnknownFormat{T <: Formatted} <: Exception
+    format::T
+end
+Base.showerror(io::IO, e::UnknownFormat) = println(io, e.format, " couldn't be recognized by FileIO.")
+
+
 @doc """
 Handles error as soon as they get thrown while doing IO
 """ ->

src/loadsave.jl

@@ -40,8 +40,35 @@ the magic bytes are essential.
 - `load(File(format"PNG",filename))` specifies the format directly, and bypasses inference.
 - `load(f; options...)` passes keyword arguments on to the loader.
 """ ->
-function load(s::@compat(Union{AbstractString,IO}), args...; options...)
-    q           = query(s)
+load(s::@compat(Union{AbstractString,IO}), args...; options...) =
+    load(query(s), args...; options...)
+
+@doc """
+- `save(filename, data...)` saves the contents of a formatted file,
+trying to infer the format from `filename`.
+- `save(Stream(format"PNG",io), data...)` specifies the format directly, and bypasses inference.
+- `save(f, data...; options...)` passes keyword arguments on to the saver.
+""" ->
+save(s::@compat(Union{AbstractString,IO}), data...; options...) = 
+    save(query(s), data...; options...)
+
+# Forced format
+function save{sym}(df::Type{DataFormat{sym}}, f::AbstractString, data...; options...)
+    libraries = applicable_savers(df)
+    checked_import(libraries[1])
+    save(File(DataFormat{sym}, f), data...; options...)
+end
+
+function save{sym}(df::Type{DataFormat{sym}}, s::IO, data...; options...)
+    libraries = applicable_savers(df)
+    checked_import(libraries[1])
+    save(Stream(DataFormat{sym}, s), data...; options...)
+end
+
+
+# Fallbacks
+function load{F}(q::Formatted{F}, args...; options...)
+    unknown(q) && throw(UnknownFormat(q))
     libraries   = applicable_loaders(q)
     failures    = Any[]
     for library in libraries
@@ -55,15 +82,8 @@ function load(s::@compat(Union{AbstractString,IO}), args...; options...)
     end
     handle_error(failures)
 end
-
-@doc """
-- `save(filename, data...)` saves the contents of a formatted file,
-trying to infer the format from `filename`.
-- `save(Stream(format"PNG",io), data...)` specifies the format directly, and bypasses inference.
-- `save(f, data...; options...)` passes keyword arguments on to the saver.
-""" ->
-function save(s::@compat(Union{AbstractString,IO}), data...; options...)
-    q           = query(s)
+function save{F}(q::Formatted{F}, data...; options...)
+    unknown(q) && throw(UnknownFormat(q))
     libraries   = applicable_savers(q)
     failures    = Any[]
     for library in libraries
@@ -77,21 +97,3 @@ function save(s::@compat(Union{AbstractString,IO}), data...; options...)
     end
     handle_error(failures)
 end
-
-# Forced format
-function save{sym}(df::Type{DataFormat{sym}}, f::AbstractString, data...; options...)
-    libraries = applicable_savers(df)
-    checked_import(libraries[1])
-    save(File(DataFormat{sym}, f), data...; options...)
-end
-
-function save{sym}(df::Type{DataFormat{sym}}, s::IO, data...; options...)
-    libraries = applicable_savers(df)
-    checked_import(libraries[1])
-    save(Stream(DataFormat{sym}, s), data...; options...)
-end
-
-
-# Fallbacks
-load{F}(f::Formatted{F}, args...; options...) = error("No load function defined for format ", F, " with filename ", filename(f))
-save{F}(f::Formatted{F}, data...; options...) = error("No save function defined for format ", F, " with filename ", filename(f))

test/loadsave.jl

@@ -3,10 +3,13 @@ using FactCheck
 
 # Stub readers---these might bork any existing readers, so don't
 # run these tests while doing other things!
-FileIO.load(file::File{format"PBMText"})   = "PBMText"
-FileIO.load(file::File{format"PBMBinary"}) = "PBMBinary"
-FileIO.load(file::File{format"HDF5"})      = "HDF5"
-FileIO.load(file::File{format"JLD"})       = "JLD"
+module TestLoadSave
+import FileIO: File, @format_str
+load(file::File{format"PBMText"})   = "PBMText"
+load(file::File{format"PBMBinary"}) = "PBMBinary"
+load(file::File{format"HDF5"})      = "HDF5"
+load(file::File{format"JLD"})       = "JLD"
+end
 
 sym2loader = copy(FileIO.sym2loader)
 sym2saver = copy(FileIO.sym2saver)
@@ -16,6 +19,12 @@ try
     empty!(FileIO.sym2saver)
     file_dir = joinpath(dirname(@__FILE__), "files")
     context("Load") do
+        
+        add_loader(format"PBMText", :TestLoadSave)
+        add_loader(format"PBMBinary", :TestLoadSave)
+        add_loader(format"HDF5", :TestLoadSave)
+        add_loader(format"JLD", :TestLoadSave)
+
         @fact load(joinpath(file_dir, "file1.pbm")) --> "PBMText"
         @fact load(joinpath(file_dir, "file2.pbm")) --> "PBMBinary"
         # Regular HDF5 file with magic bytes starting at position 0
@@ -118,30 +127,33 @@ del_format(format"DUMMY")
 
 # PPM/PBM can be either binary or text. Test that the defaults work,
 # and that we can force a choice.
+module AmbigExt
+import FileIO: File, @format_str, Streamm, stream, skipmagic
 
-FileIO.load(f::File{format"AmbigExt1"}) = open(f) do io
+load(f::File{format"AmbigExt1"}) = open(f) do io
     skipmagic(io)
     readall(stream(io))
 end 
-FileIO.load(f::File{format"AmbigExt2"}) = open(f) do io
+load(f::File{format"AmbigExt2"}) = open(f) do io
     skipmagic(io)
     readall(stream(io))
 end
 
-FileIO.save(f::File{format"AmbigExt1"}, testdata) = open(f, "w") do io
+save(f::File{format"AmbigExt1"}, testdata) = open(f, "w") do io
     s = stream(io)
     print(s, "ambigext1")
     print(s, testdata)
 end 
-FileIO.save(f::File{format"AmbigExt2"}, testdata) = open(f, "w") do io
+save(f::File{format"AmbigExt2"}, testdata) = open(f, "w") do io
     s = stream(io)
     print(s, "ambigext2")
     print(s, testdata)
 end
+end
 
 context("Ambiguous extension") do
-    add_format(format"AmbigExt1", "ambigext1", ".aext")
-    add_format(format"AmbigExt2", "ambigext2", ".aext")
+    add_format(format"AmbigExt1", "ambigext1", ".aext", [:AmbigExt])
+    add_format(format"AmbigExt2", "ambigext2", ".aext", [:AmbigExt])
     A = "this is a test"
     fn = string(tempname(), ".aext")
     # Test the forced version first: we wouldn't want some method in Netpbm

test/runtests.jl

@@ -3,7 +3,6 @@ using FactCheck
 facts("FileIO") do
 	include("query.jl")
 	include("loadsave.jl")
-	
 	include("error_handling.jl")
 end