fix: FAT32 >1024 byte read/write truncation, VFS write notifications & dir watch
- FAT32 writeFile: replace hardcoded spc=4 with bootRecord^.spc for cluster allocation and per-sector write loop - FAT32 writeFile: update directory entry byteSize on disk after write - FAT32 readFile: use dir^.byteSize instead of cluster-based estimate, fix off-by-one in read loop, remove spurious +sectorSize allocation - VFS: fire VFS_OnMutation on sync/async writes (cache invalidate + watch) - VFS: invalidate all cache entries for volume on mutation (relPath mismatch) - VFS: add vfsParentDir helper, store VFSDir in file descriptors - FDTable: add VFSDir field, free on close - File browser: enable directory watch & poll timer, two-step new file creation (open + write), remove io.syslog import - Linker: add --no-warn-execstack to suppress ld exit code 1 on warning - Add core.strings.helpers unit (getFileExtension, fmtFileSize, sort)
This commit is contained in:
1 parent
8755f108f2
commit
671c144ad5
6 files changed
+403
-40
No files matched your search
+30
-12
@@ -30,7 +30,6 @@ uses
|
||||
core.strings,
|
||||
core.strings.helpers,
|
||||
core.gfx.fileicons,
|
||||
io.syslog,
|
||||
debug.tracer,
|
||||
core.util,
|
||||
arch.x86.util;
|
||||
@@ -228,7 +227,8 @@ procedure fb_rename_cb(e: Plv_event); cdecl; forward;
|
||||
procedure fb_rename_ok_cb(e: Plv_event); cdecl; forward;
|
||||
procedure fb_newfile_cb(e: Plv_event); cdecl; forward;
|
||||
procedure fb_newfile_ok_cb(e: Plv_event); cdecl; forward;
|
||||
procedure fb_newfile_done(error: TError; userdata: pointer); forward;
|
||||
procedure fb_newfile_opened(error: TError; userdata: pointer); forward;
|
||||
procedure fb_newfile_written(error: TError; userdata: pointer); forward;
|
||||
procedure fb_newfile_done_timer(tmr: Plv_timer); cdecl; forward;
|
||||
{ Phase 7 — context menu }
|
||||
procedure fb_row_long_press_cb(e: Plv_event); cdecl; forward;
|
||||
@@ -557,10 +557,10 @@ end;
|
||||
procedure navigate_to(state: PFileBrowserState; newDir: pchar);
|
||||
begin
|
||||
{ Unwatch old directory }
|
||||
{if state^.watch_id <> 0 then begin
|
||||
if state^.watch_id <> 0 then begin
|
||||
driver.storage.vfs.UnwatchDirectory(state^.watch_id);
|
||||
state^.watch_id := 0;
|
||||
end;}
|
||||
end;
|
||||
push_history(state, newDir);
|
||||
if state^.cur_path <> nil then kfree(void(state^.cur_path));
|
||||
state^.cur_path := stringCopy(newDir);
|
||||
@@ -568,8 +568,8 @@ begin
|
||||
build_breadcrumbs(state);
|
||||
if state^.tab_bar <> nil then rebuild_tab_bar(state);
|
||||
{ Watch new directory }
|
||||
{state^.watch_dirty := false;
|
||||
state^.watch_id := driver.storage.vfs.WatchDirectory(newDir, @fb_watch_cb, state);}
|
||||
state^.watch_dirty := false;
|
||||
state^.watch_id := driver.storage.vfs.WatchDirectory(newDir, @fb_watch_cb, state);
|
||||
schedule_refresh(state);
|
||||
end;
|
||||
|
||||
@@ -1843,20 +1843,38 @@ begin
|
||||
nfctx^.err := eNone;
|
||||
nfctx^.handle := 0;
|
||||
driver.storage.vfs.OpenFileAsync(fp, omCreate, nfctx^.handle,
|
||||
@nfctx^.err, @fb_newfile_done, nfctx);
|
||||
@nfctx^.err, @fb_newfile_opened, nfctx);
|
||||
kfree(void(fp));
|
||||
end;
|
||||
|
||||
{ Async completion for file creation }
|
||||
procedure fb_newfile_done(error: TError; userdata: pointer);
|
||||
{ Async step 1: file descriptor opened — now write 0 bytes to create dir entry }
|
||||
procedure fb_newfile_opened(error: TError; userdata: pointer);
|
||||
var
|
||||
nfctx : PNewFileCtx;
|
||||
begin
|
||||
nfctx := PNewFileCtx(userdata);
|
||||
if nfctx = nil then exit;
|
||||
nfctx^.err := error;
|
||||
{ Close the handle if it was opened successfully }
|
||||
if (error = eNone) and (nfctx^.handle <> 0) then
|
||||
if (error = eNone) and (nfctx^.handle <> 0) then begin
|
||||
{ WriteFileAsync needs a non-nil buffer; Length=0 so it is never read }
|
||||
driver.storage.vfs.WriteFileAsync(nfctx^.handle, 0,
|
||||
puint8(@nfctx^.err), 0, @fb_newfile_written, nfctx);
|
||||
end else begin
|
||||
if nfctx^.handle <> 0 then
|
||||
driver.storage.vfs.CloseFile(nfctx^.handle);
|
||||
lv_timer_create(@fb_newfile_done_timer, 1, nfctx);
|
||||
end;
|
||||
end;
|
||||
|
||||
{ Async step 2: write complete — close handle and schedule UI refresh }
|
||||
procedure fb_newfile_written(error: TError; userdata: pointer);
|
||||
var
|
||||
nfctx : PNewFileCtx;
|
||||
begin
|
||||
nfctx := PNewFileCtx(userdata);
|
||||
if nfctx = nil then exit;
|
||||
if error <> eNone then nfctx^.err := error;
|
||||
if nfctx^.handle <> 0 then
|
||||
driver.storage.vfs.CloseFile(nfctx^.handle);
|
||||
lv_timer_create(@fb_newfile_done_timer, 1, nfctx);
|
||||
end;
|
||||
@@ -3205,7 +3223,7 @@ begin
|
||||
rebuild_tab_bar(state);
|
||||
|
||||
{ Create 500ms poll timer for directory watch notifications }
|
||||
{state^.watch_timer := lv_timer_create(@fb_watch_poll_timer, 500, state);}
|
||||
state^.watch_timer := lv_timer_create(@fb_watch_poll_timer, 500, state);
|
||||
|
||||
{ Default bookmarks }
|
||||
add_bookmark_entry(state, '/');
|
||||
|
||||
Reference in new issue
Block a user