Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings
This repository was archived by the owner on Jun 25, 2022. It is now read-only.
/packrPublic archive

Commit0a50e6d

Browse files
authored
Missing dependency: github.com/karrick/godirwalk@v1.11.3fixes#243 (#244)
1 parent607219b commit0a50e6d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+1386
-149
lines changed

‎v2/file/info.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ import (
66
)
77

88
typeinfostruct {
9-
Pathstring
10-
Contents[]byte
11-
sizeint64
12-
modTimetime.Time
13-
isDirbool
9+
Pathstring
10+
Contents[]byte
11+
sizeint64
12+
modTimetime.Time
13+
isDirbool
1414
}
1515

1616
func (finfo)Name()string {

‎v2/file/resolver/disk.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"sync"
99

1010
"github.com/gobuffalo/packr/v2/file"
11+
"github.com/gobuffalo/packr/v2/internal/takeon/github.com/karrick/godirwalk"
1112
"github.com/gobuffalo/packr/v2/plog"
12-
"github.com/karrick/godirwalk"
1313
)
1414

1515
var_Resolver=&Disk{}

‎v2/file/resolver/encoding/hex/hex.go‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const hextable = "0123456789abcdef"
1515

1616
// EncodedLen returns the length of an encoding of n source bytes.
1717
// Specifically, it returns n * 2.
18-
funcEncodedLen(nint)int{returnn*2 }
18+
funcEncodedLen(nint)int{returnn*2 }
1919

2020
// Encode encodes src into EncodedLen(len(src))
2121
// bytes of dst. As a convenience, it returns the number
@@ -44,7 +44,7 @@ func (e InvalidByteError) Error() string {
4444

4545
// DecodedLen returns the length of a decoding of x source bytes.
4646
// Specifically, it returns x / 2.
47-
funcDecodedLen(xint)int{returnx/2 }
47+
funcDecodedLen(xint)int{returnx/2 }
4848

4949
// Decode decodes src into DecodedLen(len(src)) bytes,
5050
// returning the actual number of bytes written to dst.
@@ -126,9 +126,9 @@ func Dump(data []byte) string {
126126
constbufferSize=1024
127127

128128
typeencoderstruct {
129-
wio.Writer
130-
errerror
131-
out[bufferSize]byte// output buffer
129+
wio.Writer
130+
errerror
131+
out[bufferSize]byte// output buffer
132132
}
133133

134134
// NewEncoder returns an io.Writer that writes lowercase hexadecimal characters to w.
@@ -153,10 +153,10 @@ func (e *encoder) Write(p []byte) (n int, err error) {
153153
}
154154

155155
typedecoderstruct {
156-
rio.Reader
157-
errerror
158-
in[]byte// input buffer (encoded form)
159-
arr[bufferSize]byte// backing array for in
156+
rio.Reader
157+
errerror
158+
in[]byte// input buffer (encoded form)
159+
arr[bufferSize]byte// backing array for in
160160
}
161161

162162
// NewDecoder returns an io.Reader that decodes hexadecimal characters from r.
@@ -169,7 +169,7 @@ func (d *decoder) Read(p []byte) (n int, err error) {
169169
// Fill internal buffer with sufficient bytes to decode
170170
iflen(d.in)<2&&d.err==nil {
171171
varnumCopy,numReadint
172-
numCopy=copy(d.arr[:],d.in)// Copies either 0 or 1 bytes
172+
numCopy=copy(d.arr[:],d.in)// Copies either 0 or 1 bytes
173173
numRead,d.err=d.r.Read(d.arr[numCopy:])
174174
d.in=d.arr[:numCopy+numRead]
175175
ifd.err==io.EOF&&len(d.in)%2!=0 {
@@ -188,11 +188,11 @@ func (d *decoder) Read(p []byte) (n int, err error) {
188188
numDec,err:=Decode(p,d.in[:len(p)*2])
189189
d.in=d.in[2*numDec:]
190190
iferr!=nil {
191-
d.in,d.err=nil,err// Decode error; discard input remainder
191+
d.in,d.err=nil,err// Decode error; discard input remainder
192192
}
193193

194194
iflen(d.in)<2 {
195-
returnnumDec,d.err// Only expose errors when buffer fully consumed
195+
returnnumDec,d.err// Only expose errors when buffer fully consumed
196196
}
197197
returnnumDec,nil
198198
}
@@ -205,12 +205,12 @@ func Dumper(w io.Writer) io.WriteCloser {
205205
}
206206

207207
typedumperstruct {
208-
wio.Writer
209-
rightChars[18]byte
210-
buf[14]byte
211-
usedint// number of bytes in the current line
212-
nuint// number of bytes, total
213-
closedbool
208+
wio.Writer
209+
rightChars[18]byte
210+
buf[14]byte
211+
usedint// number of bytes in the current line
212+
nuint// number of bytes, total
213+
closedbool
214214
}
215215

216216
functoChar(bbyte)byte {

‎v2/file/resolver/hex_gzip.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ import (
1818
var_Resolver=&HexGzip{}
1919

2020
typeHexGzipstruct {
21-
packedmap[string]string
22-
unpackedmap[string]string
23-
moot*sync.RWMutex
21+
packedmap[string]string
22+
unpackedmap[string]string
23+
moot*sync.RWMutex
2424
}
2525

2626
func (hgHexGzip)String()string {
@@ -77,9 +77,9 @@ func NewHexGzip(files map[string]string) (*HexGzip, error) {
7777
}
7878

7979
hg:=&HexGzip{
80-
packed:files,
81-
unpacked:map[string]string{},
82-
moot:&sync.RWMutex{},
80+
packed:files,
81+
unpacked:map[string]string{},
82+
moot:&sync.RWMutex{},
8383
}
8484

8585
returnhg,nil

‎v2/file/resolver/ident_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99

1010
funcTest_Ident_OsPath(t*testing.T) {
1111
table:=map[string]string{
12-
"foo/bar/baz":"foo/bar/baz",
13-
"foo\\bar\\baz":"foo/bar/baz",
12+
"foo/bar/baz":"foo/bar/baz",
13+
"foo\\bar\\baz":"foo/bar/baz",
1414
}
1515

1616
ifruntime.GOOS=="windows" {
@@ -27,7 +27,7 @@ func Test_Ident_OsPath(t *testing.T) {
2727

2828
funcident_OsPath_Windows_Table()map[string]string {
2929
returnmap[string]string{
30-
"foo/bar/baz":"foo\\bar\\baz",
31-
"foo\\bar\\baz":"foo\\bar\\baz",
30+
"foo/bar/baz":"foo\\bar\\baz",
31+
"foo\\bar\\baz":"foo\\bar\\baz",
3232
}
3333
}

‎v2/go.mod‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@ require (
66
github.com/gobuffalo/envyv1.7.1
77
github.com/gobuffalo/loggerv1.0.1
88
github.com/gobuffalo/packdv0.3.0
9-
github.com/karrick/godirwalkv1.11.3
109
github.com/rogpeppe/go-internalv1.4.0
1110
github.com/sirupsen/logrusv1.4.2
1211
github.com/spf13/cobrav0.0.5
1312
github.com/stretchr/testifyv1.4.0
1413
golang.org/x/syncv0.0.0-20190911185100-cd5d95a43a6e
15-
golang.org/x/toolsv0.0.0-20190930152728-90aeebe84374
14+
golang.org/x/toolsv0.0.0-20191004055002-72853e10c5a3
1615
)

‎v2/go.sum‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NH
2020
github.com/inconshreveable/mousetrapv1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
2121
github.com/joho/godotenvv1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc=
2222
github.com/joho/godotenvv1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
23-
github.com/karrick/godirwalkv1.11.3 h1:ZrtYOzzHRzItdU1MvkK3CLlhC4m3YTWFgGyiBuSCQSY=
24-
github.com/karrick/godirwalkv1.11.3/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4=
2523
github.com/konsorten/go-windows-terminal-sequencesv1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
2624
github.com/konsorten/go-windows-terminal-sequencesv1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s=
2725
github.com/konsorten/go-windows-terminal-sequencesv1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
@@ -65,7 +63,6 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
6563
golang.org/x/cryptov0.0.0-20190621222207-cc06ce4a13d4 h1:ydJNl0ENAG67pFbB+9tfhiL2pYqLhfoaZFw/cjLhY4A=
6664
golang.org/x/cryptov0.0.0-20190621222207-cc06ce4a13d4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
6765
golang.org/x/netv0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
68-
golang.org/x/netv0.0.0-20190620200207-3b0461eec859 h1:R/3boaszxrf1GEUWTVDzSKVwLmSJpwZ1yqXm8j0v2QI=
6966
golang.org/x/netv0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
7067
golang.org/x/syncv0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
7168
golang.org/x/syncv0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY=
@@ -77,8 +74,8 @@ golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7w
7774
golang.org/x/sysv0.0.0-20190515120540-06a5c4944438 h1:khxRGsvPk4n2y8I/mLLjp7e5dMTJmH75wvqS6nMwUtY=
7875
golang.org/x/sysv0.0.0-20190515120540-06a5c4944438/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
7976
golang.org/x/textv0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
80-
golang.org/x/toolsv0.0.0-20190930152728-90aeebe84374 h1:gtmDBXipY3qmHzbMZV3Y7rPqd9/Y+p7kvA6JxRsBQO0=
81-
golang.org/x/toolsv0.0.0-20190930152728-90aeebe84374/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
77+
golang.org/x/toolsv0.0.0-20191004055002-72853e10c5a3 h1:2AmBLzhAfXj+2HCW09VCkJtHIYgHTIPcTeYqgP7Bwt0=
78+
golang.org/x/toolsv0.0.0-20191004055002-72853e10c5a3/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
8279
golang.org/x/xerrorsv0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
8380
gopkg.in/check.v1v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
8481
gopkg.in/check.v1v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=

‎v2/helpers.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ import (
1212

1313
funcconstruct(namestring,pathstring)*Box {
1414
return&Box{
15-
Path:path,
16-
Name:name,
17-
ResolutionDir:resolutionDir(path),
18-
resolvers:resolversMap{},
19-
dirs:dirsMap{},
15+
Path:path,
16+
Name:name,
17+
ResolutionDir:resolutionDir(path),
18+
resolvers:resolversMap{},
19+
dirs:dirsMap{},
2020
}
2121
}
2222

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
BSD 2-Clause License
2+
3+
Copyright (c) 2017, Karrick McDermott
4+
All rights reserved.
5+
6+
Redistribution and use in source and binary forms, with or without
7+
modification, are permitted provided that the following conditions are met:
8+
9+
* Redistributions of source code must retain the above copyright notice, this
10+
list of conditions and the following disclaimer.
11+
12+
* Redistributions in binary form must reproduce the above copyright notice,
13+
this list of conditions and the following disclaimer in the documentation
14+
and/or other materials provided with the distribution.
15+
16+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
17+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
18+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
20+
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
21+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
22+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
23+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
24+
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
25+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp