Browse Source

rename FlagChunkedFile to FlagChunkManifest

pull/224/head
tnextday 9 years ago
parent
commit
de5e07ce3e
  1. 2
      go/storage/needle.go
  2. 10
      go/storage/needle_read_write.go
  3. 2
      go/weed/weed_server/volume_server_handlers_read.go

2
go/storage/needle.go

@ -162,7 +162,7 @@ func NewNeedle(r *http.Request, fixJpgOrientation bool) (n *Needle, e error) {
} }
if isChunkedFile { if isChunkedFile {
n.SetChunkedFile()
n.SetChunkManifest()
} }
if fixJpgOrientation { if fixJpgOrientation {

10
go/storage/needle_read_write.go

@ -16,7 +16,7 @@ const (
FlagHasMime = 0x04 FlagHasMime = 0x04
FlagHasLastModifiedDate = 0x08 FlagHasLastModifiedDate = 0x08
FlagHasTtl = 0x10 FlagHasTtl = 0x10
FlagChunkedFile = 0x80
FlagChunkManifest = 0x80
LastModifiedBytesLength = 5 LastModifiedBytesLength = 5
TtlBytesLength = 2 TtlBytesLength = 2
) )
@ -282,10 +282,10 @@ func (n *Needle) SetHasTtl() {
n.Flags = n.Flags | FlagHasTtl n.Flags = n.Flags | FlagHasTtl
} }
func (n *Needle) IsChunkedFile() bool {
return n.Flags&FlagChunkedFile > 0
func (n *Needle) IsChunkedManifest() bool {
return n.Flags&FlagChunkManifest > 0
} }
func (n *Needle) SetChunkedFile() {
n.Flags = n.Flags | FlagChunkedFile
func (n *Needle) SetChunkManifest() {
n.Flags = n.Flags | FlagChunkManifest
} }

2
go/weed/weed_server/volume_server_handlers_read.go

@ -222,7 +222,7 @@ func (vs *VolumeServer) GetOrHeadHandler(w http.ResponseWriter, r *http.Request)
} }
func (vs *VolumeServer) tryHandleChunkedFile(n *storage.Needle, fileName string, w http.ResponseWriter, r *http.Request) (processed bool) { func (vs *VolumeServer) tryHandleChunkedFile(n *storage.Needle, fileName string, w http.ResponseWriter, r *http.Request) (processed bool) {
if !n.IsChunkedFile() {
if !n.IsChunkedManifest() {
return false return false
} }
processed = true processed = true

Loading…
Cancel
Save