perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Code smell

Browse Source
This commit is contained in:
Audrius Butkevicius
2014-11-04 23:22:15 +00:00
committed by Jakob Borg
parent ad29093ac1
commit e0da2764c9
2 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
message.go
View File

@@ -37,7 +37,7 @@ func (f FileInfo) String() string {
} }
func (f FileInfo) Size() (bytes int64) { func (f FileInfo) Size() (bytes int64) {
if IsDeleted(f.Flags) || IsDirectory(f.Flags) { if f.IsDeleted() || f.IsDirectory() {
return 128 return 128
} }
for _, b := range f.Blocks { for _, b := range f.Blocks {
@@ -47,15 +47,19 @@ func (f FileInfo) Size() (bytes int64) {
} }
func (f FileInfo) IsDeleted() bool { func (f FileInfo) IsDeleted() bool {
return IsDeleted(f.Flags) return f.Flags&FlagDeleted != 0
} }
func (f FileInfo) IsInvalid() bool { func (f FileInfo) IsInvalid() bool {
return IsInvalid(f.Flags) return f.Flags&FlagInvalid != 0
} }
func (f FileInfo) IsDirectory() bool { func (f FileInfo) IsDirectory() bool {
return IsDirectory(f.Flags) return f.Flags&FlagDirectory != 0
}
func (f FileInfo) HasPermissionBits() bool {
return f.Flags&FlagNoPermBits == 0
} }
// Used for unmarshalling a FileInfo structure but skipping the actual block list // Used for unmarshalling a FileInfo structure but skipping the actual block list
@@ -75,7 +79,7 @@ func (f FileInfoTruncated) String() string {
// Returns a statistical guess on the size, not the exact figure // Returns a statistical guess on the size, not the exact figure
func (f FileInfoTruncated) Size() int64 { func (f FileInfoTruncated) Size() int64 {
if IsDeleted(f.Flags) || IsDirectory(f.Flags) { if f.IsDeleted() || f.IsDirectory() {
return 128 return 128
} }
if f.NumBlocks < 2 { if f.NumBlocks < 2 {
@@ -86,17 +90,27 @@ func (f FileInfoTruncated) Size() int64 {
} }
func (f FileInfoTruncated) IsDeleted() bool { func (f FileInfoTruncated) IsDeleted() bool {
return IsDeleted(f.Flags) return f.Flags&FlagDeleted != 0
} }
func (f FileInfoTruncated) IsInvalid() bool { func (f FileInfoTruncated) IsInvalid() bool {
return IsInvalid(f.Flags) return f.Flags&FlagInvalid != 0
}
func (f FileInfoTruncated) IsDirectory() bool {
return f.Flags&FlagDirectory != 0
}
func (f FileInfoTruncated) HasPermissionBits() bool {
return f.Flags&FlagNoPermBits == 0
} }
type FileIntf interface { type FileIntf interface {
Size() int64 Size() int64
IsDeleted() bool IsDeleted() bool
IsInvalid() bool IsInvalid() bool
IsDirectory() bool
HasPermissionBits() bool
} }
type BlockInfo struct { type BlockInfo struct {

16
protocol.go
View File

@@ -637,19 +637,3 @@ func (c *rawConnection) Statistics() Statistics {
OutBytesTotal: c.cw.Tot(), OutBytesTotal: c.cw.Tot(),
} }
} }
func IsDeleted(bits uint32) bool {
return bits&FlagDeleted != 0
}
func IsInvalid(bits uint32) bool {
return bits&FlagInvalid != 0
}
func IsDirectory(bits uint32) bool {
return bits&FlagDirectory != 0
}
func HasPermissionBits(bits uint32) bool {
return bits&FlagNoPermBits == 0
}