mirror of
https://github.com/superseriousbusiness/gotosocial
synced 2025-06-05 21:59:39 +02:00
[chore] add back exif-terminator and use only for jpeg,png,webp (#3161)
* add back exif-terminator and use only for jpeg,png,webp * fix arguments passed to terminateExif() * pull in latest exif-terminator * fix test * update processed img --------- Co-authored-by: tobi <tobi.smethurst@protonmail.com>
This commit is contained in:
kim
GitHub
21
vendor/github.com/go-xmlfmt/xmlfmt/LICENSE
generated
vendored
Normal file
21
vendor/github.com/go-xmlfmt/xmlfmt/LICENSE
generated
vendored
Normal file
@ -0,0 +1,21 @@
|
||||
MIT License
|
||||
|
||||
Copyright (c) 2016 go-xmlfmt
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
||||
178
vendor/github.com/go-xmlfmt/xmlfmt/README.md
generated
vendored
Normal file
178
vendor/github.com/go-xmlfmt/xmlfmt/README.md
generated
vendored
Normal file
@ -0,0 +1,178 @@
|
||||
# Go XML Formatter
|
||||
|
||||
[](LICENSE)
|
||||
[](https://godoc.org/github.com/go-xmlfmt/xmlfmt)
|
||||
[](https://goreportcard.com/report/github.com/go-xmlfmt/xmlfmt)
|
||||
[](https://codeship.com/projects/190297)
|
||||
|
||||
## Synopsis
|
||||
|
||||
The Go XML Formatter, xmlfmt, will format the XML string in a readable way.
|
||||
|
||||
```go
|
||||
package main
|
||||
|
||||
import "github.com/go-xmlfmt/xmlfmt"
|
||||
|
||||
func main() {
|
||||
xml1 := `<root><this><is>a</is><test /><message><org><cn>Some org-or-other</cn><ph>Wouldnt you like to know</ph></org><contact><fn>Pat</fn><ln>Califia</ln></contact></message></this></root>`
|
||||
x := xmlfmt.FormatXML(xml1, "\t", " ")
|
||||
print(x)
|
||||
}
|
||||
|
||||
```
|
||||
|
||||
Output:
|
||||
|
||||
```xml
|
||||
<root>
|
||||
<this>
|
||||
<is>a
|
||||
</is>
|
||||
<test />
|
||||
<message>
|
||||
<!-- with comment -->
|
||||
<org>
|
||||
<cn>Some org-or-other
|
||||
</cn>
|
||||
<ph>Wouldnt you like to know
|
||||
</ph>
|
||||
</org>
|
||||
<contact>
|
||||
<fn>Pat
|
||||
</fn>
|
||||
<ln>Califia
|
||||
</ln>
|
||||
</contact>
|
||||
</message>
|
||||
</this>
|
||||
</root>
|
||||
```
|
||||
|
||||
There is no XML decoding and encoding involved, only pure regular expression matching and replacing. So it is much faster than going through decoding and encoding procedures. Moreover, the exact XML source string is preserved, instead of being changed by the encoder. This is why this package exists in the first place.
|
||||
|
||||
## Command
|
||||
|
||||
To use it on command line, check out [xmlfmt](https://github.com/AntonioSun/xmlfmt):
|
||||
|
||||
|
||||
```
|
||||
$ xmlfmt
|
||||
XML Formatter
|
||||
built on 2019-12-08
|
||||
|
||||
The xmlfmt will format the XML string without rewriting the document
|
||||
|
||||
Options:
|
||||
|
||||
-h, --help display help information
|
||||
-f, --file *The xml file to read from (or stdin)
|
||||
-p, --prefix each element begins on a new line and this prefix
|
||||
-i, --indent[= ] indent string for nested elements
|
||||
```
|
||||
|
||||
|
||||
## Justification
|
||||
|
||||
### The format
|
||||
|
||||
The Go XML Formatter is not called XML Beautifier because the result is not *exactly* as what people would expect -- some, but not all, closing tags stays on the same line, just as shown above. Having been looking at the result and thinking over it, I now think it is actually a better way to present it, as those closing tags on the same line are better stay that way in my opinion. I.e.,
|
||||
|
||||
When it comes to very big XML strings, which is what I’m dealing every day, saving spaces by not allowing those closing tags taking extra lines is plus instead of negative to me.
|
||||
|
||||
### The alternative
|
||||
|
||||
To format it “properly”, i.e., as what people would normally see, is very hard using pure regular expression. In fact, according to Sam Whited from the go-nuts mlist,
|
||||
|
||||
> Regular expression is, well, regular. This means that they can parse regular grammars, but can't parse context free grammars (like XML). It is actually impossible to use a regex to do this task; it will always be fragile, unfortunately.
|
||||
|
||||
So if the output format is so important to you, then unfortunately you have to go through decoding and encoding procedures. But there are some drawbacks as well, as put by James McGill, in http://stackoverflow.com/questions/21117161, besides such method being slow:
|
||||
|
||||
> I like this solution, but am still in search of a Golang XML formatter/prettyprinter that doesn't rewrite the document (other than formatting whitespace). Marshalling or using the Encoder will change namespace declarations.
|
||||
>
|
||||
> For example an element like "< ns1:Element />" will be translated to something like '< Element xmlns="http://bla...bla/ns1" >< /Element >' which seems harmless enough except when the intent is to not alter the xml other than formatting. -- James McGill Nov 12 '15
|
||||
|
||||
Using Sam's code as an example,
|
||||
|
||||
https://play.golang.org/p/JUqQY3WpW5
|
||||
|
||||
The above code formats the following XML
|
||||
|
||||
```xml
|
||||
<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
|
||||
xmlns:ns="http://example.com/ns">
|
||||
<soapenv:Header/>
|
||||
<soapenv:Body>
|
||||
<ns:request>
|
||||
<ns:customer>
|
||||
<ns:id>123</ns:id>
|
||||
<ns:name type="NCHZ">John Brown</ns:name>
|
||||
</ns:customer>
|
||||
</ns:request>
|
||||
</soapenv:Body>
|
||||
</soapenv:Envelope>
|
||||
```
|
||||
|
||||
into this:
|
||||
|
||||
```xml
|
||||
<Envelope xmlns="http://schemas.xmlsoap.org/soap/envelope/" xmlns:_xmlns="xmlns" _xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" _xmlns:ns="http://example.com/ns">
|
||||
<Header xmlns="http://schemas.xmlsoap.org/soap/envelope/"></Header>
|
||||
<Body xmlns="http://schemas.xmlsoap.org/soap/envelope/">
|
||||
<request xmlns="http://example.com/ns">
|
||||
<customer xmlns="http://example.com/ns">
|
||||
<id xmlns="http://example.com/ns">123</id>
|
||||
<name xmlns="http://example.com/ns" type="NCHZ">John Brown</name>
|
||||
</customer>
|
||||
</request>
|
||||
</Body>
|
||||
</Envelope>
|
||||
```
|
||||
|
||||
I know they are syntactically the same, however the problem is that they *look* totally different.
|
||||
|
||||
That's why there is this package, an XML Beautifier that doesn't rewrite the document.
|
||||
|
||||
## Credit
|
||||
|
||||
The credit goes to **diotalevi** from his post at http://www.perlmonks.org/?node_id=261292.
|
||||
|
||||
However, it does not work for all cases. For example,
|
||||
|
||||
```sh
|
||||
$ echo '<Envelope xmlns=http://schemas.xmlsoap.org/soap/envelope/ xmlns:_xmlns=xmlns _xmlns:soapenv=http://schemas.xmlsoap.org/soap/envelope/ _xmlns:ns=http://example.com/ns><Header xmlns=http://schemas.xmlsoap.org/soap/envelope/></Header><Body xmlns=http://schemas.xmlsoap.org/soap/envelope/><request xmlns=http://example.com/ns><customer xmlns=http://example.com/ns><id xmlns=http://example.com/ns>123</id><name xmlns=http://example.com/ns type=NCHZ>John Brown</name></customer></request></Body></Envelope>' | perl -pe 's/(?<=>)\s+(?=<)//g; s(<(/?)([^/>]+)(/?)>\s*(?=(</?))?)($indent+=$3?0:$1?-1:1;"<$1$2$3>".($1&&($4 eq"</")?"\n".(" "x$indent):$4?"\n".(" "x$indent):""))ge'
|
||||
```
|
||||
```xml
|
||||
<Envelope xmlns=http://schemas.xmlsoap.org/soap/envelope/ xmlns:_xmlns=xmlns _xmlns:soapenv=http://schemas.xmlsoap.org/soap/envelope/ _xmlns:ns=http://example.com/ns><Header xmlns=http://schemas.xmlsoap.org/soap/envelope/></Header>
|
||||
<Body xmlns=http://schemas.xmlsoap.org/soap/envelope/><request xmlns=http://example.com/ns><customer xmlns=http://example.com/ns><id xmlns=http://example.com/ns>123</id>
|
||||
<name xmlns=http://example.com/ns type=NCHZ>John Brown</name>
|
||||
</customer>
|
||||
</request>
|
||||
</Body>
|
||||
</Envelope>
|
||||
```
|
||||
|
||||
I simplified the algorithm, and now it should work for all cases:
|
||||
|
||||
```sh
|
||||
echo '<Envelope xmlns="http://schemas.xmlsoap.org/soap/envelope/" xmlns:_xmlns="xmlns" _xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" _xmlns:ns="http://example.com/ns"><Header xmlns="http://schemas.xmlsoap.org/soap/envelope/"></Header><Body xmlns="http://schemas.xmlsoap.org/soap/envelope/"><request xmlns="http://example.com/ns"><customer xmlns="http://example.com/ns"><id xmlns="http://example.com/ns">123</id><name xmlns="http://example.com/ns" type="NCHZ">John Brown</name></customer></request></Body></Envelope>' | perl -pe 's/(?<=>)\s+(?=<)//g; s(<(/?)([^>]+)(/?)>)($indent+=$3?0:$1?-1:1;"<$1$2$3>"."\n".(" "x$indent))ge'
|
||||
```
|
||||
```xml
|
||||
<Envelope xmlns="http://schemas.xmlsoap.org/soap/envelope/" xmlns:_xmlns="xmlns" _xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" _xmlns:ns="http://example.com/ns">
|
||||
<Header xmlns="http://schemas.xmlsoap.org/soap/envelope/">
|
||||
</Header>
|
||||
<Body xmlns="http://schemas.xmlsoap.org/soap/envelope/">
|
||||
<request xmlns="http://example.com/ns">
|
||||
<customer xmlns="http://example.com/ns">
|
||||
<id xmlns="http://example.com/ns">
|
||||
123</id>
|
||||
<name xmlns="http://example.com/ns" type="NCHZ">
|
||||
John Brown</name>
|
||||
</customer>
|
||||
</request>
|
||||
</Body>
|
||||
</Envelope>
|
||||
```
|
||||
|
||||
This package is a direct translate from above Perl code into Go,
|
||||
then further enhanced by @ruandao.
|
||||
56
vendor/github.com/go-xmlfmt/xmlfmt/xmlfmt.go
generated
vendored
Normal file
56
vendor/github.com/go-xmlfmt/xmlfmt/xmlfmt.go
generated
vendored
Normal file
@ -0,0 +1,56 @@
|
||||
////////////////////////////////////////////////////////////////////////////
|
||||
// Porgram: xmlfmt.go
|
||||
// Purpose: Go XML Beautify from XML string using pure string manipulation
|
||||
// Authors: Antonio Sun (c) 2016-2019, All rights reserved
|
||||
////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
package xmlfmt
|
||||
|
||||
import (
|
||||
"regexp"
|
||||
"strings"
|
||||
)
|
||||
|
||||
var (
|
||||
reg = regexp.MustCompile(`<([/!]?)([^>]+?)(/?)>`)
|
||||
// NL is the newline string used in XML output, define for DOS-convenient.
|
||||
NL = "\r\n"
|
||||
)
|
||||
|
||||
// FormatXML will (purly) reformat the XML string in a readable way, without any rewriting/altering the structure
|
||||
func FormatXML(xmls, prefix, indent string) string {
|
||||
src := regexp.MustCompile(`(?s)>\s+<`).ReplaceAllString(xmls, "><")
|
||||
|
||||
rf := replaceTag(prefix, indent)
|
||||
return (prefix + reg.ReplaceAllStringFunc(src, rf))
|
||||
}
|
||||
|
||||
// replaceTag returns a closure function to do 's/(?<=>)\s+(?=<)//g; s(<(/?)([^>]+?)(/?)>)($indent+=$3?0:$1?-1:1;"<$1$2$3>"."\n".(" "x$indent))ge' as in Perl
|
||||
// and deal with comments as well
|
||||
func replaceTag(prefix, indent string) func(string) string {
|
||||
indentLevel := 0
|
||||
return func(m string) string {
|
||||
// head elem
|
||||
if strings.HasPrefix(m, "<?xml") {
|
||||
return NL + prefix + strings.Repeat(indent, indentLevel) + m
|
||||
}
|
||||
// empty elem
|
||||
if strings.HasSuffix(m, "/>") {
|
||||
return NL + prefix + strings.Repeat(indent, indentLevel) + m
|
||||
}
|
||||
// comment elem
|
||||
if strings.HasPrefix(m, "<!") {
|
||||
return NL + prefix + strings.Repeat(indent, indentLevel) + m
|
||||
}
|
||||
// end elem
|
||||
if strings.HasPrefix(m, "</") {
|
||||
indentLevel--
|
||||
return NL + prefix + strings.Repeat(indent, indentLevel) + m
|
||||
}
|
||||
defer func() {
|
||||
indentLevel++
|
||||
}()
|
||||
|
||||
return NL + prefix + strings.Repeat(indent, indentLevel) + m
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user