fix problems with mime write (#136)

* fix problems with mime write

* fix not installed error

Author: SimonDanisch

src/loadsave.jl

@@ -9,8 +9,10 @@ function is_installed(pkg::Symbol)
 end
 
 function checked_import(pkg::Symbol)
-    !is_installed(pkg)      && throw(NotInstalledError(pkg, ""))
-    !isdefined(Main, pkg)   && eval(Main, Expr(:import, pkg))
+    isdefined(Main, pkg) && return getfield(Main, pkg)
+    isdefined(FileIO, pkg) && return getfield(FileIO, pkg)
+    !is_installed(pkg) && throw(NotInstalledError(pkg, ""))
+    !isdefined(Main, pkg) && eval(Main, Expr(:import, pkg))
     return getfield(Main, pkg)
 end
 

src/mimesave.jl

@@ -1,4 +1,8 @@
-function FileIO.save(file::File{format"PNG"}, data)
+module MimeWriter
+
+using ..FileIO: File, @format_str
+
+function save(file::File{format"PNG"}, data)
     if mimewritable("image/png", data)
         open(file.filename, "w") do s
             show(IOContext(s, :full_fidelity=>true), "image/png", data)
@@ -8,7 +12,7 @@ function FileIO.save(file::File{format"PNG"}, data)
     end
 end
 
-function FileIO.save(file::File{format"SVG"}, data)
+function save(file::File{format"SVG"}, data)
     if mimewritable("image/svg+xml", data)
         open(file.filename, "w") do s
             show(IOContext(s, :full_fidelity=>true), "image/svg+xml", data)
@@ -18,7 +22,7 @@ function FileIO.save(file::File{format"SVG"}, data)
     end
 end
 
-function FileIO.save(file::File{format"PDF"}, data)
+function save(file::File{format"PDF"}, data)
     if mimewritable("application/pdf", data)
         open(file.filename, "w") do s
             show(IOContext(s, :full_fidelity=>true), "application/pdf", data)
@@ -28,7 +32,7 @@ function FileIO.save(file::File{format"PDF"}, data)
     end
 end
 
-function FileIO.save(file::File{format"EPS"}, data)
+function save(file::File{format"EPS"}, data)
     if mimewritable("application/eps", data)
         open(file.filename, "w") do s
             show(IOContext(s, :full_fidelity=>true), "application/eps", data)
@@ -37,3 +41,5 @@ function FileIO.save(file::File{format"EPS"}, data)
         throw(ArgumentError("Argument does not support conversion to eps."))
     end
 end
+
+end

src/registry.jl

@@ -43,13 +43,13 @@ add_format(format"CRW", UInt8[0x49,0x49,0x1a,0x00,0x00,0x00,0x48,0x45], ".crw",
 add_format(format"CUR", UInt8[0x00,0x00,0x02,0x00],                     ".cur", [:ImageMagick])
 add_format(format"DCX", UInt8[0xb1,0x68,0xde,0x3a],                     ".dcx", [:ImageMagick])
 add_format(format"DOT", UInt8[0xd0,0xcf,0x11,0xe0,0xa1,0xb1,0x1a,0xe1], ".dot", [:ImageMagick])
-add_format(format"EPS", UInt8[0x25,0x21,0x50,0x53,0x2d,0x41,0x64,0x6f], ".eps", [:ImageMagick], [:FileIO, SAVE])
+add_format(format"EPS", UInt8[0x25,0x21,0x50,0x53,0x2d,0x41,0x64,0x6f], ".eps", [:ImageMagick], [:MimeWriter, SAVE])
 add_format(format"HDR", UInt8[0x23,0x3f,0x52,0x41,0x44,0x49,0x41,0x4e], ".hdr", [:ImageMagick])
 add_format(format"ICO", UInt8[0x00,0x00,0x01,0x00],                     ".ico", [:ImageMagick])
 add_format(format"INFO", UInt8[0x7a,0x62,0x65,0x78],                    ".info",[:ImageMagick])
 add_format(format"JP2", UInt8[0x00,0x00,0x00,0x0c,0x6a,0x50,0x20,0x20], ".jp2", [:ImageMagick])
 add_format(format"PDB", UInt8[0x73,0x7a,0x65,0x7a],                     ".pdb", [:ImageMagick])
-add_format(format"PDF", UInt8[0x25,0x50,0x44,0x46],                     ".pdf", [:ImageMagick], [:FileIO, SAVE])
+add_format(format"PDF", UInt8[0x25,0x50,0x44,0x46],                     ".pdf", [:ImageMagick], [:MimeWriter, SAVE])
 add_format(format"PGM", UInt8[0x50,0x35,0x0a],                          ".pgm", [:ImageMagick])
 add_format(format"PSD", UInt8[0x38,0x42,0x50,0x53],                     ".psd", [:ImageMagick])
 add_format(format"RGB", UInt8[0x01,0xda,0x01,0x01,0x00,0x03],           ".rgb", [:ImageMagick])
@@ -77,7 +77,7 @@ add_format(
     ".png",
     [:QuartzImageIO, OSX],
     [:ImageMagick],
-    [:FileIO, SAVE]
+    [:MimeWriter, SAVE]
 )
 add_format(
     format"TIFF",
@@ -110,7 +110,7 @@ add_format(
     format"SVG",
     (),
     ".svg",
-    [:FileIO, SAVE]
+    [:MimeWriter, SAVE]
 )
 
 #=