From a8e18c945a8dfeace8a82840ceb8013854934328 Mon Sep 17 00:00:00 2001 From: Ishank Arora Date: Wed, 11 Aug 2021 12:14:32 +0200 Subject: [PATCH] Use a different pkg to determine mime types --- go.mod | 1 + go.sum | 2 ++ pkg/app/provider/wopi/wopi.go | 3 +++ pkg/mime/mime.go | 3 ++- 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index bf7356f29c3..5843edee1d7 100644 --- a/go.mod +++ b/go.mod @@ -18,6 +18,7 @@ require ( github.com/coreos/go-oidc v2.2.1+incompatible github.com/cs3org/cato v0.0.0-20200828125504-e418fc54dd5e github.com/cs3org/go-cs3apis v0.0.0-20210802070913-970eec344e59 + github.com/cubewise-code/go-mime v0.0.0-20200519001935-8c5762b177d8 // indirect github.com/eventials/go-tus v0.0.0-20200718001131-45c7ec8f5d59 github.com/gdexlab/go-render v1.0.1 github.com/go-ldap/ldap/v3 v3.3.0 diff --git a/go.sum b/go.sum index c730a09aa00..47f173abb0a 100644 --- a/go.sum +++ b/go.sum @@ -108,6 +108,8 @@ github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7Do github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/cs3org/cato v0.0.0-20200828125504-e418fc54dd5e h1:tqSPWQeueWTKnJVMJffz4pz0o1WuQxJ28+5x5JgaHD8= github.com/cs3org/cato v0.0.0-20200828125504-e418fc54dd5e/go.mod h1:XJEZ3/EQuI3BXTp/6DUzFr850vlxq11I6satRtz0YQ4= +github.com/cubewise-code/go-mime v0.0.0-20200519001935-8c5762b177d8 h1:Z9lwXumT5ACSmJ7WGnFl+OMLLjpz5uR2fyz7dC255FI= +github.com/cubewise-code/go-mime v0.0.0-20200519001935-8c5762b177d8/go.mod h1:4abs/jPXcmJzYoYGF91JF9Uq9s/KL5n1jvFDix8KcqY= 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= diff --git a/pkg/app/provider/wopi/wopi.go b/pkg/app/provider/wopi/wopi.go index 8511df2474d..96c0387c522 100644 --- a/pkg/app/provider/wopi/wopi.go +++ b/pkg/app/provider/wopi/wopi.go @@ -355,6 +355,9 @@ func parseWopiDiscovery(body io.Reader) (map[string]map[string]string, error) { } func getCodimdExtensions(appURL string) map[string]map[string]string { + // Register custom mime types + mime.RegisterMime(".zmd", "application/compressed-markdown") + appURLs := make(map[string]map[string]string) appURLs["edit"] = map[string]string{ ".txt": appURL, diff --git a/pkg/mime/mime.go b/pkg/mime/mime.go index b29d3552ff5..3e8a0844430 100644 --- a/pkg/mime/mime.go +++ b/pkg/mime/mime.go @@ -19,8 +19,9 @@ package mime import ( - gomime "mime" "path" + + gomime "github.com/cubewise-code/go-mime" ) const defaultMimeDir = "httpd/unix-directory"