Migrate to bimg & remove exif dependency

cmd/server/server.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/davidbyttow/govips/v2/vips"
+	"github.com/h2non/bimg"
 	log "github.com/sirupsen/logrus"
 
 	"reichard.io/imagini/internal/api"
@@ -45,8 +45,8 @@ func (s *Server) StartServer() {
 	}
 
 	go func() {
-		vips.Startup(nil)
+		bimg.VipsCacheSetMax(0)
-		defer vips.Shutdown()
+		bimg.VipsCacheSetMaxMem(0)
 
 		err := s.httpServer.ListenAndServe()
 		if err != nil {

go.mod

@@ -4,10 +4,9 @@ go 1.15
 
 require (
 	github.com/99designs/gqlgen v0.13.0
-	github.com/davidbyttow/govips/v2 v2.5.0
-	github.com/dsoprea/go-exif/v3 v3.0.0-20201216222538-db167117f483
 	github.com/gabriel-vasile/mimetype v1.1.2
 	github.com/google/uuid v1.1.5
+	github.com/h2non/bimg v1.1.5
 	github.com/iancoleman/strcase v0.1.3
 	github.com/lestrrat-go/jwx v1.0.8
 	github.com/sirupsen/logrus v1.7.0

go.sum

@@ -13,47 +13,29 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:ma
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davidbyttow/govips/v2 v2.5.0 h1:CLSVkXwZYfF7bOR5bZwlUFL1TIWXwyuNF33UrlKscM4=
-github.com/davidbyttow/govips/v2 v2.5.0/go.mod h1:goq38QD8XEMz2aWEeucEZqRxAWsemIN40vbUqfPfTAw=
 github.com/dgryski/trifles v0.0.0-20190318185328-a8d75aae118c h1:TUuUh0Xgj97tLMNtWtNvI9mIV6isjEb9lBMNv+77IGM=
 github.com/dgryski/trifles v0.0.0-20190318185328-a8d75aae118c/go.mod h1:if7Fbed8SFyPtHLHbg49SI7NAdJiC5WIA09pe59rfAA=
-github.com/dsoprea/go-exif/v2 v2.0.0-20200321225314-640175a69fe4/go.mod h1:Lm2lMM2zx8p4a34ZemkaUV95AnMl4ZvLbCUbwOvLC2E=
-github.com/dsoprea/go-exif/v3 v3.0.0-20200717053412-08f1b6708903/go.mod h1:0nsO1ce0mh5czxGeLo4+OCZ/C6Eo6ZlMWsz7rH/Gxv8=
-github.com/dsoprea/go-exif/v3 v3.0.0-20201216222538-db167117f483 h1:rz9dPf+Unge2D5RNIRNFvCc2OrGfhAPuxx4L6412jdI=
-github.com/dsoprea/go-exif/v3 v3.0.0-20201216222538-db167117f483/go.mod h1:cg5SNYKHMmzxsr9X6ZeLh/nfBRHHp5PngtEPcujONtk=
-github.com/dsoprea/go-logging v0.0.0-20190624164917-c4f10aab7696/go.mod h1:Nm/x2ZUNRW6Fe5C3LxdY1PyZY5wmDv/s5dkPJ/VB3iA=
-github.com/dsoprea/go-logging v0.0.0-20200517223158-a10564966e9d h1:F/7L5wr/fP/SKeO5HuMlNEX9Ipyx2MbH2rV9G4zJRpk=
-github.com/dsoprea/go-logging v0.0.0-20200517223158-a10564966e9d/go.mod h1:7I+3Pe2o/YSU88W0hWlm9S22W7XI1JFNJ86U0zPKMf8=
-github.com/dsoprea/go-utility v0.0.0-20200711062821-fab8125e9bdf h1:/w4QxepU4AHh3AuO6/g8y/YIIHH5+aKP3Bj8sg5cqhU=
-github.com/dsoprea/go-utility v0.0.0-20200711062821-fab8125e9bdf/go.mod h1:95+K3z2L0mqsVYd6yveIv1lmtT3tcQQ3dVakPySffW8=
-github.com/dsoprea/go-utility/v2 v2.0.0-20200717064901-2fccff4aa15e h1:IxIbA7VbCNrwumIYjDoMOdf4KOSkMC6NJE4s8oRbE7E=
-github.com/dsoprea/go-utility/v2 v2.0.0-20200717064901-2fccff4aa15e/go.mod h1:uAzdkPTub5Y9yQwXe8W4m2XuP0tK4a9Q/dantD0+uaU=
 github.com/gabriel-vasile/mimetype v1.1.2 h1:gaPnPcNor5aZSVCJVSGipcpbgMWiAAj9z182ocSGbHU=
 github.com/gabriel-vasile/mimetype v1.1.2/go.mod h1:6CDPel/o/3/s4+bp6kIbsWATq8pmgOisOPG40CJa6To=
 github.com/go-chi/chi v3.3.2+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ=
-github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
-github.com/go-errors/errors v1.0.2/go.mod h1:psDX2osz5VnTOnFWbDeWwS7yejl+uV3FEWEp4lssFEs=
-github.com/go-errors/errors v1.1.1 h1:ljK/pL5ltg3qoN+OtN6yCv9HWSfMwxSx90GJCZQxYNg=
-github.com/go-errors/errors v1.1.1/go.mod h1:psDX2osz5VnTOnFWbDeWwS7yejl+uV3FEWEp4lssFEs=
 github.com/gogo/protobuf v1.0.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
-github.com/golang/geo v0.0.0-20190916061304-5b978397cfec/go.mod h1:QZ0nwyI2jOfgRAoBvP+ab5aRr7c9x7lhGEJrKvBwjWI=
-github.com/golang/geo v0.0.0-20200319012246-673a6f80352d h1:C/hKUcHT483btRbeGkrRjJz+Zbcj8audldIi9tRJDCc=
-github.com/golang/geo v0.0.0-20200319012246-673a6f80352d/go.mod h1:QZ0nwyI2jOfgRAoBvP+ab5aRr7c9x7lhGEJrKvBwjWI=
 github.com/google/uuid v1.1.5 h1:kxhtnfFVi+rYdOALN0B3k9UT86zVJKfBimRaciULW4I=
 github.com/google/uuid v1.1.5/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/context v0.0.0-20160226214623-1ea25387ff6f/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
 github.com/gorilla/mux v1.6.1/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/h2non/bimg v1.1.5 h1:o3xsUBxM8s7+e7PmpiWIkEYdeYayJ94eh4cJLx67m1k=
+github.com/h2non/bimg v1.1.5/go.mod h1:R3+UiYwkK4rQl6KVFTOFJHitgLbZXBZNFh2cv3AEbp8=
 github.com/hashicorp/golang-lru v0.5.0 h1:CL2msUPvZTLb5O648aiLNJw3hnBxN2+1Jq8rCOH9wdo=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/iancoleman/strcase v0.1.3 h1:dJBk1m2/qjL1twPLf68JND55vvivMupZ4wIzE8CTdBw=
 github.com/iancoleman/strcase v0.1.3/go.mod h1:SK73tn/9oHe+/Y0h39VT4UCxmurVJkR5NA7kMEAOgSE=
-github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
 github.com/jinzhu/now v1.1.1 h1:g39TucaRWyV3dwDO++eEc6qf8TVIQ/Da48WmqjZ3i7E=
 github.com/jinzhu/now v1.1.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
+github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
@@ -80,8 +62,6 @@ github.com/mattn/go-sqlite3 v1.14.5 h1:1IdxlwTNazvbKJQSxoJ5/9ECbEeaTTyeU7sEAZ5KK
 github.com/mattn/go-sqlite3 v1.14.5/go.mod h1:WVKg1VTActs4Qso6iwGbiFih2UIHo0ENGwNd0Lj+XmI=
 github.com/mitchellh/mapstructure v0.0.0-20180203102830-a4e142e9c047 h1:zCoDWFD5nrJJVjbXiDZcVhOBSzKn3o9LgRLLMRNuru8=
 github.com/mitchellh/mapstructure v0.0.0-20180203102830-a4e142e9c047/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
-github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74=
 github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -118,26 +98,16 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201217014255-9d1352758620/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
 golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad h1:DN0cp81fZ3njFcrLCytUHRSUkqBjfTo4Tx9RJTWs0EY=
 golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
-golang.org/x/image v0.0.0-20200927104501-e162460cd6b5 h1:QelT11PB4FXiDEXucrfNckHoFxwt8USGY1ajP1ZF5lM=
-golang.org/x/image v0.0.0-20200927104501-e162460cd6b5/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/mod v0.2.0 h1:KU7oHjnv3XNWfa5COkzUifxZmxp1TyI7ImMXqFxLwvQ=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200320220750-118fecf932d8/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200513185701-a91f0712d120 h1:EZ3cVSzKOlJxAd8e8YAJ7no8nNypTxexh/YE/xW3ZEY=
-golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20201031054903-ff519b6c9102 h1:42cLlJJdEh+ySyeUUbEQ5bsTiq8voBeTuweGVkY6Puw=
-golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -145,17 +115,10 @@ golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037 h1:YyJpGZS1sBuBCzLAR1VEpK193GlqGZbnPFnPV/5Rsb4=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200116001909-b77594299b42 h1:vEOn+mP2zCOVzKckCZy6YsCtDblrpj/w7B9nxGNELpg=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd h1:xhmwyvizuTgC2qz7ZlMluP20uW+C3Rm0FD/WLDX8884=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f h1:+Nyd8tzPX9R7BWHguqsrbFdRx3WQ/1ib8I44HXV5yTA=
-golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.4 h1:0YWbFKbhXG/wIiuHDSKpS0Iy7FSA+u45VtBMfQcFTTc=
-golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190125232054-d66bd3c5d5a6/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190515012406-7d7faa4812bd/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
@@ -167,15 +130,12 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8T
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b h1:QRR6H1YWRnHb4Y/HeNFCTJLFVxaq6wH4YuVdsUOr75U=
-gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
-gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gorm.io/driver/sqlite v1.1.4 h1:PDzwYE+sI6De2+mxAneV9Xs11+ZyKV6oxD3wDGkaNvM=

graph/helpers.go

@@ -4,12 +4,13 @@ import (
 	"context"
 	"errors"
 	"net/http"
+	"strconv"
 	"strings"
 	"time"
 
-	"github.com/dsoprea/go-exif/v3"
-	exifcommon "github.com/dsoprea/go-exif/v3/common"
 	"github.com/google/uuid"
+	"github.com/h2non/bimg"
+	log "github.com/sirupsen/logrus"
 	"reichard.io/imagini/graph/model"
 )
 
@@ -76,50 +77,50 @@ func deriveDeviceType(r *http.Request) model.DeviceType {
 	return model.DeviceTypeUnknown
 }
 
-func mediaItemFromEXIFData(filePath string) (*model.MediaItem, error) {
+func mediaItemFromEXIF(meta bimg.EXIF) *model.MediaItem {
-	rawExif, err := exif.SearchFileAndExtractExif(filePath)
-	entries, _, err := exif.GetFlatExifData(rawExif, nil)
-
-	decLong := float64(1)
-	decLat := float64(1)
-
 	mediaItem := &model.MediaItem{}
-	for _, v := range entries {
+
-		if v.TagName == "DateTimeOriginal" {
+	// DateTimeOriginal
-			formattedTime, _ := time.Parse("2006:01:02 15:04:05", v.Formatted)
+	formattedTime, _ := time.Parse("2006:01:02 15:04:05", meta.DateTimeOriginal)
 	mediaItem.ExifDate = &formattedTime
-		} else if v.TagName == "GPSLatitude" {
+
-			latStruct := v.Value.([]exifcommon.Rational)
+	// GPSLatitude / Ref
-			decLat *= deriveDecimalCoordinate(
+	mediaItem.Latitude = deriveDecimalCoordinate(meta.GPSLatitude, meta.GPSLatitudeRef)
-				latStruct[0].Numerator/latStruct[0].Denominator,
+
-				latStruct[1].Numerator/latStruct[1].Denominator,
+	// GPSLongitude / Ref
-				float64(latStruct[2].Numerator)/float64(latStruct[2].Denominator),
+	mediaItem.Longitude = deriveDecimalCoordinate(meta.GPSLongitude, meta.GPSLongitudeRef)
-			)
+
-		} else if v.TagName == "GPSLongitude" {
+	return mediaItem
-			longStruct := v.Value.([]exifcommon.Rational)
-			decLong *= deriveDecimalCoordinate(
-				longStruct[0].Numerator/longStruct[0].Denominator,
-				longStruct[1].Numerator/longStruct[1].Denominator,
-				float64(longStruct[2].Numerator)/float64(longStruct[2].Denominator),
-			)
-		} else if v.TagName == "GPSLatitudeRef" && v.Formatted == "S" {
-			decLat *= -1
-		} else if v.TagName == "GPSLongitudeRef" && v.Formatted == "W" {
-			decLong *= -1
-		}
 }
 
-	mediaItem.Latitude = &decLat
+func deriveDecimalCoordinate(coords, direction string) *float64 {
-	mediaItem.Longitude = &decLong
+	divideBy := [3]float64{1, 60, 3600}
+	var calculatedResult float64
 
-	// Gross
+	splitCoords := strings.Split(coords, " ")
-	if err != nil && err.Error() == "no exif data" {
+	if len(splitCoords) != 3 {
-		return mediaItem, nil
+		return nil
 	}
 
-	return mediaItem, err
+	for i := 0; i < len(splitCoords); i++ {
+		splitSection := strings.Split(splitCoords[i], "/")
+		numerator, err := strconv.ParseFloat(splitSection[0], 64)
+		if err != nil {
+			return nil
+		}
+		denominator, err := strconv.ParseFloat(splitSection[1], 64)
+		if err != nil {
+			return nil
+		}
+		calculatedResult += numerator / denominator / divideBy[i]
 	}
 
-func deriveDecimalCoordinate(degrees, minutes uint32, seconds float64) float64 {
+	if direction == "S" {
-	return float64(degrees) + (float64(minutes) / 60) + (seconds / 3600)
+		calculatedResult *= -1
+	} else if direction == "W" {
+		calculatedResult *= -1
+	}
+
+	log.Info(calculatedResult)
+	return &calculatedResult
 }

graph/schema.resolvers.go

@@ -8,15 +8,16 @@ import (
 	"context"
 	"errors"
 	"io"
+	"io/ioutil"
 	"net/http"
 	"os"
 	"path"
 	"strings"
 	"time"
 
-	"github.com/davidbyttow/govips/v2/vips"
 	"github.com/gabriel-vasile/mimetype"
 	"github.com/google/uuid"
+	"github.com/h2non/bimg"
 	log "github.com/sirupsen/logrus"
 	"reichard.io/imagini/graph/generated"
 	"reichard.io/imagini/graph/model"
@@ -79,25 +80,36 @@ func (r *mutationResolver) CreateMediaItem(ctx context.Context, input model.NewM
 		return nil, errors.New("Upload Failed")
 	}
 
-	// Create MediaItem From EXIF Data
+	// Load Image
-	mediaItem, err := mediaItemFromEXIFData(filePath)
+	f.Seek(0, io.SeekStart)
+	buffer, err := ioutil.ReadAll(f)
+	newImage := bimg.NewImage(buffer)
+
+	// Create MediaItem from EXIF
+	meta, err := newImage.Metadata()
 	if err != nil {
-		log.Error("[upload] Unable to extract EXIF data:", err)
+		log.Error("[upload] Unable to extract metadata:", err)
 		return nil, errors.New("Upload Failed")
 	}
+	mediaItem := mediaItemFromEXIF(meta.EXIF)
 
-	// Use Vips for Width & Height
+	// Determine Image Size
-	f.Seek(0, io.SeekStart)
+	imageSize, err := newImage.Size()
-	image, err := vips.NewImageFromReader(f)
 	if err != nil {
 		log.Error("[upload] Unable to extract dimension data:", err)
 		return nil, errors.New("Upload Failed")
 	}
 
+	if meta.Orientation > 4 {
+		mediaItem.Width = imageSize.Height
+		mediaItem.Height = imageSize.Width
+	} else {
+		mediaItem.Width = imageSize.Width
+		mediaItem.Height = imageSize.Height
+	}
+
 	// Add Additional MediaItem Fields
 	mediaItem.ID = mediaItemID
-	mediaItem.Width = image.Width()
-	mediaItem.Height = image.Height()
 	mediaItem.UserID = userID
 	mediaItem.IsVideo = isVideo
 	mediaItem.FileName = fileName

internal/api/media.go

@@ -3,14 +3,13 @@ package api
 import (
 	"bytes"
 	"errors"
-	"io/ioutil"
 	"net/http"
 	"os"
 	"path"
 	"strconv"
 	"time"
 
-	"github.com/davidbyttow/govips/v2/vips"
+	"github.com/h2non/bimg"
 	log "github.com/sirupsen/logrus"
 	"reichard.io/imagini/graph/model"
 )
@@ -50,7 +49,8 @@ func (api *API) mediaHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	mediaFile, err := resizeAndConvertImage(mediaPath, width)
+	mediaFile, err := resizeAndConvertImageBIMG(mediaPath, width)
+	//mediaFile, err := resizeAndConvertImage(mediaPath, width)
 	if err != nil {
 		log.Warn("[media] Image conversion failed:", err)
 		w.WriteHeader(http.StatusInternalServerError)
@@ -62,42 +62,37 @@ func (api *API) mediaHandler(w http.ResponseWriter, r *http.Request) {
 	http.ServeContent(w, r, fileName, time.Time{}, bytes.NewReader(mediaFile))
 }
 
-func resizeAndConvertImage(path string, desiredWidth int) ([]byte, error) {
+func resizeAndConvertImageBIMG(path string, desiredWidth int) ([]byte, error) {
-	inputImage, err := vips.NewImageFromFile(path)
+	buffer, err := bimg.Read(path)
 	if err != nil {
 		return nil, errors.New("[media] Unable to read image")
 	}
+	inputImage := bimg.NewImage(buffer)
 
-	// If we're viewing full image, we want full quality
+	// Return RAW
-	desiredQuality := 100
+	if inputImage.Type() == "jpeg" && desiredWidth == 0 {
-
+		return buffer, nil
-	// Do we need to scale?
-	if desiredWidth != 0 && inputImage.Width() > desiredWidth {
-		desiredQuality = 50
-		desiredScale := float64(desiredWidth) / float64(inputImage.Width())
-		err := inputImage.Resize(desiredScale, vips.KernelLanczos3)
-		if err != nil {
-			return nil, errors.New("[media] Unable to resize")
-		}
-	} else if inputImage.Format() == vips.ImageTypeJPEG {
-		// Return raw file
-		return ioutil.ReadFile(path)
 	}
 
-	// Return non-converted but scaled image
+	imageSize, err := inputImage.Size()
-	if inputImage.Format() == vips.ImageTypeJPEG {
+
-		imageBytes, _, err := inputImage.ExportNative()
+	options := bimg.Options{
-		return imageBytes, err
+		Quality: 100,
+		// NoAutoRotate: true,
+		Background: bimg.Color{R: 255, G: 255, B: 255},
 	}
 
-	// Convert Alpha Channel to White (if applicable)
+	// Set dimensions
-	if inputImage.HasAlpha() {
+	if desiredWidth != 0 && imageSize.Width > desiredWidth {
-		inputImage.Flatten(&vips.Color{R: 255, G: 255, B: 255})
+		options.Width = desiredWidth
+		options.Quality = 50
 	}
 
-	// Convert
+	// Convert to JPEG
-	ep := vips.NewJpegExportParams()
+	if inputImage.Type() != "jpeg" {
-	ep.Quality = desiredQuality
+		options.Type = bimg.JPEG
-	imageBytes, _, err := inputImage.ExportJpeg(ep)
+	}
-	return imageBytes, err
+
+	// Process image
+	return inputImage.Process(options)
 }