Align CEF folder upload handling with purego-cef 0.13

commit: 737371e4480b6c1b05fa203156733007abf8a69c
author: brice · 5mo ago · 2026-05-07 23:43 UTC
parent: eb6293e
signature: GPG VerifiedCD88F9E564E0102646FB6077A1A07C7C7C3E349D · arch-gpg Verified for the committer email

4 files · +16 -18

M go.mod +1 -3


@@ -6,7 +6,7 @@ require (
6	6		github.com/a-h/templ v0.3.1001
7	7		github.com/andybalholm/brotli v1.2.1
8	8		github.com/bnema/purego v0.11.0-bnema.2
9		-	github.com/bnema/purego-cef v0.12.0
	9	+	github.com/bnema/purego-cef v0.13.0
10	10		github.com/bnema/purego-cef2gtk v0.1.0
11	11		github.com/bnema/purego-pipewire v0.1.2
12	12		github.com/bnema/purego-sqlite v0.1.2

@@ -80,5 +80,3 @@ require (
80	80		)
81	81
82	82		tool github.com/a-h/templ/cmd/templ
83		-
84		-	replace github.com/bnema/purego-cef => ../purego-cef

 	github.com/a-h/templ v0.3.1001
 	github.com/andybalholm/brotli v1.2.1
 	github.com/bnema/purego v0.11.0-bnema.2
-	github.com/bnema/purego-cef v0.12.0
+	github.com/bnema/purego-cef v0.13.0
 	github.com/bnema/purego-cef2gtk v0.1.0
 	github.com/bnema/purego-pipewire v0.1.2
 	github.com/bnema/purego-sqlite v0.1.2
 )
 tool github.com/a-h/templ/cmd/templ
-replace github.com/bnema/purego-cef => ../purego-cef

M go.sum +2 -2 generated file: collapsed

load diff

M internal/infrastructure/cef/file_dialog.go +9 -9


@@ -29,7 +29,7 @@ type cefFileDialogRequest struct {
29	29
30	30		type fileDialogPresenter func(*WebView, cefFileDialogRequest, purecef.FileDialogCallback)
31	31
32		-	const maxFolderUploadExperimentFiles = 5000
	32	+	const maxExpandedFolderUploadFiles = 5000
33	33
34	34		var (
35	35		decodeCEFStringList = purecef.StringListToSlice

@@ -118,7 +118,7 @@ func presentGTKFileDialog(wv *WebView, req cefFileDialogRequest, callback purece
118	118		Int("path_count", len(paths)).
119	119		Strs("paths", paths).
120	120		Msg("cef: file dialog selection captured")
121		-	paths = folderUploadExperimentPaths(wv, req.Mode, paths)
	121	+	paths = folderUploadPaths(wv, req.Mode, paths)
122	122		dispatchFileDialogResult(wv, callback, paths)
123	123		}
124	124		dialog.ConnectResponse(&onResponse)

@@ -343,7 +343,7 @@ func selectedFileDialogPaths(dialog *gtk.FileChooserNative, mode purecef.FileDia
343	343		return nil
344	344		}
345	345
346		-	func folderUploadExperimentPaths(wv *WebView, mode purecef.FileDialogMode, paths []string) []string {
	346	+	func folderUploadPaths(wv *WebView, mode purecef.FileDialogMode, paths []string) []string {
347	347		if mode != purecef.FileDialogModeFileDialogOpenFolder \|\| len(paths) != 1 {
348	348		return paths
349	349		}

@@ -353,7 +353,7 @@ func folderUploadExperimentPaths(wv *WebView, mode purecef.FileDialogMode, paths
353	353		}
354	354		info, err := os.Stat(folder)
355	355		if err != nil \|\| !info.IsDir() {
356		-	logCEFFileDialog(wv).Warn().Err(err).Str("path", folder).Msg("cef: folder mode experiment skipped; selected path is not a directory")
	356	+	logCEFFileDialog(wv).Warn().Err(err).Str("path", folder).Msg("cef: folder upload path expansion skipped; selected path is not a directory")
357	357		return paths
358	358		}
359	359

@@ -361,7 +361,7 @@ func folderUploadExperimentPaths(wv *WebView, mode purecef.FileDialogMode, paths
361	361		truncated := false
362	362		walkErr := filepath.WalkDir(folder, func(path string, entry fs.DirEntry, err error) error {
363	363		if err != nil {
364		-	logCEFFileDialog(wv).Debug().Err(err).Str("path", path).Msg("cef: folder mode experiment skipped unreadable entry")
	364	+	logCEFFileDialog(wv).Debug().Err(err).Str("path", path).Msg("cef: folder upload path expansion skipped unreadable entry")
365	365		return nil
366	366		}
367	367		if path == folder \|\| entry.IsDir() \|\| entry.Type()&os.ModeSymlink != 0 {

@@ -372,18 +372,18 @@ func folderUploadExperimentPaths(wv *WebView, mode purecef.FileDialogMode, paths
372	372		return nil
373	373		}
374	374		files = append(files, path)
375		-	if len(files) >= maxFolderUploadExperimentFiles {
	375	+	if len(files) >= maxExpandedFolderUploadFiles {
376	376		truncated = true
377	377		return filepath.SkipAll
378	378		}
379	379		return nil
380	380		})
381	381		if walkErr != nil {
382		-	logCEFFileDialog(wv).Warn().Err(walkErr).Str("folder", folder).Msg("cef: folder mode experiment failed to enumerate selected folder")
	382	+	logCEFFileDialog(wv).Warn().Err(walkErr).Str("folder", folder).Msg("cef: folder upload descendant enumeration failed; using selected directory path")
383	383		return paths
384	384		}
385	385		if len(files) == 0 {
386		-	logCEFFileDialog(wv).Warn().Str("folder", folder).Msg("cef: folder mode experiment found no descendant files; using selected directory path")
	386	+	logCEFFileDialog(wv).Warn().Str("folder", folder).Msg("cef: folder upload descendant enumeration found no regular files; using selected directory path")
387	387		return paths
388	388		}
389	389

@@ -391,7 +391,7 @@ func folderUploadExperimentPaths(wv *WebView, mode purecef.FileDialogMode, paths
391	391		Str("folder", folder).
392	392		Int("file_count", len(files)).
393	393		Bool("truncated", truncated).
394		-	Msg("cef: folder mode experiment passing descendant file paths instead of selected directory")
	394	+	Msg("cef: folder upload expanded selected directory to descendant file paths")
395	395		return files
396	396		}
397	397


@@ -29,7 +29,7 @@ type cefFileDialogRequest struct {
29			29
30		type fileDialogPresenter func(*WebView, cefFileDialogRequest, purecef.FileDialogCallback)	30		type fileDialogPresenter func(*WebView, cefFileDialogRequest, purecef.FileDialogCallback)
31			31
32	-	const maxFolderUploadExperimentFiles = 5000	32	+	const maxExpandedFolderUploadFiles = 5000
33			33
34		var (	34		var (
35		decodeCEFStringList = purecef.StringListToSlice	35		decodeCEFStringList = purecef.StringListToSlice

@@ -118,7 +118,7 @@ func presentGTKFileDialog(wv *WebView, req cefFileDialogRequest, callback purece
118		Int("path_count", len(paths)).	118		Int("path_count", len(paths)).
119		Strs("paths", paths).	119		Strs("paths", paths).
120		Msg("cef: file dialog selection captured")	120		Msg("cef: file dialog selection captured")
121	-	paths = folderUploadExperimentPaths(wv, req.Mode, paths)	121	+	paths = folderUploadPaths(wv, req.Mode, paths)
122		dispatchFileDialogResult(wv, callback, paths)	122		dispatchFileDialogResult(wv, callback, paths)
123		}	123		}
124		dialog.ConnectResponse(&onResponse)	124		dialog.ConnectResponse(&onResponse)

@@ -343,7 +343,7 @@ func selectedFileDialogPaths(dialog *gtk.FileChooserNative, mode purecef.FileDia
343		return nil	343		return nil
344		}	344		}
345			345
346	-	func folderUploadExperimentPaths(wv *WebView, mode purecef.FileDialogMode, paths []string) []string {	346	+	func folderUploadPaths(wv *WebView, mode purecef.FileDialogMode, paths []string) []string {
347		if mode != purecef.FileDialogModeFileDialogOpenFolder \|\| len(paths) != 1 {	347		if mode != purecef.FileDialogModeFileDialogOpenFolder \|\| len(paths) != 1 {
348		return paths	348		return paths
349		}	349		}

@@ -353,7 +353,7 @@ func folderUploadExperimentPaths(wv *WebView, mode purecef.FileDialogMode, paths
353		}	353		}
354		info, err := os.Stat(folder)	354		info, err := os.Stat(folder)
355		if err != nil \|\| !info.IsDir() {	355		if err != nil \|\| !info.IsDir() {
356	-	logCEFFileDialog(wv).Warn().Err(err).Str("path", folder).Msg("cef: folder mode experiment skipped; selected path is not a directory")	356	+	logCEFFileDialog(wv).Warn().Err(err).Str("path", folder).Msg("cef: folder upload path expansion skipped; selected path is not a directory")
357		return paths	357		return paths
358		}	358		}
359			359

@@ -361,7 +361,7 @@ func folderUploadExperimentPaths(wv *WebView, mode purecef.FileDialogMode, paths
361		truncated := false	361		truncated := false
362		walkErr := filepath.WalkDir(folder, func(path string, entry fs.DirEntry, err error) error {	362		walkErr := filepath.WalkDir(folder, func(path string, entry fs.DirEntry, err error) error {
363		if err != nil {	363		if err != nil {
364	-	logCEFFileDialog(wv).Debug().Err(err).Str("path", path).Msg("cef: folder mode experiment skipped unreadable entry")	364	+	logCEFFileDialog(wv).Debug().Err(err).Str("path", path).Msg("cef: folder upload path expansion skipped unreadable entry")
365		return nil	365		return nil
366		}	366		}
367		if path == folder \|\| entry.IsDir() \|\| entry.Type()&os.ModeSymlink != 0 {	367		if path == folder \|\| entry.IsDir() \|\| entry.Type()&os.ModeSymlink != 0 {

@@ -372,18 +372,18 @@ func folderUploadExperimentPaths(wv *WebView, mode purecef.FileDialogMode, paths
372		return nil	372		return nil
373		}	373		}
374		files = append(files, path)	374		files = append(files, path)
375	-	if len(files) >= maxFolderUploadExperimentFiles {	375	+	if len(files) >= maxExpandedFolderUploadFiles {
376		truncated = true	376		truncated = true
377		return filepath.SkipAll	377		return filepath.SkipAll
378		}	378		}
379		return nil	379		return nil
380		})	380		})
381		if walkErr != nil {	381		if walkErr != nil {
382	-	logCEFFileDialog(wv).Warn().Err(walkErr).Str("folder", folder).Msg("cef: folder mode experiment failed to enumerate selected folder")	382	+	logCEFFileDialog(wv).Warn().Err(walkErr).Str("folder", folder).Msg("cef: folder upload descendant enumeration failed; using selected directory path")
383		return paths	383		return paths
384		}	384		}
385		if len(files) == 0 {	385		if len(files) == 0 {
386	-	logCEFFileDialog(wv).Warn().Str("folder", folder).Msg("cef: folder mode experiment found no descendant files; using selected directory path")	386	+	logCEFFileDialog(wv).Warn().Str("folder", folder).Msg("cef: folder upload descendant enumeration found no regular files; using selected directory path")
387		return paths	387		return paths
388		}	388		}
389			389

@@ -391,7 +391,7 @@ func folderUploadExperimentPaths(wv *WebView, mode purecef.FileDialogMode, paths
391		Str("folder", folder).	391		Str("folder", folder).
392		Int("file_count", len(files)).	392		Int("file_count", len(files)).
393		Bool("truncated", truncated).	393		Bool("truncated", truncated).
394	-	Msg("cef: folder mode experiment passing descendant file paths instead of selected directory")	394	+	Msg("cef: folder upload expanded selected directory to descendant file paths")
395		return files	395		return files
396		}	396		}
397			397

M internal/infrastructure/cef/file_dialog_test.go +4 -4


@@ -81,7 +81,7 @@ func TestOnFileDialogDelegatesDecodedRequestToPresenter(t *testing.T) {
81	81		require.Equal(t, []string{"Image Files", "Text Files"}, gotReq.AcceptDescriptions)
82	82		}
83	83
84		-	func TestFolderUploadExperimentPathsExpandsDirectoryFiles(t *testing.T) {
	84	+	func TestFolderUploadPathsExpandsDirectoryFiles(t *testing.T) {
85	85		dir := t.TempDir()
86	86		first := filepath.Join(dir, "first.txt")
87	87		second := filepath.Join(dir, "nested", "second.txt")

@@ -89,15 +89,15 @@ func TestFolderUploadExperimentPathsExpandsDirectoryFiles(t *testing.T) {
89	89		require.NoError(t, os.WriteFile(first, []byte("first"), 0o644))
90	90		require.NoError(t, os.WriteFile(second, []byte("second"), 0o644))
91	91
92		-	got := folderUploadExperimentPaths(&WebView{ctx: context.Background()}, purecef.FileDialogModeFileDialogOpenFolder, []string{dir})
	92	+	got := folderUploadPaths(&WebView{ctx: context.Background()}, purecef.FileDialogModeFileDialogOpenFolder, []string{dir})
93	93
94	94		require.ElementsMatch(t, []string{first, second}, got)
95	95		}
96	96
97		-	func TestFolderUploadExperimentPathsKeepsEmptyDirectoryPath(t *testing.T) {
	97	+	func TestFolderUploadPathsKeepsEmptyDirectoryPath(t *testing.T) {
98	98		dir := t.TempDir()
99	99
100		-	got := folderUploadExperimentPaths(&WebView{ctx: context.Background()}, purecef.FileDialogModeFileDialogOpenFolder, []string{dir})
	100	+	got := folderUploadPaths(&WebView{ctx: context.Background()}, purecef.FileDialogModeFileDialogOpenFolder, []string{dir})
101	101
102	102		require.Equal(t, []string{dir}, got)
103	103		}


@@ -81,7 +81,7 @@ func TestOnFileDialogDelegatesDecodedRequestToPresenter(t *testing.T) {
81		require.Equal(t, []string{"Image Files", "Text Files"}, gotReq.AcceptDescriptions)	81		require.Equal(t, []string{"Image Files", "Text Files"}, gotReq.AcceptDescriptions)
82		}	82		}
83			83
84	-	func TestFolderUploadExperimentPathsExpandsDirectoryFiles(t *testing.T) {	84	+	func TestFolderUploadPathsExpandsDirectoryFiles(t *testing.T) {
85		dir := t.TempDir()	85		dir := t.TempDir()
86		first := filepath.Join(dir, "first.txt")	86		first := filepath.Join(dir, "first.txt")
87		second := filepath.Join(dir, "nested", "second.txt")	87		second := filepath.Join(dir, "nested", "second.txt")

@@ -89,15 +89,15 @@ func TestFolderUploadExperimentPathsExpandsDirectoryFiles(t *testing.T) {
89		require.NoError(t, os.WriteFile(first, []byte("first"), 0o644))	89		require.NoError(t, os.WriteFile(first, []byte("first"), 0o644))
90		require.NoError(t, os.WriteFile(second, []byte("second"), 0o644))	90		require.NoError(t, os.WriteFile(second, []byte("second"), 0o644))
91			91
92	-	got := folderUploadExperimentPaths(&WebView{ctx: context.Background()}, purecef.FileDialogModeFileDialogOpenFolder, []string{dir})	92	+	got := folderUploadPaths(&WebView{ctx: context.Background()}, purecef.FileDialogModeFileDialogOpenFolder, []string{dir})
93			93
94		require.ElementsMatch(t, []string{first, second}, got)	94		require.ElementsMatch(t, []string{first, second}, got)
95		}	95		}
96			96
97	-	func TestFolderUploadExperimentPathsKeepsEmptyDirectoryPath(t *testing.T) {	97	+	func TestFolderUploadPathsKeepsEmptyDirectoryPath(t *testing.T) {
98		dir := t.TempDir()	98		dir := t.TempDir()
99			99
100	-	got := folderUploadExperimentPaths(&WebView{ctx: context.Background()}, purecef.FileDialogModeFileDialogOpenFolder, []string{dir})	100	+	got := folderUploadPaths(&WebView{ctx: context.Background()}, purecef.FileDialogModeFileDialogOpenFolder, []string{dir})
101			101
102		require.Equal(t, []string{dir}, got)	102		require.Equal(t, []string{dir}, got)
103		}	103		}