From a1dcf58b5248a95377100a535eb7d20f708cf6a0 Mon Sep 17 00:00:00 2001 From: Jelmer Snoeck Date: Wed, 26 Aug 2015 19:43:02 +0100 Subject: Httpimg: rename package. --- contrib/fhttp/fhttp.go | 32 ------------------------------ contrib/fhttp/fhttp_test.go | 43 ----------------------------------------- contrib/fhttp/pdf/.gitignore | 1 - contrib/fhttp/pdf/.gitkeep | 0 contrib/httpimg/httpimg.go | 32 ++++++++++++++++++++++++++++++ contrib/httpimg/httpimg_test.go | 43 +++++++++++++++++++++++++++++++++++++++++ contrib/httpimg/pdf/.gitignore | 1 + contrib/httpimg/pdf/.gitkeep | 0 8 files changed, 76 insertions(+), 76 deletions(-) delete mode 100644 contrib/fhttp/fhttp.go delete mode 100644 contrib/fhttp/fhttp_test.go delete mode 100644 contrib/fhttp/pdf/.gitignore delete mode 100644 contrib/fhttp/pdf/.gitkeep create mode 100644 contrib/httpimg/httpimg.go create mode 100644 contrib/httpimg/httpimg_test.go create mode 100644 contrib/httpimg/pdf/.gitignore create mode 100644 contrib/httpimg/pdf/.gitkeep (limited to 'contrib') diff --git a/contrib/fhttp/fhttp.go b/contrib/fhttp/fhttp.go deleted file mode 100644 index 8887fbc..0000000 --- a/contrib/fhttp/fhttp.go +++ /dev/null @@ -1,32 +0,0 @@ -package fhttp - -import ( - "github.com/jung-kurt/gofpdf" - "net/http" -) - -// RegisterHttpImage registers a HTTP image. Downloading the image from the -// provided URL and adding it to the PDF but not adding it to the page. Use -// Image() with the same URL to add the image to the page. -func RegisterHttpImage(f *gofpdf.Fpdf, urlStr, tp string) (info *gofpdf.ImageInfoType) { - info = f.GetImageInfo(urlStr) - - if info != nil { - return - } - - resp, err := http.Get(urlStr) - - if err != nil { - f.SetError(err) - return - } - - defer resp.Body.Close() - - if tp == "" { - tp = f.ImageTypeFromMime(resp.Header["Content-Type"][0]) - } - - return f.RegisterImageReader(urlStr, tp, resp.Body) -} diff --git a/contrib/fhttp/fhttp_test.go b/contrib/fhttp/fhttp_test.go deleted file mode 100644 index e09328a..0000000 --- a/contrib/fhttp/fhttp_test.go +++ /dev/null @@ -1,43 +0,0 @@ -package fhttp_test - -import ( - "fmt" - "github.com/jung-kurt/gofpdf" - "github.com/jung-kurt/gofpdf/contrib/fhttp" - "path/filepath" -) - -const ( - cnGofpdfDir = "./" - cnExampleDir = cnGofpdfDir + "/pdf" -) - -func exampleFilename(baseStr string) string { - return filepath.Join(cnExampleDir, baseStr+".pdf") -} - -func summary(err error, fileStr string) { - if err == nil { - fileStr = filepath.ToSlash(fileStr) - fmt.Printf("Successfully generated %s\n", fileStr) - } else { - fmt.Println(err) - } -} - -func ExampleFpdf_AddHttpImage() { - pdf := gofpdf.New("", "", "", "") - pdf.SetFont("Helvetica", "", 12) - pdf.SetFillColor(200, 200, 220) - pdf.AddPage() - - url := "https://github.com/jung-kurt/gofpdf/raw/master/image/logo_gofpdf.jpg?raw=true" - fhttp.RegisterHttpImage(pdf, url, "") - pdf.Image(url, 100, 100, 20, 20, false, "", 0, "") - - fileStr := exampleFilename("Fpdf_AddHttpImage") - err := pdf.OutputFileAndClose(fileStr) - summary(err, fileStr) - // Output: - // Successfully generated pdf/Fpdf_AddHttpImage.pdf -} diff --git a/contrib/fhttp/pdf/.gitignore b/contrib/fhttp/pdf/.gitignore deleted file mode 100644 index a136337..0000000 --- a/contrib/fhttp/pdf/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.pdf diff --git a/contrib/fhttp/pdf/.gitkeep b/contrib/fhttp/pdf/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/contrib/httpimg/httpimg.go b/contrib/httpimg/httpimg.go new file mode 100644 index 0000000..6025469 --- /dev/null +++ b/contrib/httpimg/httpimg.go @@ -0,0 +1,32 @@ +package httpimg + +import ( + "github.com/jung-kurt/gofpdf" + "net/http" +) + +// RegisterHttpImage registers a HTTP image. Downloading the image from the +// provided URL and adding it to the PDF but not adding it to the page. Use +// Image() with the same URL to add the image to the page. +func RegisterHttpImage(f *gofpdf.Fpdf, urlStr, tp string) (info *gofpdf.ImageInfoType) { + info = f.GetImageInfo(urlStr) + + if info != nil { + return + } + + resp, err := http.Get(urlStr) + + if err != nil { + f.SetError(err) + return + } + + defer resp.Body.Close() + + if tp == "" { + tp = f.ImageTypeFromMime(resp.Header["Content-Type"][0]) + } + + return f.RegisterImageReader(urlStr, tp, resp.Body) +} diff --git a/contrib/httpimg/httpimg_test.go b/contrib/httpimg/httpimg_test.go new file mode 100644 index 0000000..d1b97bb --- /dev/null +++ b/contrib/httpimg/httpimg_test.go @@ -0,0 +1,43 @@ +package httpimg_test + +import ( + "fmt" + "github.com/jung-kurt/gofpdf" + "github.com/jung-kurt/gofpdf/contrib/httpimg" + "path/filepath" +) + +const ( + cnGofpdfDir = "./" + cnExampleDir = cnGofpdfDir + "/pdf" +) + +func exampleFilename(baseStr string) string { + return filepath.Join(cnExampleDir, baseStr+".pdf") +} + +func summary(err error, fileStr string) { + if err == nil { + fileStr = filepath.ToSlash(fileStr) + fmt.Printf("Successfully generated %s\n", fileStr) + } else { + fmt.Println(err) + } +} + +func ExampleFpdf_AddHttpImage() { + pdf := gofpdf.New("", "", "", "") + pdf.SetFont("Helvetica", "", 12) + pdf.SetFillColor(200, 200, 220) + pdf.AddPage() + + url := "https://github.com/jung-kurt/gofpdf/raw/master/image/logo_gofpdf.jpg?raw=true" + httpimg.RegisterHttpImage(pdf, url, "") + pdf.Image(url, 100, 100, 20, 20, false, "", 0, "") + + fileStr := exampleFilename("Fpdf_AddHttpImage") + err := pdf.OutputFileAndClose(fileStr) + summary(err, fileStr) + // Output: + // Successfully generated pdf/Fpdf_AddHttpImage.pdf +} diff --git a/contrib/httpimg/pdf/.gitignore b/contrib/httpimg/pdf/.gitignore new file mode 100644 index 0000000..a136337 --- /dev/null +++ b/contrib/httpimg/pdf/.gitignore @@ -0,0 +1 @@ +*.pdf diff --git a/contrib/httpimg/pdf/.gitkeep b/contrib/httpimg/pdf/.gitkeep new file mode 100644 index 0000000..e69de29 -- cgit v1.2.1-24-ge1ad