Merge 9d0458e into bfc4fab

README.md

@@ -1,7 +1,7 @@
 [![Build Status](https://travis-ci.org/Arimeka/mediaprobe.svg?branch=master)](https://travis-ci.org/Arimeka/mediaprobe)
 [![Coverage Status](https://coveralls.io/repos/github/Arimeka/mediaprobe/badge.svg?branch=master)](https://coveralls.io/github/Arimeka/mediaprobe?branch=master)
 [![Go Report Card](https://goreportcard.com/badge/github.com/Arimeka/mediaprobe)](https://goreportcard.com/report/github.com/Arimeka/mediaprobe)
-[![GoDoc](https://godoc.org/github.com/Arimeka/mediaprobe?status.svg)](https://godoc.org/github.com/Arimeka/mediaprobe)
+[![GoDoc](https://godoc.org/github.com/Arimeka/mediaprobe?status.svg)](https://pkg.go.dev/github.com/Arimeka/mediaprobe)
 
 # mediaprobe
 

benchmark_test.go

@@ -13,35 +13,35 @@ const (
 
 func BenchmarkParse(b *testing.B) {
 	for i := 0; i < b.N; i++ {
-		mediaprobe.Parse(benchmarkValidVideo)
+		_, _ = mediaprobe.Parse(benchmarkValidVideo)
 	}
 }
 
 func BenchmarkNew(b *testing.B) {
 	for i := 0; i < b.N; i++ {
-		mediaprobe.New(benchmarkValidVideo)
+		_, _ = mediaprobe.New(benchmarkValidVideo)
 	}
 }
 
 func BenchmarkInfo_CalculateMime(b *testing.B) {
 	info, _ := mediaprobe.New(benchmarkValidVideo)
 	for i := 0; i < b.N; i++ {
-		info.CalculateMime()
+		_ = info.CalculateMime()
 	}
 }
 
 func BenchmarkInfo_FFProbe(b *testing.B) {
 	info, _ := mediaprobe.New(benchmarkValidVideo)
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
-		info.FFProbe()
+		_ = info.FFProbe()
 	}
 }
 
 func BenchmarkInfo_ParseImage(b *testing.B) {
 	info, _ := mediaprobe.New(benchmarkValidImage)
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
-		info.FFProbe()
+		_ = info.FFProbe()
 	}
 }

ffprobe_test.go

@@ -15,10 +15,14 @@ var bitrateFiles = map[string]int64{
 }
 
 func TestInfo_FFProbe(t *testing.T) {
+
 	for filename, expectedBitrate := range bitrateFiles {
-		info, _ := mediaprobe.New(filename)
+		info, err := mediaprobe.New(filename)
+		if err != nil {
+			t.Fatalf("Filename: %s. Unexpected error %v", filename, err)
+		}
 
-		err := info.FFProbe()
+		err = info.FFProbe()
 		if err != nil {
 			if filename != "./fixtures/corrupted.mp4" {
 				t.Errorf("Filename: %s. Unexpected error %v", filename, err)
@@ -34,4 +38,29 @@ func TestInfo_FFProbe(t *testing.T) {
 			t.Errorf("Filename: %s. Not expected video bitrate. Expected %d; got %d", filename, expectedBitrate, bitrate)
 		}
 	}
+
+	t.Run("remote_file", ffprobeRemoteFile)
+}
+
+func ffprobeRemoteFile(t *testing.T) {
+	handler := &Handler{
+		Filename: "./fixtures/video.mp4",
+	}
+	srv := ServeHttp(handler)
+	defer srv.Stop()
+
+	info, err := mediaprobe.New(srv.Endpoint())
+	if err != nil {
+		t.Fatalf("Unexpected error %v", err)
+	}
+
+	err = info.FFProbe()
+	if err != nil {
+		t.Errorf("Unexpected error %v", err)
+	}
+
+	bitrate := info.BitRate
+	if bitrate != 551193 {
+		t.Errorf("Not expected video bitrate. Expected %d; got %d", 551193, bitrate)
+	}
 }

http.go

@@ -0,0 +1,31 @@
+package mediaprobe
+
+import (
+	"fmt"
+	"io"
+	"net/http"
+	"net/url"
+	"time"
+)
+
+var httpClient = &http.Client{
+	Timeout: 5 * time.Second,
+}
+
+func getRemoteFile(uri *url.URL) (io.ReadCloser, error) {
+	req := &http.Request{
+		Method: http.MethodGet,
+		URL:    uri,
+	}
+	resp, err := httpClient.Do(req)
+	if err != nil {
+		return nil, err
+	}
+
+	if resp.StatusCode != http.StatusOK {
+		resp.Body.Close()
+		return nil, fmt.Errorf("unexpected status code %d", resp.StatusCode)
+	}
+
+	return resp.Body, nil
+}

http_test.go

@@ -0,0 +1,59 @@
+package mediaprobe_test
+
+import (
+	"net/http"
+	"net/http/httptest"
+	"sync"
+	"sync/atomic"
+	"time"
+)
+
+type Server struct {
+	srv *httptest.Server
+}
+
+func (s *Server) Stop() {
+	s.srv.Close()
+}
+
+func (s *Server) Endpoint() string {
+	return s.srv.URL
+}
+
+func ServeHttp(handler *Handler) *Server {
+	httptest.NewServer(handler)
+
+	srv := httptest.NewServer(handler)
+	time.Sleep(100 * time.Millisecond)
+
+	return &Server{srv: srv}
+}
+
+type Handler struct {
+	Status   int
+	Filename string
+
+	FailOnAttempt uint64
+	Counter       uint64
+	mu            sync.RWMutex
+}
+
+func (h *Handler) ServeHTTP(rw http.ResponseWriter, req *http.Request) {
+	if h.Status != 0 {
+		rw.WriteHeader(h.Status)
+		return
+	}
+	if h.FailOnAttempt > 0 {
+		h.mu.RLock()
+		counter := h.Counter
+		h.mu.RUnlock()
+		if counter >= h.FailOnAttempt {
+			rw.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+
+		atomic.AddUint64(&h.Counter, 1)
+	}
+
+	http.ServeFile(rw, req, h.Filename)
+}

image.go

@@ -4,7 +4,6 @@ import (
 	"image"
 	"io"
 	"os"
-
 	// Expanding image package
 	_ "golang.org/x/image/bmp"
 	_ "golang.org/x/image/tiff"
@@ -18,33 +17,65 @@ import (
 
 // ParseImage used for retrieve image data
 func (info *Info) ParseImage() error {
-	file, err := os.Open(info.filename)
+	if info.data == nil {
+		file, err := os.Open(info.filename)
+		if err != nil {
+			return err
+		}
+		defer file.Close()
+		if err := info.decodeImage(file); err != nil {
+			return err
+		}
+		_, err = file.Seek(0, io.SeekStart)
+		if err != nil {
+			return err
+		}
+		info.decodeExif(file)
+
+		return nil
+	}
+
+	body, err := getRemoteFile(info.uri)
+	if err != nil {
+		return err
+	}
+	err = info.decodeImage(body)
+	body.Close()
 	if err != nil {
 		return err
 	}
-	defer file.Close()
 
-	img, _, err := image.DecodeConfig(file)
+	body, err = getRemoteFile(info.uri)
 	if err != nil {
 		return err
 	}
-	_, err = file.Seek(0, io.SeekStart)
+	info.decodeExif(body)
+	body.Close()
+
+	return nil
+}
+
+func (info *Info) decodeImage(reader io.Reader) error {
+	img, _, err := image.DecodeConfig(reader)
 	if err != nil {
 		return err
 	}
 
 	info.Width = img.Width
 	info.Height = img.Height
 
-	if x, err := exif.Decode(file); err == nil {
+	return nil
+}
+
+func (info *Info) decodeExif(reader io.Reader) {
+	if x, err := exif.Decode(reader); err == nil {
 		if orientationTag, err := x.Get(exif.Orientation); err == nil {
 			switch orientationTag.String() {
 			case "5", "6", "7", "8":
-				info.Width = img.Height
-				info.Height = img.Width
+				w, h := info.Width, info.Height
+				info.Width = h
+				info.Height = w
 			}
 		}
 	}
-
-	return nil
 }