mirror of
https://github.com/hajimehoshi/ebiten.git
synced 2024-12-25 19:28:57 +01:00
internal/ui: bug fix: dropping multiple files didn't work on Firefox and Safari
Closes #3045
This commit is contained in:
parent
95ad1b158c
commit
1843f6acc1
@ -24,13 +24,24 @@ import (
|
||||
)
|
||||
|
||||
type FileEntryFS struct {
|
||||
rootEntry js.Value
|
||||
rootEntries []js.Value
|
||||
}
|
||||
|
||||
func NewFileEntryFS(root js.Value) *FileEntryFS {
|
||||
return &FileEntryFS{
|
||||
rootEntry: root,
|
||||
func NewFileEntryFS(rootEntries []js.Value) (*FileEntryFS, error) {
|
||||
// Check all the full paths are the same.
|
||||
var fullpath string
|
||||
for _, ent := range rootEntries {
|
||||
if fullpath == "" {
|
||||
fullpath = ent.Get("fullPath").String()
|
||||
continue
|
||||
}
|
||||
if fullpath != ent.Get("fullPath").String() {
|
||||
return nil, errors.New("file: all the full paths must be the same")
|
||||
}
|
||||
}
|
||||
return &FileEntryFS{
|
||||
rootEntries: rootEntries,
|
||||
}, nil
|
||||
}
|
||||
|
||||
func (f *FileEntryFS) Open(name string) (fs.File, error) {
|
||||
@ -43,9 +54,27 @@ func (f *FileEntryFS) Open(name string) (fs.File, error) {
|
||||
}
|
||||
|
||||
if name == "." {
|
||||
return &dir{dirEntry: f.rootEntry}, nil
|
||||
var dirName string
|
||||
for _, ent := range f.rootEntries {
|
||||
if dirName == "" {
|
||||
dirName = ent.Get("name").String()
|
||||
continue
|
||||
}
|
||||
if dirName != ent.Get("name").String() {
|
||||
return nil, &fs.PathError{
|
||||
Op: "open",
|
||||
Path: name,
|
||||
Err: errors.New("invalid directory"),
|
||||
}
|
||||
}
|
||||
}
|
||||
return &dir{
|
||||
name: dirName,
|
||||
dirEntries: f.rootEntries,
|
||||
}, nil
|
||||
}
|
||||
|
||||
for _, ent := range f.rootEntries {
|
||||
var chEntry chan js.Value
|
||||
cbSuccess := js.FuncOf(func(this js.Value, args []js.Value) any {
|
||||
chEntry <- args[0]
|
||||
@ -61,15 +90,19 @@ func (f *FileEntryFS) Open(name string) (fs.File, error) {
|
||||
defer cbFailure.Release()
|
||||
|
||||
chEntry = make(chan js.Value)
|
||||
f.rootEntry.Call("getFile", name, nil, cbSuccess, cbFailure)
|
||||
ent.Call("getFile", name, nil, cbSuccess, cbFailure)
|
||||
if entry := <-chEntry; entry.Truthy() {
|
||||
return &file{entry: entry}, nil
|
||||
}
|
||||
|
||||
chEntry = make(chan js.Value)
|
||||
f.rootEntry.Call("getDirectory", name, nil, cbSuccess, cbFailure)
|
||||
ent.Call("getDirectory", name, nil, cbSuccess, cbFailure)
|
||||
if entry := <-chEntry; entry.Truthy() {
|
||||
return &dir{dirEntry: entry}, nil
|
||||
return &dir{
|
||||
name: entry.Get("name").String(),
|
||||
dirEntries: []js.Value{entry},
|
||||
}, nil
|
||||
}
|
||||
}
|
||||
|
||||
return nil, &fs.PathError{
|
||||
@ -163,21 +196,22 @@ func (f *file) Close() error {
|
||||
}
|
||||
|
||||
type dir struct {
|
||||
dirEntry js.Value
|
||||
name string
|
||||
dirEntries []js.Value
|
||||
fileEntries []js.Value
|
||||
offset int
|
||||
}
|
||||
|
||||
func (d *dir) Stat() (fs.FileInfo, error) {
|
||||
return &fileInfo{
|
||||
name: d.dirEntry.Get("name").String(),
|
||||
name: d.name,
|
||||
}, nil
|
||||
}
|
||||
|
||||
func (d *dir) Read(buf []byte) (int, error) {
|
||||
return 0, &fs.PathError{
|
||||
Op: "read",
|
||||
Path: d.dirEntry.Get("name").String(),
|
||||
Path: d.name,
|
||||
Err: errors.New("is a directory"),
|
||||
}
|
||||
}
|
||||
@ -188,6 +222,8 @@ func (d *dir) Close() error {
|
||||
|
||||
func (d *dir) ReadDir(count int) ([]fs.DirEntry, error) {
|
||||
if d.fileEntries == nil {
|
||||
names := map[string]struct{}{}
|
||||
for _, dirEntry := range d.dirEntries {
|
||||
ch := make(chan struct{})
|
||||
var rec js.Func
|
||||
cb := js.FuncOf(func(this js.Value, args []js.Value) any {
|
||||
@ -198,21 +234,27 @@ func (d *dir) ReadDir(count int) ([]fs.DirEntry, error) {
|
||||
}
|
||||
for i := 0; i < entries.Length(); i++ {
|
||||
ent := entries.Index(i)
|
||||
name := ent.Get("name").String()
|
||||
// A name can be empty when this directory is a root directory.
|
||||
if ent.Get("name").String() == "" {
|
||||
if name == "" {
|
||||
continue
|
||||
}
|
||||
// Avoid entry duplications. Entry duplications happen when multiple files are dropped on Chrome.
|
||||
if _, ok := names[name]; ok {
|
||||
continue
|
||||
}
|
||||
if !ent.Get("isFile").Bool() && !ent.Get("isDirectory").Bool() {
|
||||
continue
|
||||
}
|
||||
d.fileEntries = append(d.fileEntries, ent)
|
||||
names[name] = struct{}{}
|
||||
}
|
||||
rec.Value.Call("call")
|
||||
return nil
|
||||
})
|
||||
defer cb.Release()
|
||||
|
||||
reader := d.dirEntry.Call("createReader")
|
||||
reader := dirEntry.Call("createReader")
|
||||
rec = js.FuncOf(func(this js.Value, args []js.Value) any {
|
||||
reader.Call("readEntries", cb)
|
||||
return nil
|
||||
@ -222,6 +264,7 @@ func (d *dir) ReadDir(count int) ([]fs.DirEntry, error) {
|
||||
rec.Value.Call("call")
|
||||
<-ch
|
||||
}
|
||||
}
|
||||
|
||||
n := len(d.fileEntries) - d.offset
|
||||
|
||||
|
@ -707,14 +707,21 @@ func (u *UserInterface) appendDroppedFiles(data js.Value) {
|
||||
defer u.dropFileM.Unlock()
|
||||
items := data.Get("items")
|
||||
|
||||
var entries []js.Value
|
||||
for i := 0; i < items.Length(); i++ {
|
||||
kind := items.Index(i).Get("kind").String()
|
||||
switch kind {
|
||||
case "file":
|
||||
fs := items.Index(i).Call("webkitGetAsEntry").Get("filesystem").Get("root")
|
||||
u.inputState.DroppedFiles = file.NewFileEntryFS(fs)
|
||||
entries = append(entries, items.Index(i).Call("webkitGetAsEntry").Get("filesystem").Get("root"))
|
||||
}
|
||||
}
|
||||
if len(entries) > 0 {
|
||||
fs, err := file.NewFileEntryFS(entries)
|
||||
if err != nil {
|
||||
u.setError(err)
|
||||
return
|
||||
}
|
||||
u.inputState.DroppedFiles = fs
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user