Skip to content

Add extended LS bits #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
zig-for wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Add extended LS bits #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion devices/interfaces.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"io"
"net/url"
"sni/protos/sni"
"time"
)

type Driver interface {
Expand Down Expand Up @@ -81,7 +82,7 @@ type DeviceControl interface {
}

type DeviceFilesystem interface {
ReadDirectory(ctx context.Context, path string) ([]DirEntry, error)
ReadDirectory(ctx context.Context, path string) (files []DirEntry, err error)
MakeDirectory(ctx context.Context, path string) error
RemoveFile(ctx context.Context, path string) error
RenameFile(ctx context.Context, path, newFilename string) error
Expand All @@ -93,6 +94,8 @@ type DeviceFilesystem interface {
type DirEntry struct {
Name string
Type sni.DirEntryType
Size *uint32
ModifiedTime *time.Time
}

type ProgressReportFunc func(current uint32, total uint32)
Expand Down
39 changes: 31 additions & 8 deletions devices/snes/drivers/fxpakpro/ls.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"fmt"
"sni/devices"
"sni/protos/sni"
"time"
)

func (d *Device) listFiles(ctx context.Context, path string) (files []devices.DirEntry, err error) {
Expand All @@ -15,7 +16,9 @@ func (d *Device) listFiles(ctx context.Context, path string) (files []devices.Di
sb[5] = byte(SpaceFILE)
sb[6] = byte(FlagNONE)

n := copy(sb[256:], path)
n := copy(sb[256:], path) + 1
sb[256 + n] = byte(sni.FileDetails_FileSize | sni.FileDetails_FileStamp)
n++
binary.BigEndian.PutUint32(sb[252:], uint32(n))

if shouldLock(ctx) {
Expand Down Expand Up @@ -73,6 +76,11 @@ recvLoop:
}

i := 0
var ls_extended_flags byte
if sb[0] == 0 {
ls_extended_flags = sb[1]
i = i + 2
}
for i < 512 {
// FF means no more data expected:
if sb[i] == 0xFF {
Expand All @@ -96,6 +104,28 @@ recvLoop:
}
i++

if ls_extended_flags & byte(sni.FileDetails_FileSize) != 0 {
file.Size = new(uint32)
*file.Size = binary.LittleEndian.Uint32(sb[i:i+4])
i += 4
}
if ls_extended_flags & byte(sni.FileDetails_FileStamp) != 0 {
ModifiedDate := binary.LittleEndian.Uint16(sb[i:i+2])
i += 2
ModifiedTime := binary.LittleEndian.Uint16(sb[i:i+2])
i += 2

Year := int(1980 + (ModifiedDate >> 9))
Month := time.Month(((ModifiedDate >> 5) & 0x0f))
Day := int(ModifiedDate & 0x1f)
Hour := int(ModifiedTime >> 11)
Minute := int((ModifiedTime >> 5) & 0x3f)
Second := int((ModifiedTime & 0x1f) * 2)

file.ModifiedTime = new(time.Time)
*file.ModifiedTime = time.Date(Year, Month, Day, Hour, Minute, Second, 0, time.UTC)
}

// read filename with 0-terminator:
start := i
for i < 512 && sb[i] != 0 {
Expand All @@ -107,7 +137,6 @@ recvLoop:
file.Name = string(sb[start:i])
i++

// file size does not come in this response
files = append(files, file)
}
if i == 512 {
Expand All @@ -118,11 +147,5 @@ recvLoop:
}
}

// TODO: go back and fetch file sizes
// NOTE: there is no way in the protocol to simply check file size. GET requires downloading the entire file.
//for i, file := range files {
// size, err = d.getFile(file.Name)
//}

return
}
Loading