Merge pull request #344 from bnema/chore/upstream-foundations
chore(deps): integrate approved upstream foundations
921 files · +28709 -25527
M docs/first-presentation.md +5 -2
| @@ -46,5 +46,8 @@ labels. Set `DUMBER_MACHINE_GPU_PROFILE` to one of `generic-gpu`, | |||
| 46 | 46 | `integrated-gpu`, `discrete-gpu`, `hybrid-gpu`, `virtual-gpu`, or `unknown-gpu`; | |
| 47 | 47 | do not use a device model or other identifier. Publish only the seven reviewed | |
| 48 | 48 | JSON files to an external Gist. Raw logs and temporary XDG homes are removed and | |
| 49 | - | must not be published. A missing or incomplete timeline, non-DMABUF backend, or | |
| 50 | - | invalid run fails collection. | |
| 49 | + | must not be published. `metadata.json` derives the selected | |
| 50 | + | `github.com/bnema/purego-cef2gtk` pseudo-version and its full immutable Git | |
| 51 | + | origin hash from Go module metadata; branch selectors or missing origin metadata | |
| 52 | + | fail collection. A missing or incomplete timeline, non-DMABUF backend, or invalid | |
| 53 | + | run also fails collection. | |
| @@ -46,5 +46,8 @@ labels. Set `DUMBER_MACHINE_GPU_PROFILE` to one of `generic-gpu`, | |||||
| 46 | `integrated-gpu`, `discrete-gpu`, `hybrid-gpu`, `virtual-gpu`, or `unknown-gpu`; | 46 | `integrated-gpu`, `discrete-gpu`, `hybrid-gpu`, `virtual-gpu`, or `unknown-gpu`; | ||
| 47 | do not use a device model or other identifier. Publish only the seven reviewed | 47 | do not use a device model or other identifier. Publish only the seven reviewed | ||
| 48 | JSON files to an external Gist. Raw logs and temporary XDG homes are removed and | 48 | JSON files to an external Gist. Raw logs and temporary XDG homes are removed and | ||
| 49 | - | must not be published. A missing or incomplete timeline, non-DMABUF backend, or | 49 | + | must not be published. `metadata.json` derives the selected |
| 50 | - | invalid run fails collection. | 50 | + | `github.com/bnema/purego-cef2gtk` pseudo-version and its full immutable Git |
| 51 | + | origin hash from Go module metadata; branch selectors or missing origin metadata | |||
| 52 | + | fail collection. A missing or incomplete timeline, non-DMABUF backend, or invalid | |||
| 53 | + | run also fails collection. | |||
M go.mod +5 -5
| @@ -6,11 +6,11 @@ require ( | |||
| 6 | 6 | github.com/a-h/templ v0.3.1020 | |
| 7 | 7 | github.com/andybalholm/brotli v1.2.2 | |
| 8 | 8 | github.com/bnema/purego v0.11.0-bnema.4 | |
| 9 | - | github.com/bnema/purego-cef v0.13.3 | |
| 10 | - | github.com/bnema/purego-cef2gtk v0.8.4 | |
| 11 | - | github.com/bnema/purego-pipewire v0.1.4 | |
| 12 | - | github.com/bnema/purego-sqlite v0.1.3 | |
| 13 | - | github.com/bnema/puregotk v0.7.0 | |
| 9 | + | github.com/bnema/purego-cef v0.13.4-0.20260714140305-f0b7414af67e | |
| 10 | + | github.com/bnema/purego-cef2gtk v0.8.4-0.20260714160309-bbd397409ebe | |
| 11 | + | github.com/bnema/purego-pipewire v0.1.5-0.20260714124450-6504b9cdf02a | |
| 12 | + | github.com/bnema/purego-sqlite v0.1.4-0.20260714131321-3614fe683b9c | |
| 13 | + | github.com/bnema/puregotk v0.7.1-0.20260714170452-0b6b9b901234 | |
| 14 | 14 | github.com/charmbracelet/bubbles v1.0.0 | |
| 15 | 15 | github.com/charmbracelet/bubbletea v1.3.10 | |
| 16 | 16 | github.com/charmbracelet/lipgloss v1.1.0 | |
| @@ -6,11 +6,11 @@ require ( | |||||
| 6 | github.com/a-h/templ v0.3.1020 | 6 | github.com/a-h/templ v0.3.1020 | ||
| 7 | github.com/andybalholm/brotli v1.2.2 | 7 | github.com/andybalholm/brotli v1.2.2 | ||
| 8 | github.com/bnema/purego v0.11.0-bnema.4 | 8 | github.com/bnema/purego v0.11.0-bnema.4 | ||
| 9 | - | github.com/bnema/purego-cef v0.13.3 | 9 | + | github.com/bnema/purego-cef v0.13.4-0.20260714140305-f0b7414af67e |
| 10 | - | github.com/bnema/purego-cef2gtk v0.8.4 | 10 | + | github.com/bnema/purego-cef2gtk v0.8.4-0.20260714160309-bbd397409ebe |
| 11 | - | github.com/bnema/purego-pipewire v0.1.4 | 11 | + | github.com/bnema/purego-pipewire v0.1.5-0.20260714124450-6504b9cdf02a |
| 12 | - | github.com/bnema/purego-sqlite v0.1.3 | 12 | + | github.com/bnema/purego-sqlite v0.1.4-0.20260714131321-3614fe683b9c |
| 13 | - | github.com/bnema/puregotk v0.7.0 | 13 | + | github.com/bnema/puregotk v0.7.1-0.20260714170452-0b6b9b901234 |
| 14 | github.com/charmbracelet/bubbles v1.0.0 | 14 | github.com/charmbracelet/bubbles v1.0.0 | ||
| 15 | github.com/charmbracelet/bubbletea v1.3.10 | 15 | github.com/charmbracelet/bubbletea v1.3.10 | ||
| 16 | github.com/charmbracelet/lipgloss v1.1.0 | 16 | github.com/charmbracelet/lipgloss v1.1.0 | ||
M go.sum +12 -0 generated file: collapsed
A internal/infrastructure/persistence/sqlite/history_repo_benchmark_test.go +71 -0
| @@ -0,0 +1,71 @@ | |||
| 1 | + | package sqlite_test | |
| 2 | + | ||
| 3 | + | import ( | |
| 4 | + | "fmt" | |
| 5 | + | "path/filepath" | |
| 6 | + | "testing" | |
| 7 | + | ||
| 8 | + | "github.com/bnema/dumber/internal/domain/entity" | |
| 9 | + | "github.com/bnema/dumber/internal/domain/repository" | |
| 10 | + | "github.com/bnema/dumber/internal/infrastructure/persistence/sqlite" | |
| 11 | + | ) | |
| 12 | + | ||
| 13 | + | // newHistoryBenchmarkRepository creates a representative local history corpus | |
| 14 | + | // outside the measured operation. Sidebar reads use GetRecent and omnibox | |
| 15 | + | // history suggestions use Search. | |
| 16 | + | func newHistoryBenchmarkRepository(b *testing.B) (repository.HistoryRepository, func()) { | |
| 17 | + | b.Helper() | |
| 18 | + | ||
| 19 | + | ctx := historyTestCtx() | |
| 20 | + | db, err := sqlite.NewConnection(ctx, filepath.Join(b.TempDir(), "dumber.db")) | |
| 21 | + | if err != nil { | |
| 22 | + | b.Fatal(err) | |
| 23 | + | } | |
| 24 | + | ||
| 25 | + | b.Cleanup(func() { | |
| 26 | + | if err := db.Close(); err != nil { | |
| 27 | + | b.Errorf("close benchmark database: %v", err) | |
| 28 | + | } | |
| 29 | + | }) | |
| 30 | + | ||
| 31 | + | repo := sqlite.NewHistoryRepository(db) | |
| 32 | + | for i := range 200 { | |
| 33 | + | entry := &entity.HistoryEntry{ | |
| 34 | + | URL: fmt.Sprintf("https://example%d.test/dumber/history/%d", i%20, i), | |
| 35 | + | Title: fmt.Sprintf("Dumber history entry %d", i), | |
| 36 | + | } | |
| 37 | + | if err := repo.Save(ctx, entry); err != nil { | |
| 38 | + | b.Fatal(err) | |
| 39 | + | } | |
| 40 | + | } | |
| 41 | + | ||
| 42 | + | return repo, func() {} | |
| 43 | + | } | |
| 44 | + | ||
| 45 | + | func BenchmarkHistorySQLiteSidebarRecent(b *testing.B) { | |
| 46 | + | repo, closeDB := newHistoryBenchmarkRepository(b) | |
| 47 | + | defer closeDB() | |
| 48 | + | ctx := historyTestCtx() | |
| 49 | + | ||
| 50 | + | b.ReportAllocs() | |
| 51 | + | b.ResetTimer() | |
| 52 | + | for range b.N { | |
| 53 | + | if _, err := repo.GetRecent(ctx, 50, 0); err != nil { | |
| 54 | + | b.Fatal(err) | |
| 55 | + | } | |
| 56 | + | } | |
| 57 | + | } | |
| 58 | + | ||
| 59 | + | func BenchmarkHistorySQLiteOmniboxSearch(b *testing.B) { | |
| 60 | + | repo, closeDB := newHistoryBenchmarkRepository(b) | |
| 61 | + | defer closeDB() | |
| 62 | + | ctx := historyTestCtx() | |
| 63 | + | ||
| 64 | + | b.ReportAllocs() | |
| 65 | + | b.ResetTimer() | |
| 66 | + | for range b.N { | |
| 67 | + | if _, err := repo.Search(ctx, "dumber history", 10); err != nil { | |
| 68 | + | b.Fatal(err) | |
| 69 | + | } | |
| 70 | + | } | |
| 71 | + | } | |
| @@ -0,0 +1,71 @@ | |||||
| 1 | + | package sqlite_test | |||
| 2 | + | ||||
| 3 | + | import ( | |||
| 4 | + | "fmt" | |||
| 5 | + | "path/filepath" | |||
| 6 | + | "testing" | |||
| 7 | + | ||||
| 8 | + | "github.com/bnema/dumber/internal/domain/entity" | |||
| 9 | + | "github.com/bnema/dumber/internal/domain/repository" | |||
| 10 | + | "github.com/bnema/dumber/internal/infrastructure/persistence/sqlite" | |||
| 11 | + | ) | |||
| 12 | + | ||||
| 13 | + | // newHistoryBenchmarkRepository creates a representative local history corpus | |||
| 14 | + | // outside the measured operation. Sidebar reads use GetRecent and omnibox | |||
| 15 | + | // history suggestions use Search. | |||
| 16 | + | func newHistoryBenchmarkRepository(b *testing.B) (repository.HistoryRepository, func()) { | |||
| 17 | + | b.Helper() | |||
| 18 | + | ||||
| 19 | + | ctx := historyTestCtx() | |||
| 20 | + | db, err := sqlite.NewConnection(ctx, filepath.Join(b.TempDir(), "dumber.db")) | |||
| 21 | + | if err != nil { | |||
| 22 | + | b.Fatal(err) | |||
| 23 | + | } | |||
| 24 | + | ||||
| 25 | + | b.Cleanup(func() { | |||
| 26 | + | if err := db.Close(); err != nil { | |||
| 27 | + | b.Errorf("close benchmark database: %v", err) | |||
| 28 | + | } | |||
| 29 | + | }) | |||
| 30 | + | ||||
| 31 | + | repo := sqlite.NewHistoryRepository(db) | |||
| 32 | + | for i := range 200 { | |||
| 33 | + | entry := &entity.HistoryEntry{ | |||
| 34 | + | URL: fmt.Sprintf("https://example%d.test/dumber/history/%d", i%20, i), | |||
| 35 | + | Title: fmt.Sprintf("Dumber history entry %d", i), | |||
| 36 | + | } | |||
| 37 | + | if err := repo.Save(ctx, entry); err != nil { | |||
| 38 | + | b.Fatal(err) | |||
| 39 | + | } | |||
| 40 | + | } | |||
| 41 | + | ||||
| 42 | + | return repo, func() {} | |||
| 43 | + | } | |||
| 44 | + | ||||
| 45 | + | func BenchmarkHistorySQLiteSidebarRecent(b *testing.B) { | |||
| 46 | + | repo, closeDB := newHistoryBenchmarkRepository(b) | |||
| 47 | + | defer closeDB() | |||
| 48 | + | ctx := historyTestCtx() | |||
| 49 | + | ||||
| 50 | + | b.ReportAllocs() | |||
| 51 | + | b.ResetTimer() | |||
| 52 | + | for range b.N { | |||
| 53 | + | if _, err := repo.GetRecent(ctx, 50, 0); err != nil { | |||
| 54 | + | b.Fatal(err) | |||
| 55 | + | } | |||
| 56 | + | } | |||
| 57 | + | } | |||
| 58 | + | ||||
| 59 | + | func BenchmarkHistorySQLiteOmniboxSearch(b *testing.B) { | |||
| 60 | + | repo, closeDB := newHistoryBenchmarkRepository(b) | |||
| 61 | + | defer closeDB() | |||
| 62 | + | ctx := historyTestCtx() | |||
| 63 | + | ||||
| 64 | + | b.ReportAllocs() | |||
| 65 | + | b.ResetTimer() | |||
| 66 | + | for range b.N { | |||
| 67 | + | if _, err := repo.Search(ctx, "dumber history", 10); err != nil { | |||
| 68 | + | b.Fatal(err) | |||
| 69 | + | } | |||
| 70 | + | } | |||
| 71 | + | } | |||
M internal/logging/first_presentation_collector_test.go +132 -1
| @@ -2,6 +2,7 @@ package logging | |||
| 2 | 2 | ||
| 3 | 3 | import ( | |
| 4 | 4 | "encoding/json" | |
| 5 | + | "fmt" | |
| 5 | 6 | "os" | |
| 6 | 7 | "os/exec" | |
| 7 | 8 | "path/filepath" | |
| @@ -143,8 +144,9 @@ func TestFirstPresentationCollectorSanitizesMachineLocalValues(t *testing.T) { | |||
| 143 | 144 | } | |
| 144 | 145 | for _, required := range []string{ | |
| 145 | 146 | `"measured_source_revision"`, | |
| 147 | + | `"version": "v0.8.4-0.20260714160309-bbd397409ebe"`, | |
| 146 | 148 | `"tag": "v0.8.4"`, | |
| 147 | - | `"revision": "f217ece342dea3ef2a3f98671fcd16a39ad0037d"`, | |
| 149 | + | `"revision": "bbd397409ebed75a5979c1e4566a2ef319f6a484"`, | |
| 148 | 150 | } { | |
| 149 | 151 | require.Contains(t, artifacts.String(), required) | |
| 150 | 152 | } | |
| @@ -166,6 +168,135 @@ func TestFirstPresentationCollectorSanitizesMachineLocalValues(t *testing.T) { | |||
| 166 | 168 | require.Equal(t, "integrated-gpu", metadata.Comparison.MachineGPUProfile) | |
| 167 | 169 | } | |
| 168 | 170 | ||
| 171 | + | func TestFirstPresentationCollectorDerivesSelectedImmutableModuleProvenance(t *testing.T) { | |
| 172 | + | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | |
| 173 | + | require.NoError(t, err) | |
| 174 | + | temp := t.TempDir() | |
| 175 | + | runtime := filepath.Join(temp, "cef-147-runtime") | |
| 176 | + | require.NoError(t, os.Mkdir(runtime, 0o755)) | |
| 177 | + | binary := filepath.Join(temp, "dumber") | |
| 178 | + | require.NoError(t, os.WriteFile(binary, collectorTestBinary(validFirstPresentationLog), 0o755)) | |
| 179 | + | ||
| 180 | + | // This exact pseudo-version is deliberately newer than the former v0.8.4 | |
| 181 | + | // hardcode; the collector must report what the selected module says. | |
| 182 | + | const version = "v0.8.5-0.20300102030405-bbd397409ebe" | |
| 183 | + | const revision = "bbd397409ebed75a5979c1e4566a2ef319f6a484" | |
| 184 | + | goBin := collectorProvenanceGo(t, temp, version, revision, "") | |
| 185 | + | output := filepath.Join(temp, "artifacts") | |
| 186 | + | cmd := exec.Command(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |
| 187 | + | cmd.Dir = repoRoot | |
| 188 | + | cmd.Env = append(os.Environ(), | |
| 189 | + | "DISPLAY=:test", | |
| 190 | + | "DUMBER_CEF_DIR="+runtime, | |
| 191 | + | "DUMBER_FIRST_PRESENTATION_BIN="+binary, | |
| 192 | + | "DUMBER_FIRST_PRESENTATION_OUTPUT="+output, | |
| 193 | + | "DUMBER_FIRST_PRESENTATION_TIMEOUT_SECONDS=1", | |
| 194 | + | "PATH="+filepath.Dir(goBin)+":"+os.Getenv("PATH"), | |
| 195 | + | ) | |
| 196 | + | result, err := cmd.CombinedOutput() | |
| 197 | + | require.NoErrorf(t, err, "collector failed: %s", result) | |
| 198 | + | ||
| 199 | + | var metadata struct { | |
| 200 | + | Upstream struct { | |
| 201 | + | Module string `json:"module"` | |
| 202 | + | Version string `json:"version"` | |
| 203 | + | Tag string `json:"tag"` | |
| 204 | + | Revision string `json:"revision"` | |
| 205 | + | } `json:"upstream"` | |
| 206 | + | } | |
| 207 | + | contents, err := os.ReadFile(filepath.Join(output, "metadata.json")) | |
| 208 | + | require.NoError(t, err) | |
| 209 | + | require.NoError(t, json.Unmarshal(contents, &metadata)) | |
| 210 | + | require.Equal(t, "github.com/bnema/purego-cef2gtk", metadata.Upstream.Module) | |
| 211 | + | require.Equal(t, version, metadata.Upstream.Version) | |
| 212 | + | require.Equal(t, "v0.8.5", metadata.Upstream.Tag) | |
| 213 | + | require.Equal(t, revision, metadata.Upstream.Revision) | |
| 214 | + | ||
| 215 | + | script, err := os.ReadFile(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |
| 216 | + | require.NoError(t, err) | |
| 217 | + | require.NotContains(t, string(script), "f217ece342dea3ef2a3f98671fcd16a39ad0037d") | |
| 218 | + | } | |
| 219 | + | ||
| 220 | + | func TestFirstPresentationCollectorRejectsNonImmutableModuleProvenanceWithoutLeaks(t *testing.T) { | |
| 221 | + | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | |
| 222 | + | require.NoError(t, err) | |
| 223 | + | ||
| 224 | + | for _, test := range []struct { | |
| 225 | + | name, version, revision, ref string | |
| 226 | + | }{ | |
| 227 | + | {name: "branch selector", version: "main", ref: "main"}, | |
| 228 | + | {name: "missing origin", version: "v0.8.5-0.20300102030405-bbd397409ebe"}, | |
| 229 | + | {name: "named origin ref", version: "v0.8.5-0.20300102030405-bbd397409ebe", revision: "bbd397409ebed75a5979c1e4566a2ef319f6a484", ref: "main"}, | |
| 230 | + | } { | |
| 231 | + | t.Run(test.name, func(t *testing.T) { | |
| 232 | + | temp := t.TempDir() | |
| 233 | + | runtime := filepath.Join(temp, "cef-147-runtime") | |
| 234 | + | require.NoError(t, os.Mkdir(runtime, 0o755)) | |
| 235 | + | binary := filepath.Join(temp, "dumber") | |
| 236 | + | require.NoError(t, os.WriteFile(binary, collectorTestBinary(validFirstPresentationLog), 0o755)) | |
| 237 | + | ||
| 238 | + | goBin := collectorProvenanceGo(t, temp, test.version, test.revision, test.ref) | |
| 239 | + | output := filepath.Join(temp, "artifacts") | |
| 240 | + | cmd := exec.Command(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |
| 241 | + | cmd.Dir = repoRoot | |
| 242 | + | cmd.Env = append(os.Environ(), | |
| 243 | + | "DISPLAY=:test", | |
| 244 | + | "DUMBER_CEF_DIR="+runtime, | |
| 245 | + | "DUMBER_FIRST_PRESENTATION_BIN="+binary, | |
| 246 | + | "DUMBER_FIRST_PRESENTATION_OUTPUT="+output, | |
| 247 | + | "PATH="+filepath.Dir(goBin)+":"+os.Getenv("PATH"), | |
| 248 | + | ) | |
| 249 | + | result, runErr := cmd.CombinedOutput() | |
| 250 | + | require.Errorf(t, runErr, "collector accepted nonimmutable module provenance: %s", result) | |
| 251 | + | require.Contains(t, string(result), "immutable module provenance is unavailable") | |
| 252 | + | require.NotContains(t, string(result), temp) | |
| 253 | + | require.NoFileExists(t, filepath.Join(output, "metadata.json")) | |
| 254 | + | for _, name := range runArtifactNames() { | |
| 255 | + | require.NoFileExists(t, filepath.Join(output, name)) | |
| 256 | + | } | |
| 257 | + | }) | |
| 258 | + | } | |
| 259 | + | } | |
| 260 | + | ||
| 261 | + | func collectorProvenanceGo(t *testing.T, temp, version, revision, ref string) string { | |
| 262 | + | t.Helper() | |
| 263 | + | infoPath := filepath.Join(temp, "module.info") | |
| 264 | + | info := map[string]any{"Version": version} | |
| 265 | + | if revision != "" { | |
| 266 | + | info["Origin"] = map[string]string{ | |
| 267 | + | "VCS": "git", "URL": "https://github.com/bnema/purego-cef2gtk", "Hash": revision, "Ref": ref, | |
| 268 | + | } | |
| 269 | + | } | |
| 270 | + | infoJSON, err := json.Marshal(info) | |
| 271 | + | require.NoError(t, err) | |
| 272 | + | require.NoError(t, os.WriteFile(infoPath, infoJSON, 0o600)) | |
| 273 | + | ||
| 274 | + | selectedJSON, err := json.Marshal(map[string]string{ | |
| 275 | + | "Path": "github.com/bnema/purego-cef2gtk", "Version": version, | |
| 276 | + | }) | |
| 277 | + | require.NoError(t, err) | |
| 278 | + | downloadedJSON, err := json.Marshal(map[string]string{ | |
| 279 | + | "Path": "github.com/bnema/purego-cef2gtk", "Version": version, "Info": infoPath, | |
| 280 | + | }) | |
| 281 | + | require.NoError(t, err) | |
| 282 | + | binDir := filepath.Join(temp, "bin") | |
| 283 | + | require.NoError(t, os.Mkdir(binDir, 0o755)) | |
| 284 | + | goBin := filepath.Join(binDir, "go") | |
| 285 | + | script := fmt.Sprintf(`#!/bin/sh | |
| 286 | + | if [ "$1" = "list" ] && [ "$2" = "-m" ] && [ "$3" = "-json" ] && [ "$4" = "github.com/bnema/purego-cef2gtk" ]; then | |
| 287 | + | printf '%%s\n' '%s' | |
| 288 | + | exit 0 | |
| 289 | + | fi | |
| 290 | + | if [ "$1" = "mod" ] && [ "$2" = "download" ] && [ "$3" = "-json" ] && [ "$4" = "github.com/bnema/purego-cef2gtk@%s" ]; then | |
| 291 | + | printf '%%s\n' '%s' | |
| 292 | + | exit 0 | |
| 293 | + | fi | |
| 294 | + | exit 1 | |
| 295 | + | `, selectedJSON, version, downloadedJSON) | |
| 296 | + | require.NoError(t, os.WriteFile(goBin, []byte(script), 0o755)) | |
| 297 | + | return goBin | |
| 298 | + | } | |
| 299 | + | ||
| 169 | 300 | func TestFirstPresentationCollectorDefaultsToXDGStateEvidenceDirectory(t *testing.T) { | |
| 170 | 301 | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | |
| 171 | 302 | require.NoError(t, err) | |
| @@ -2,6 +2,7 @@ package logging | |||||
| 2 | 2 | ||||
| 3 | import ( | 3 | import ( | ||
| 4 | "encoding/json" | 4 | "encoding/json" | ||
| 5 | + | "fmt" | |||
| 5 | "os" | 6 | "os" | ||
| 6 | "os/exec" | 7 | "os/exec" | ||
| 7 | "path/filepath" | 8 | "path/filepath" | ||
| @@ -143,8 +144,9 @@ func TestFirstPresentationCollectorSanitizesMachineLocalValues(t *testing.T) { | |||||
| 143 | } | 144 | } | ||
| 144 | for _, required := range []string{ | 145 | for _, required := range []string{ | ||
| 145 | `"measured_source_revision"`, | 146 | `"measured_source_revision"`, | ||
| 147 | + | `"version": "v0.8.4-0.20260714160309-bbd397409ebe"`, | |||
| 146 | `"tag": "v0.8.4"`, | 148 | `"tag": "v0.8.4"`, | ||
| 147 | - | `"revision": "f217ece342dea3ef2a3f98671fcd16a39ad0037d"`, | 149 | + | `"revision": "bbd397409ebed75a5979c1e4566a2ef319f6a484"`, |
| 148 | } { | 150 | } { | ||
| 149 | require.Contains(t, artifacts.String(), required) | 151 | require.Contains(t, artifacts.String(), required) | ||
| 150 | } | 152 | } | ||
| @@ -166,6 +168,135 @@ func TestFirstPresentationCollectorSanitizesMachineLocalValues(t *testing.T) { | |||||
| 166 | require.Equal(t, "integrated-gpu", metadata.Comparison.MachineGPUProfile) | 168 | require.Equal(t, "integrated-gpu", metadata.Comparison.MachineGPUProfile) | ||
| 167 | } | 169 | } | ||
| 168 | 170 | ||||
| 171 | + | func TestFirstPresentationCollectorDerivesSelectedImmutableModuleProvenance(t *testing.T) { | |||
| 172 | + | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | |||
| 173 | + | require.NoError(t, err) | |||
| 174 | + | temp := t.TempDir() | |||
| 175 | + | runtime := filepath.Join(temp, "cef-147-runtime") | |||
| 176 | + | require.NoError(t, os.Mkdir(runtime, 0o755)) | |||
| 177 | + | binary := filepath.Join(temp, "dumber") | |||
| 178 | + | require.NoError(t, os.WriteFile(binary, collectorTestBinary(validFirstPresentationLog), 0o755)) | |||
| 179 | + | ||||
| 180 | + | // This exact pseudo-version is deliberately newer than the former v0.8.4 | |||
| 181 | + | // hardcode; the collector must report what the selected module says. | |||
| 182 | + | const version = "v0.8.5-0.20300102030405-bbd397409ebe" | |||
| 183 | + | const revision = "bbd397409ebed75a5979c1e4566a2ef319f6a484" | |||
| 184 | + | goBin := collectorProvenanceGo(t, temp, version, revision, "") | |||
| 185 | + | output := filepath.Join(temp, "artifacts") | |||
| 186 | + | cmd := exec.Command(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |||
| 187 | + | cmd.Dir = repoRoot | |||
| 188 | + | cmd.Env = append(os.Environ(), | |||
| 189 | + | "DISPLAY=:test", | |||
| 190 | + | "DUMBER_CEF_DIR="+runtime, | |||
| 191 | + | "DUMBER_FIRST_PRESENTATION_BIN="+binary, | |||
| 192 | + | "DUMBER_FIRST_PRESENTATION_OUTPUT="+output, | |||
| 193 | + | "DUMBER_FIRST_PRESENTATION_TIMEOUT_SECONDS=1", | |||
| 194 | + | "PATH="+filepath.Dir(goBin)+":"+os.Getenv("PATH"), | |||
| 195 | + | ) | |||
| 196 | + | result, err := cmd.CombinedOutput() | |||
| 197 | + | require.NoErrorf(t, err, "collector failed: %s", result) | |||
| 198 | + | ||||
| 199 | + | var metadata struct { | |||
| 200 | + | Upstream struct { | |||
| 201 | + | Module string `json:"module"` | |||
| 202 | + | Version string `json:"version"` | |||
| 203 | + | Tag string `json:"tag"` | |||
| 204 | + | Revision string `json:"revision"` | |||
| 205 | + | } `json:"upstream"` | |||
| 206 | + | } | |||
| 207 | + | contents, err := os.ReadFile(filepath.Join(output, "metadata.json")) | |||
| 208 | + | require.NoError(t, err) | |||
| 209 | + | require.NoError(t, json.Unmarshal(contents, &metadata)) | |||
| 210 | + | require.Equal(t, "github.com/bnema/purego-cef2gtk", metadata.Upstream.Module) | |||
| 211 | + | require.Equal(t, version, metadata.Upstream.Version) | |||
| 212 | + | require.Equal(t, "v0.8.5", metadata.Upstream.Tag) | |||
| 213 | + | require.Equal(t, revision, metadata.Upstream.Revision) | |||
| 214 | + | ||||
| 215 | + | script, err := os.ReadFile(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |||
| 216 | + | require.NoError(t, err) | |||
| 217 | + | require.NotContains(t, string(script), "f217ece342dea3ef2a3f98671fcd16a39ad0037d") | |||
| 218 | + | } | |||
| 219 | + | ||||
| 220 | + | func TestFirstPresentationCollectorRejectsNonImmutableModuleProvenanceWithoutLeaks(t *testing.T) { | |||
| 221 | + | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | |||
| 222 | + | require.NoError(t, err) | |||
| 223 | + | ||||
| 224 | + | for _, test := range []struct { | |||
| 225 | + | name, version, revision, ref string | |||
| 226 | + | }{ | |||
| 227 | + | {name: "branch selector", version: "main", ref: "main"}, | |||
| 228 | + | {name: "missing origin", version: "v0.8.5-0.20300102030405-bbd397409ebe"}, | |||
| 229 | + | {name: "named origin ref", version: "v0.8.5-0.20300102030405-bbd397409ebe", revision: "bbd397409ebed75a5979c1e4566a2ef319f6a484", ref: "main"}, | |||
| 230 | + | } { | |||
| 231 | + | t.Run(test.name, func(t *testing.T) { | |||
| 232 | + | temp := t.TempDir() | |||
| 233 | + | runtime := filepath.Join(temp, "cef-147-runtime") | |||
| 234 | + | require.NoError(t, os.Mkdir(runtime, 0o755)) | |||
| 235 | + | binary := filepath.Join(temp, "dumber") | |||
| 236 | + | require.NoError(t, os.WriteFile(binary, collectorTestBinary(validFirstPresentationLog), 0o755)) | |||
| 237 | + | ||||
| 238 | + | goBin := collectorProvenanceGo(t, temp, test.version, test.revision, test.ref) | |||
| 239 | + | output := filepath.Join(temp, "artifacts") | |||
| 240 | + | cmd := exec.Command(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |||
| 241 | + | cmd.Dir = repoRoot | |||
| 242 | + | cmd.Env = append(os.Environ(), | |||
| 243 | + | "DISPLAY=:test", | |||
| 244 | + | "DUMBER_CEF_DIR="+runtime, | |||
| 245 | + | "DUMBER_FIRST_PRESENTATION_BIN="+binary, | |||
| 246 | + | "DUMBER_FIRST_PRESENTATION_OUTPUT="+output, | |||
| 247 | + | "PATH="+filepath.Dir(goBin)+":"+os.Getenv("PATH"), | |||
| 248 | + | ) | |||
| 249 | + | result, runErr := cmd.CombinedOutput() | |||
| 250 | + | require.Errorf(t, runErr, "collector accepted nonimmutable module provenance: %s", result) | |||
| 251 | + | require.Contains(t, string(result), "immutable module provenance is unavailable") | |||
| 252 | + | require.NotContains(t, string(result), temp) | |||
| 253 | + | require.NoFileExists(t, filepath.Join(output, "metadata.json")) | |||
| 254 | + | for _, name := range runArtifactNames() { | |||
| 255 | + | require.NoFileExists(t, filepath.Join(output, name)) | |||
| 256 | + | } | |||
| 257 | + | }) | |||
| 258 | + | } | |||
| 259 | + | } | |||
| 260 | + | ||||
| 261 | + | func collectorProvenanceGo(t *testing.T, temp, version, revision, ref string) string { | |||
| 262 | + | t.Helper() | |||
| 263 | + | infoPath := filepath.Join(temp, "module.info") | |||
| 264 | + | info := map[string]any{"Version": version} | |||
| 265 | + | if revision != "" { | |||
| 266 | + | info["Origin"] = map[string]string{ | |||
| 267 | + | "VCS": "git", "URL": "https://github.com/bnema/purego-cef2gtk", "Hash": revision, "Ref": ref, | |||
| 268 | + | } | |||
| 269 | + | } | |||
| 270 | + | infoJSON, err := json.Marshal(info) | |||
| 271 | + | require.NoError(t, err) | |||
| 272 | + | require.NoError(t, os.WriteFile(infoPath, infoJSON, 0o600)) | |||
| 273 | + | ||||
| 274 | + | selectedJSON, err := json.Marshal(map[string]string{ | |||
| 275 | + | "Path": "github.com/bnema/purego-cef2gtk", "Version": version, | |||
| 276 | + | }) | |||
| 277 | + | require.NoError(t, err) | |||
| 278 | + | downloadedJSON, err := json.Marshal(map[string]string{ | |||
| 279 | + | "Path": "github.com/bnema/purego-cef2gtk", "Version": version, "Info": infoPath, | |||
| 280 | + | }) | |||
| 281 | + | require.NoError(t, err) | |||
| 282 | + | binDir := filepath.Join(temp, "bin") | |||
| 283 | + | require.NoError(t, os.Mkdir(binDir, 0o755)) | |||
| 284 | + | goBin := filepath.Join(binDir, "go") | |||
| 285 | + | script := fmt.Sprintf(`#!/bin/sh | |||
| 286 | + | if [ "$1" = "list" ] && [ "$2" = "-m" ] && [ "$3" = "-json" ] && [ "$4" = "github.com/bnema/purego-cef2gtk" ]; then | |||
| 287 | + | printf '%%s\n' '%s' | |||
| 288 | + | exit 0 | |||
| 289 | + | fi | |||
| 290 | + | if [ "$1" = "mod" ] && [ "$2" = "download" ] && [ "$3" = "-json" ] && [ "$4" = "github.com/bnema/purego-cef2gtk@%s" ]; then | |||
| 291 | + | printf '%%s\n' '%s' | |||
| 292 | + | exit 0 | |||
| 293 | + | fi | |||
| 294 | + | exit 1 | |||
| 295 | + | `, selectedJSON, version, downloadedJSON) | |||
| 296 | + | require.NoError(t, os.WriteFile(goBin, []byte(script), 0o755)) | |||
| 297 | + | return goBin | |||
| 298 | + | } | |||
| 299 | + | ||||
| 169 | func TestFirstPresentationCollectorDefaultsToXDGStateEvidenceDirectory(t *testing.T) { | 300 | func TestFirstPresentationCollectorDefaultsToXDGStateEvidenceDirectory(t *testing.T) { | ||
| 170 | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | 301 | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | ||
| 171 | require.NoError(t, err) | 302 | require.NoError(t, err) | ||
M scripts/collect_first_presentation.sh +78 -9
| @@ -31,8 +31,78 @@ else | |||
| 31 | 31 | fi | |
| 32 | 32 | readonly output | |
| 33 | 33 | readonly upstream_module="github.com/bnema/purego-cef2gtk" | |
| 34 | - | readonly upstream_tag="v0.8.4" | |
| 35 | - | readonly upstream_revision="f217ece342dea3ef2a3f98671fcd16a39ad0037d" | |
| 34 | + | ||
| 35 | + | # Resolve the version selected by this checkout, then obtain its immutable VCS | |
| 36 | + | # origin from Go's cached module metadata. Do not infer a revision from a tag, | |
| 37 | + | # a branch, or a truncated pseudo-version suffix. | |
| 38 | + | resolve_upstream_provenance() { | |
| 39 | + | local selected_metadata selected_version downloaded_metadata | |
| 40 | + | ||
| 41 | + | selected_metadata="$(go list -m -json "$upstream_module" 2>/dev/null)" || { | |
| 42 | + | echo "first-presentation: immutable module provenance is unavailable" >&2 | |
| 43 | + | exit 2 | |
| 44 | + | } | |
| 45 | + | selected_version="$(python3 - "$upstream_module" "$selected_metadata" <<'PY' | |
| 46 | + | import json, sys | |
| 47 | + | try: | |
| 48 | + | metadata = json.loads(sys.argv[2]) | |
| 49 | + | if metadata.get("Path") != sys.argv[1] or not isinstance(metadata.get("Version"), str): | |
| 50 | + | raise ValueError | |
| 51 | + | print(metadata["Version"]) | |
| 52 | + | except (AttributeError, TypeError, ValueError, json.JSONDecodeError): | |
| 53 | + | raise SystemExit("first-presentation: immutable module provenance is unavailable") | |
| 54 | + | PY | |
| 55 | + | )" || exit $? | |
| 56 | + | downloaded_metadata="$(go mod download -json "$upstream_module@$selected_version" 2>/dev/null)" || { | |
| 57 | + | echo "first-presentation: immutable module provenance is unavailable" >&2 | |
| 58 | + | exit 2 | |
| 59 | + | } | |
| 60 | + | ||
| 61 | + | python3 - "$upstream_module" "$selected_metadata" "$downloaded_metadata" <<'PY' | |
| 62 | + | import json, re, sys | |
| 63 | + | ||
| 64 | + | module, selected_raw, downloaded_raw = sys.argv[1:] | |
| 65 | + | ||
| 66 | + | def fail(): | |
| 67 | + | # Do not expose Go cache locations or other machine-local values. | |
| 68 | + | raise SystemExit("first-presentation: immutable module provenance is unavailable") | |
| 69 | + | ||
| 70 | + | try: | |
| 71 | + | selected = json.loads(selected_raw) | |
| 72 | + | downloaded = json.loads(downloaded_raw) | |
| 73 | + | version = selected["Version"] | |
| 74 | + | if selected.get("Path") != module or downloaded.get("Path") != module: | |
| 75 | + | fail() | |
| 76 | + | if downloaded.get("Version") != version: | |
| 77 | + | fail() | |
| 78 | + | # A selected pseudo-version is an exact immutable selector, never a branch. | |
| 79 | + | match = re.fullmatch(r"(v\d+\.\d+\.\d+)-0\.\d{14}-([0-9a-f]{12})", version) | |
| 80 | + | if not match: | |
| 81 | + | fail() | |
| 82 | + | info_path = downloaded.get("Info") | |
| 83 | + | if not isinstance(info_path, str) or not info_path: | |
| 84 | + | fail() | |
| 85 | + | with open(info_path, encoding="utf-8") as info_file: | |
| 86 | + | info = json.load(info_file) | |
| 87 | + | origin = info.get("Origin") or downloaded.get("Origin") | |
| 88 | + | if info.get("Version") != version or not isinstance(origin, dict): | |
| 89 | + | fail() | |
| 90 | + | revision = origin.get("Hash") | |
| 91 | + | if origin.get("VCS") != "git" or origin.get("URL") != "https://github.com/bnema/purego-cef2gtk": | |
| 92 | + | fail() | |
| 93 | + | if not isinstance(revision, str) or not re.fullmatch(r"[0-9a-f]{40}", revision): | |
| 94 | + | fail() | |
| 95 | + | if not revision.startswith(match.group(2)): | |
| 96 | + | fail() | |
| 97 | + | # A named ref can move. Only the immutable hash itself is acceptable. | |
| 98 | + | if origin.get("Ref") not in (None, "", revision): | |
| 99 | + | fail() | |
| 100 | + | except (AttributeError, KeyError, OSError, TypeError, ValueError, json.JSONDecodeError): | |
| 101 | + | fail() | |
| 102 | + | ||
| 103 | + | print("\t".join((version, match.group(1), revision))) | |
| 104 | + | PY | |
| 105 | + | } | |
| 36 | 106 | ||
| 37 | 107 | # The artifact destination is caller-controlled. Never empty or recursively | |
| 38 | 108 | # clear it: collection only writes to a newly-created directory whose parent is | |
| @@ -66,10 +136,9 @@ prepare_output | |||
| 66 | 136 | [[ -x "$binary" ]] || { echo "first-presentation: executable not found: $binary" >&2; exit 2; } | |
| 67 | 137 | [[ -d "$runtime" ]] || { echo "first-presentation: CEF runtime not found: $runtime" >&2; exit 2; } | |
| 68 | 138 | [[ -n "${WAYLAND_DISPLAY:-}${DISPLAY:-}" ]] || { echo "first-presentation: a current Wayland/X11 display is required" >&2; exit 2; } | |
| 69 | - | [[ "$(go list -m -f '{{.Version}}' "$upstream_module")" == "$upstream_tag" ]] || { | |
| 70 | - | echo "first-presentation: expected $upstream_module@$upstream_tag" >&2 | |
| 71 | - | exit 2 | |
| 72 | - | } | |
| 139 | + | upstream_provenance="$(resolve_upstream_provenance)" || exit $? | |
| 140 | + | IFS=$'\t' read -r upstream_version upstream_tag upstream_revision <<<"$upstream_provenance" | |
| 141 | + | readonly upstream_version upstream_tag upstream_revision | |
| 73 | 142 | ||
| 74 | 143 | # Raw logs and temporary XDG homes may contain machine-local paths. Keep them | |
| 75 | 144 | # outside the committed artifact directory and always remove them. | |
| @@ -80,9 +149,9 @@ cleanup_work_root() { | |||
| 80 | 149 | rm -rf -- "$work_root" | |
| 81 | 150 | } | |
| 82 | 151 | trap cleanup_work_root EXIT | |
| 83 | - | python3 - "$output/metadata.json" "$binary" "$timeout_seconds" "$upstream_module" "$upstream_tag" "$upstream_revision" <<'PY' | |
| 152 | + | python3 - "$output/metadata.json" "$binary" "$timeout_seconds" "$upstream_module" "$upstream_version" "$upstream_tag" "$upstream_revision" <<'PY' | |
| 84 | 153 | import hashlib, json, os, platform, subprocess, sys | |
| 85 | - | path, binary, timeout, upstream_module, upstream_tag, upstream_revision = sys.argv[1:] | |
| 154 | + | path, binary, timeout, upstream_module, upstream_version, upstream_tag, upstream_revision = sys.argv[1:] | |
| 86 | 155 | with open(binary, "rb") as candidate: | |
| 87 | 156 | binary_sha256 = hashlib.file_digest(candidate, "sha256").hexdigest() | |
| 88 | 157 | ||
| @@ -102,7 +171,7 @@ json.dump({ | |||
| 102 | 171 | "binary": {"label": "dumber", "sha256": binary_sha256}, | |
| 103 | 172 | "timeout_seconds": int(timeout), | |
| 104 | 173 | "measured_source_revision": subprocess.check_output(["git", "-c", f"safe.directory={os.getcwd()}", "rev-parse", "HEAD"], text=True).strip(), | |
| 105 | - | "upstream": {"module": upstream_module, "tag": upstream_tag, "revision": upstream_revision}, | |
| 174 | + | "upstream": {"module": upstream_module, "version": upstream_version, "tag": upstream_tag, "revision": upstream_revision}, | |
| 106 | 175 | "comparison": {"os": os_label, "architecture": architecture, "display_protocol": display_protocol, "machine_gpu_profile": gpu_profile}, | |
| 107 | 176 | "render_configuration": {"backend": "gdk-dmabuf", "buffer_sharing": "dmabuf", "renderer": "vulkan"} | |
| 108 | 177 | }, open(path, "w"), indent=2, sort_keys=True) | |
| @@ -31,8 +31,78 @@ else | |||||
| 31 | fi | 31 | fi | ||
| 32 | readonly output | 32 | readonly output | ||
| 33 | readonly upstream_module="github.com/bnema/purego-cef2gtk" | 33 | readonly upstream_module="github.com/bnema/purego-cef2gtk" | ||
| 34 | - | readonly upstream_tag="v0.8.4" | 34 | + | |
| 35 | - | readonly upstream_revision="f217ece342dea3ef2a3f98671fcd16a39ad0037d" | 35 | + | # Resolve the version selected by this checkout, then obtain its immutable VCS |
| 36 | + | # origin from Go's cached module metadata. Do not infer a revision from a tag, | |||
| 37 | + | # a branch, or a truncated pseudo-version suffix. | |||
| 38 | + | resolve_upstream_provenance() { | |||
| 39 | + | local selected_metadata selected_version downloaded_metadata | |||
| 40 | + | ||||
| 41 | + | selected_metadata="$(go list -m -json "$upstream_module" 2>/dev/null)" || { | |||
| 42 | + | echo "first-presentation: immutable module provenance is unavailable" >&2 | |||
| 43 | + | exit 2 | |||
| 44 | + | } | |||
| 45 | + | selected_version="$(python3 - "$upstream_module" "$selected_metadata" <<'PY' | |||
| 46 | + | import json, sys | |||
| 47 | + | try: | |||
| 48 | + | metadata = json.loads(sys.argv[2]) | |||
| 49 | + | if metadata.get("Path") != sys.argv[1] or not isinstance(metadata.get("Version"), str): | |||
| 50 | + | raise ValueError | |||
| 51 | + | print(metadata["Version"]) | |||
| 52 | + | except (AttributeError, TypeError, ValueError, json.JSONDecodeError): | |||
| 53 | + | raise SystemExit("first-presentation: immutable module provenance is unavailable") | |||
| 54 | + | PY | |||
| 55 | + | )" || exit $? | |||
| 56 | + | downloaded_metadata="$(go mod download -json "$upstream_module@$selected_version" 2>/dev/null)" || { | |||
| 57 | + | echo "first-presentation: immutable module provenance is unavailable" >&2 | |||
| 58 | + | exit 2 | |||
| 59 | + | } | |||
| 60 | + | ||||
| 61 | + | python3 - "$upstream_module" "$selected_metadata" "$downloaded_metadata" <<'PY' | |||
| 62 | + | import json, re, sys | |||
| 63 | + | ||||
| 64 | + | module, selected_raw, downloaded_raw = sys.argv[1:] | |||
| 65 | + | ||||
| 66 | + | def fail(): | |||
| 67 | + | # Do not expose Go cache locations or other machine-local values. | |||
| 68 | + | raise SystemExit("first-presentation: immutable module provenance is unavailable") | |||
| 69 | + | ||||
| 70 | + | try: | |||
| 71 | + | selected = json.loads(selected_raw) | |||
| 72 | + | downloaded = json.loads(downloaded_raw) | |||
| 73 | + | version = selected["Version"] | |||
| 74 | + | if selected.get("Path") != module or downloaded.get("Path") != module: | |||
| 75 | + | fail() | |||
| 76 | + | if downloaded.get("Version") != version: | |||
| 77 | + | fail() | |||
| 78 | + | # A selected pseudo-version is an exact immutable selector, never a branch. | |||
| 79 | + | match = re.fullmatch(r"(v\d+\.\d+\.\d+)-0\.\d{14}-([0-9a-f]{12})", version) | |||
| 80 | + | if not match: | |||
| 81 | + | fail() | |||
| 82 | + | info_path = downloaded.get("Info") | |||
| 83 | + | if not isinstance(info_path, str) or not info_path: | |||
| 84 | + | fail() | |||
| 85 | + | with open(info_path, encoding="utf-8") as info_file: | |||
| 86 | + | info = json.load(info_file) | |||
| 87 | + | origin = info.get("Origin") or downloaded.get("Origin") | |||
| 88 | + | if info.get("Version") != version or not isinstance(origin, dict): | |||
| 89 | + | fail() | |||
| 90 | + | revision = origin.get("Hash") | |||
| 91 | + | if origin.get("VCS") != "git" or origin.get("URL") != "https://github.com/bnema/purego-cef2gtk": | |||
| 92 | + | fail() | |||
| 93 | + | if not isinstance(revision, str) or not re.fullmatch(r"[0-9a-f]{40}", revision): | |||
| 94 | + | fail() | |||
| 95 | + | if not revision.startswith(match.group(2)): | |||
| 96 | + | fail() | |||
| 97 | + | # A named ref can move. Only the immutable hash itself is acceptable. | |||
| 98 | + | if origin.get("Ref") not in (None, "", revision): | |||
| 99 | + | fail() | |||
| 100 | + | except (AttributeError, KeyError, OSError, TypeError, ValueError, json.JSONDecodeError): | |||
| 101 | + | fail() | |||
| 102 | + | ||||
| 103 | + | print("\t".join((version, match.group(1), revision))) | |||
| 104 | + | PY | |||
| 105 | + | } | |||
| 36 | 106 | ||||
| 37 | # The artifact destination is caller-controlled. Never empty or recursively | 107 | # The artifact destination is caller-controlled. Never empty or recursively | ||
| 38 | # clear it: collection only writes to a newly-created directory whose parent is | 108 | # clear it: collection only writes to a newly-created directory whose parent is | ||
| @@ -66,10 +136,9 @@ prepare_output | |||||
| 66 | [[ -x "$binary" ]] || { echo "first-presentation: executable not found: $binary" >&2; exit 2; } | 136 | [[ -x "$binary" ]] || { echo "first-presentation: executable not found: $binary" >&2; exit 2; } | ||
| 67 | [[ -d "$runtime" ]] || { echo "first-presentation: CEF runtime not found: $runtime" >&2; exit 2; } | 137 | [[ -d "$runtime" ]] || { echo "first-presentation: CEF runtime not found: $runtime" >&2; exit 2; } | ||
| 68 | [[ -n "${WAYLAND_DISPLAY:-}${DISPLAY:-}" ]] || { echo "first-presentation: a current Wayland/X11 display is required" >&2; exit 2; } | 138 | [[ -n "${WAYLAND_DISPLAY:-}${DISPLAY:-}" ]] || { echo "first-presentation: a current Wayland/X11 display is required" >&2; exit 2; } | ||
| 69 | - | [[ "$(go list -m -f '{{.Version}}' "$upstream_module")" == "$upstream_tag" ]] || { | 139 | + | upstream_provenance="$(resolve_upstream_provenance)" || exit $? |
| 70 | - | echo "first-presentation: expected $upstream_module@$upstream_tag" >&2 | 140 | + | IFS=$'\t' read -r upstream_version upstream_tag upstream_revision <<<"$upstream_provenance" |
| 71 | - | exit 2 | 141 | + | readonly upstream_version upstream_tag upstream_revision |
| 72 | - | } | |||
| 73 | 142 | ||||
| 74 | # Raw logs and temporary XDG homes may contain machine-local paths. Keep them | 143 | # Raw logs and temporary XDG homes may contain machine-local paths. Keep them | ||
| 75 | # outside the committed artifact directory and always remove them. | 144 | # outside the committed artifact directory and always remove them. | ||
| @@ -80,9 +149,9 @@ cleanup_work_root() { | |||||
| 80 | rm -rf -- "$work_root" | 149 | rm -rf -- "$work_root" | ||
| 81 | } | 150 | } | ||
| 82 | trap cleanup_work_root EXIT | 151 | trap cleanup_work_root EXIT | ||
| 83 | - | python3 - "$output/metadata.json" "$binary" "$timeout_seconds" "$upstream_module" "$upstream_tag" "$upstream_revision" <<'PY' | 152 | + | python3 - "$output/metadata.json" "$binary" "$timeout_seconds" "$upstream_module" "$upstream_version" "$upstream_tag" "$upstream_revision" <<'PY' |
| 84 | import hashlib, json, os, platform, subprocess, sys | 153 | import hashlib, json, os, platform, subprocess, sys | ||
| 85 | - | path, binary, timeout, upstream_module, upstream_tag, upstream_revision = sys.argv[1:] | 154 | + | path, binary, timeout, upstream_module, upstream_version, upstream_tag, upstream_revision = sys.argv[1:] |
| 86 | with open(binary, "rb") as candidate: | 155 | with open(binary, "rb") as candidate: | ||
| 87 | binary_sha256 = hashlib.file_digest(candidate, "sha256").hexdigest() | 156 | binary_sha256 = hashlib.file_digest(candidate, "sha256").hexdigest() | ||
| 88 | 157 | ||||
| @@ -102,7 +171,7 @@ json.dump({ | |||||
| 102 | "binary": {"label": "dumber", "sha256": binary_sha256}, | 171 | "binary": {"label": "dumber", "sha256": binary_sha256}, | ||
| 103 | "timeout_seconds": int(timeout), | 172 | "timeout_seconds": int(timeout), | ||
| 104 | "measured_source_revision": subprocess.check_output(["git", "-c", f"safe.directory={os.getcwd()}", "rev-parse", "HEAD"], text=True).strip(), | 173 | "measured_source_revision": subprocess.check_output(["git", "-c", f"safe.directory={os.getcwd()}", "rev-parse", "HEAD"], text=True).strip(), | ||
| 105 | - | "upstream": {"module": upstream_module, "tag": upstream_tag, "revision": upstream_revision}, | 174 | + | "upstream": {"module": upstream_module, "version": upstream_version, "tag": upstream_tag, "revision": upstream_revision}, |
| 106 | "comparison": {"os": os_label, "architecture": architecture, "display_protocol": display_protocol, "machine_gpu_profile": gpu_profile}, | 175 | "comparison": {"os": os_label, "architecture": architecture, "display_protocol": display_protocol, "machine_gpu_profile": gpu_profile}, | ||
| 107 | "render_configuration": {"backend": "gdk-dmabuf", "buffer_sharing": "dmabuf", "renderer": "vulkan"} | 176 | "render_configuration": {"backend": "gdk-dmabuf", "buffer_sharing": "dmabuf", "renderer": "vulkan"} | ||
| 108 | }, open(path, "w"), indent=2, sort_keys=True) | 177 | }, open(path, "w"), indent=2, sort_keys=True) | ||
M vendor/github.com/bnema/purego-cef/cef/bridge.go +8 -13 generated file: collapsed
M vendor/github.com/bnema/purego-cef2gtk/internal/cefadapter/accelerated_paint.go +34 -37 generated file: collapsed
M vendor/github.com/bnema/purego-cef2gtk/internal/dmabuf/frame.go +38 -19 generated file: collapsed
M vendor/github.com/bnema/purego-cef2gtk/internal/gtkgdk/renderer.go +89 -69 generated file: collapsed
M vendor/github.com/bnema/purego-pipewire/internal/core/player.go +5 -0 generated file: collapsed
M vendor/github.com/bnema/purego-pipewire/internal/core/player_rt.go +10 -6 generated file: collapsed
M vendor/github.com/bnema/purego-pipewire/internal/core/pwbuffer.go +66 -32 generated file: collapsed
M vendor/github.com/bnema/purego-sqlite/driver/driver.go +268 -63 generated file: collapsed
M vendor/github.com/bnema/purego-sqlite/internal/core/db.go +8 -0 generated file: collapsed
M vendor/github.com/bnema/purego-sqlite/internal/core/rows.go +13 -0 generated file: collapsed
M vendor/github.com/bnema/purego-sqlite/internal/loader/loader.go +23 -5 generated file: collapsed
M vendor/github.com/bnema/purego-sqlite/internal/ports/in/ports_gen.go +3 -0 generated file: collapsed
M vendor/github.com/bnema/puregotk/internal/core/core.go +197 -4 generated file: collapsed
M vendor/github.com/bnema/puregotk/pkg/core/core.go +10 -0 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-about-dialog.go +99 -64 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-about-window.go +95 -62 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-accent-color.go +7 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-action-row.go +33 -29 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-alert-dialog.go +66 -47 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-animation-target.go +10 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-animation-util.go +4 -12 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-animation.go +24 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-application-window.go +14 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-application.go +3 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-avatar.go +22 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-banner.go +23 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-bin.go +5 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-bottom-sheet.go +47 -38 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-breakpoint-bin.go +10 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-breakpoint.go +33 -37 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-button-content.go +18 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-button-row.go +10 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-carousel-indicator-dots.go +5 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-carousel-indicator-lines.go +5 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-carousel.go +47 -37 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-clamp-layout.go +14 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-clamp-scrollable.go +17 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-clamp.go +17 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-combo-row.go +34 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-dialog.go +45 -38 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-easing.go +3 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-entry-row.go +40 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-enum-list-model.go +13 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-expander-row.go +40 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-flap.go +61 -48 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-fold-threshold-policy.go +10 -1 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-header-bar.go +36 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-inline-view-switcher.go +18 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-layout-slot.go +4 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-layout.go +7 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-leaflet.go +69 -56 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-length-unit.go +5 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-main.go +5 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-message-dialog.go +63 -44 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-multi-layout-view.go +17 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-navigation-direction.go +10 -1 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-navigation-split-view.go +36 -32 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-navigation-view.go +60 -49 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-overlay-split-view.go +48 -38 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-password-entry-row.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-dialog.go +23 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-group.go +24 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-page.go +38 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-row.go +18 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-window.go +31 -29 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-shortcut-label.go +10 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-shortcuts-dialog.go +4 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-shortcuts-item.go +23 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-shortcuts-section.go +8 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-sidebar-item.go +45 -37 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-sidebar-section.go +24 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-sidebar.go +41 -39 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spin-row.go +40 -34 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spinner-paintable.go +5 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spinner.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-split-button.go +39 -34 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spring-animation.go +34 -30 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spring-params.go +17 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-squeezer.go +49 -44 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-status-page.go +20 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-style-manager.go +25 -28 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-swipe-tracker.go +33 -30 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-swipeable.go +33 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-switch-row.go +6 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-bar.go +35 -32 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-button.go +5 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-overview.go +45 -37 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-view.go +123 -87 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-timed-animation.go +30 -28 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toast-overlay.go +9 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toast.go +41 -36 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toggle-group.go +64 -51 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toolbar-view.go +40 -35 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-version.go +7 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-stack.go +78 -62 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-switcher-bar.go +9 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-switcher-sidebar.go +15 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-switcher-title.go +19 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-switcher.go +10 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-window-title.go +10 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-window.go +14 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-wrap-box.go +66 -46 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-wrap-layout.go +57 -46 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/cairo/main.go +36 -79 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkapplaunchcontext.go +10 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcairo.go +12 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcairocontext.go +3 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcicpparams.go +20 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkclipboard.go +34 -32 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcolorstate.go +12 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcontentdeserializer.go +26 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcontentformats.go +28 -31 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcontentprovider.go +23 -28 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcontentserializer.go +26 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcursor.go +12 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdevice.go +36 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdevicepad.go +27 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdevicetool.go +10 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdisplay.go +51 -43 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdisplaymanager.go +10 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdmabuftexture.go +3 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdmabuftexturebuilder.go +53 -41 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdrag.go +20 -28 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdragsurface.go +6 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdragsurfacesize.go +3 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdrawcontext.go +11 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdrop.go +19 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkenums.go +21 -1 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkevents.go +120 -118 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkframeclock.go +22 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkframetimings.go +17 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkglcontext.go +40 -36 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkgltexture.go +4 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkgltexturebuilder.go +41 -35 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkkeys.go +19 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkmemorytexture.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkmemorytexturebuilder.go +42 -35 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkmonitor.go +27 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkpaintable.go +63 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkpango.go +4 -12 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkpixbuf.go +2 -12 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkpopup.go +47 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkpopuplayout.go +36 -32 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkrgba.go +19 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkseat.go +11 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdksnapshot.go +7 -0 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdksurface.go +46 -40 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdktexture.go +27 -31 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdktoplevel.go +157 -66 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdktoplevellayout.go +24 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdktoplevelsize.go +9 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdktypes.go +95 -72 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkvulkancontext.go +3 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/gdk-pixbuf-animation.go +26 -32 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/gdk-pixbuf-core.go +9 -0 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/gdk-pixbuf-io.go +25 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/gdk-pixbuf-loader.go +13 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/gdk-pixbuf-simple-anim.go +8 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/gdk-pixbuf-transform.go +11 -1 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/gdk-pixbuf.go +102 -79 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/main.go +5 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gaction.go +59 -31 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gactiongroup.go +96 -39 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gactionmap.go +33 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gappinfo.go +244 -116 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gapplication.go +79 -55 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gapplicationcommandline.go +31 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gasyncinitable.go +25 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gasyncresult.go +26 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gbufferedinputstream.go +26 -29 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gbufferedoutputstream.go +11 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gbytesicon.go +4 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gcancellable.go +26 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gcharsetconverter.go +8 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gcontenttype.go +30 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gconverter.go +23 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gconverterinputstream.go +3 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gconverteroutputstream.go +3 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gcredentials.go +12 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdatagrambased.go +45 -30 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdatainputstream.go +31 -35 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdataoutputstream.go +14 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusactiongroup.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusaddress.go +10 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusauthobserver.go +6 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusconnection.go +77 -66 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbuserror.go +16 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusinterface.go +26 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusinterfaceskeleton.go +25 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusintrospection.go +54 -56 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusmenumodel.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusmessage.go +88 -64 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusmethodinvocation.go +35 -30 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusnameowning.go +10 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusnamewatching.go +10 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusobject.go +19 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusobjectmanager.go +26 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusobjectmanagerclient.go +16 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusobjectmanagerserver.go +13 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusobjectproxy.go +3 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusobjectskeleton.go +12 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusproxy.go +42 -38 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusserver.go +14 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusutils.go +24 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdebugcontroller.go +12 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdebugcontrollerdbus.go +4 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdrive.go +214 -82 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdtlsclientconnection.go +34 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdtlsconnection.go +207 -80 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdtlsserverconnection.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gemblem.go +6 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gemblemedicon.go +9 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfile.go +1148 -450 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfileattribute.go +13 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfileenumerator.go +34 -35 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfileicon.go +3 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfileinfo.go +138 -84 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfileinputstream.go +17 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfileiostream.go +23 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfilemonitor.go +9 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfilenamecompleter.go +8 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfileoutputstream.go +23 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfilterinputstream.go +6 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfilteroutputstream.go +6 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gicon.go +32 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/ginetaddress.go +40 -34 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/ginetaddressmask.go +14 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/ginetsocketaddress.go +10 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/ginitable.go +11 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/ginputstream.go +52 -48 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gioenums.go +90 -1 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gioerror.go +6 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/giomodule.go +26 -29 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gioscheduler.go +4 -12 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/giostream.go +25 -29 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/giotypes.go +70 -60 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/giptosmessage.go +6 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gipv6tclassmessage.go +6 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/glistmodel.go +33 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gliststore.go +22 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gloadableicon.go +27 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gmemoryinputstream.go +8 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gmemorymonitor.go +2 -12 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gmemoryoutputstream.go +13 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gmenu.go +62 -50 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gmenumodel.go +31 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gmount.go +215 -86 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gmountoperation.go +40 -32 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gnativesocketaddress.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gnativevolumemonitor.go +7 -0 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gnetworkaddress.go +11 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gnetworking.go +3 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gnetworkmonitor.go +49 -31 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gnetworkservice.go +12 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gnotification.go +26 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/goutputstream.go +86 -72 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gpermission.go +33 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gpollableinputstream.go +30 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gpollableoutputstream.go +41 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gpollableutils.go +7 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gpowerprofilemonitor.go +7 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gpropertyaction.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gproxy.go +35 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gproxyaddress.go +16 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gproxyaddressenumerator.go +7 -0 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gproxyresolver.go +35 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gremoteactiongroup.go +12 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gresolver.go +75 -67 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gresource.go +19 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gseekable.go +41 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsettings.go +99 -67 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsettingsbackend.go +19 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsettingsschema.go +48 -43 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsimpleaction.go +9 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsimpleactiongroup.go +9 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsimpleasyncresult.go +46 -40 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsimpleiostream.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsimplepermission.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsimpleproxyresolver.go +8 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsocket.go +87 -72 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsocketaddress.go +11 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsocketaddressenumerator.go +13 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsocketclient.go +54 -44 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsocketconnectable.go +19 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsocketconnection.go +14 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsocketcontrolmessage.go +10 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsocketlistener.go +18 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsocketservice.go +8 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsrvtarget.go +2 -11 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsubprocess.go +40 -39 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsubprocesslauncher.go +34 -31 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gtask.go +70 -52
| @@ -5,7 +5,6 @@ import ( | |||
| 5 | 5 | "structs" | |
| 6 | 6 | "unsafe" | |
| 7 | 7 | ||
| 8 | - | "github.com/bnema/purego" | |
| 9 | 8 | "github.com/bnema/puregotk/pkg/core" | |
| 10 | 9 | "github.com/bnema/puregotk/v4/glib" | |
| 11 | 10 | "github.com/bnema/puregotk/v4/gobject" | |
| @@ -611,6 +610,7 @@ type Task struct { | |||
| 611 | 610 | var xTaskGLibType func() types.GType | |
| 612 | 611 | ||
| 613 | 612 | func TaskGLibType() types.GType { | |
| 613 | + | core.LazyRegister(&xTaskGLibType, "GIO", "g_task_get_type", false) | |
| 614 | 614 | return xTaskGLibType() | |
| 615 | 615 | } | |
| 616 | 616 | ||
| @@ -639,6 +639,7 @@ var xNewTask func(uintptr, uintptr, uintptr, uintptr) uintptr | |||
| 639 | 639 | // do not want this behavior, you can use | |
| 640 | 640 | // g_task_set_check_cancellable() to change it. | |
| 641 | 641 | func NewTask(SourceObjectVar *gobject.Object, CancellableVar *Cancellable, CallbackVar *AsyncReadyCallback, CallbackDataVar uintptr) *Task { | |
| 642 | + | core.LazyRegister(&xNewTask, "GIO", "g_task_new", false) | |
| 642 | 643 | var cls *Task | |
| 643 | 644 | ||
| 644 | 645 | cret := xNewTask(SourceObjectVar.GoPointer(), CancellableVar.GoPointer(), glib.NewCallbackNullable(CallbackVar), CallbackDataVar) | |
| @@ -665,6 +666,8 @@ var xTaskAttachSource func(uintptr, *glib.Source, uintptr) | |||
| 665 | 666 | // | |
| 666 | 667 | // This takes a reference on @task until @source is destroyed. | |
| 667 | 668 | func (x *Task) AttachSource(SourceVar *glib.Source, CallbackVar *glib.SourceFunc) { | |
| 669 | + | core.LazyRegister(&xTaskAttachSource, "GIO", "g_task_attach_source", false) | |
| 670 | + | ||
| 668 | 671 | xTaskAttachSource(x.GoPointer(), SourceVar, glib.NewCallback(CallbackVar)) | |
| 669 | 672 | } | |
| 670 | 673 | ||
| @@ -672,6 +675,7 @@ var xTaskGetCancellable func(uintptr) uintptr | |||
| 672 | 675 | ||
| 673 | 676 | // Gets @task's #GCancellable | |
| 674 | 677 | func (x *Task) GetCancellable() *Cancellable { | |
| 678 | + | core.LazyRegister(&xTaskGetCancellable, "GIO", "g_task_get_cancellable", false) | |
| 675 | 679 | var cls *Cancellable | |
| 676 | 680 | ||
| 677 | 681 | cret := xTaskGetCancellable(x.GoPointer()) | |
| @@ -690,6 +694,8 @@ var xTaskGetCheckCancellable func(uintptr) bool | |||
| 690 | 694 | // Gets @task's check-cancellable flag. See | |
| 691 | 695 | // g_task_set_check_cancellable() for more details. | |
| 692 | 696 | func (x *Task) GetCheckCancellable() bool { | |
| 697 | + | core.LazyRegister(&xTaskGetCheckCancellable, "GIO", "g_task_get_check_cancellable", false) | |
| 698 | + | ||
| 693 | 699 | cret := xTaskGetCheckCancellable(x.GoPointer()) | |
| 694 | 700 | return cret | |
| 695 | 701 | } | |
| @@ -700,6 +706,8 @@ var xTaskGetCompleted func(uintptr) bool | |||
| 700 | 706 | // the task’s callback is invoked, and will return %FALSE if called from inside | |
| 701 | 707 | // the callback. | |
| 702 | 708 | func (x *Task) GetCompleted() bool { | |
| 709 | + | core.LazyRegister(&xTaskGetCompleted, "GIO", "g_task_get_completed", false) | |
| 710 | + | ||
| 703 | 711 | cret := xTaskGetCompleted(x.GoPointer()) | |
| 704 | 712 | return cret | |
| 705 | 713 | } | |
| @@ -714,6 +722,8 @@ var xTaskGetContext func(uintptr) uintptr | |||
| 714 | 722 | // This will always return a non-%NULL value, even if the task's | |
| 715 | 723 | // context is the default #GMainContext. | |
| 716 | 724 | func (x *Task) GetContext() *glib.MainContext { | |
| 725 | + | core.LazyRegister(&xTaskGetContext, "GIO", "g_task_get_context", false) | |
| 726 | + | ||
| 717 | 727 | cret := xTaskGetContext(x.GoPointer()) | |
| 718 | 728 | if cret == 0 { | |
| 719 | 729 | return nil | |
| @@ -725,6 +735,8 @@ var xTaskGetName func(uintptr) string | |||
| 725 | 735 | ||
| 726 | 736 | // Gets @task’s name. See g_task_set_name(). | |
| 727 | 737 | func (x *Task) GetName() string { | |
| 738 | + | core.LazyRegister(&xTaskGetName, "GIO", "g_task_get_name", false) | |
| 739 | + | ||
| 728 | 740 | cret := xTaskGetName(x.GoPointer()) | |
| 729 | 741 | return cret | |
| 730 | 742 | } | |
| @@ -733,6 +745,8 @@ var xTaskGetPriority func(uintptr) int | |||
| 733 | 745 | ||
| 734 | 746 | // Gets @task's priority | |
| 735 | 747 | func (x *Task) GetPriority() int { | |
| 748 | + | core.LazyRegister(&xTaskGetPriority, "GIO", "g_task_get_priority", false) | |
| 749 | + | ||
| 736 | 750 | cret := xTaskGetPriority(x.GoPointer()) | |
| 737 | 751 | return cret | |
| 738 | 752 | } | |
| @@ -742,6 +756,8 @@ var xTaskGetReturnOnCancel func(uintptr) bool | |||
| 742 | 756 | // Gets @task's return-on-cancel flag. See | |
| 743 | 757 | // g_task_set_return_on_cancel() for more details. | |
| 744 | 758 | func (x *Task) GetReturnOnCancel() bool { | |
| 759 | + | core.LazyRegister(&xTaskGetReturnOnCancel, "GIO", "g_task_get_return_on_cancel", false) | |
| 760 | + | ||
| 745 | 761 | cret := xTaskGetReturnOnCancel(x.GoPointer()) | |
| 746 | 762 | return cret | |
| 747 | 763 | } | |
| @@ -751,6 +767,7 @@ var xTaskGetSourceObject func(uintptr) uintptr | |||
| 751 | 767 | // Gets the source object from @task. Like | |
| 752 | 768 | // g_async_result_get_source_object(), but does not ref the object. | |
| 753 | 769 | func (x *Task) GetSourceObject() *gobject.Object { | |
| 770 | + | core.LazyRegister(&xTaskGetSourceObject, "GIO", "g_task_get_source_object", false) | |
| 754 | 771 | var cls *gobject.Object | |
| 755 | 772 | ||
| 756 | 773 | cret := xTaskGetSourceObject(x.GoPointer()) | |
| @@ -768,6 +785,8 @@ var xTaskGetSourceTag func(uintptr) uintptr | |||
| 768 | 785 | ||
| 769 | 786 | // Gets @task's source tag. See g_task_set_source_tag(). | |
| 770 | 787 | func (x *Task) GetSourceTag() uintptr { | |
| 788 | + | core.LazyRegister(&xTaskGetSourceTag, "GIO", "g_task_get_source_tag", false) | |
| 789 | + | ||
| 771 | 790 | cret := xTaskGetSourceTag(x.GoPointer()) | |
| 772 | 791 | return cret | |
| 773 | 792 | } | |
| @@ -776,6 +795,8 @@ var xTaskGetTaskData func(uintptr) uintptr | |||
| 776 | 795 | ||
| 777 | 796 | // Gets @task's `task_data`. | |
| 778 | 797 | func (x *Task) GetTaskData() uintptr { | |
| 798 | + | core.LazyRegister(&xTaskGetTaskData, "GIO", "g_task_get_task_data", false) | |
| 799 | + | ||
| 779 | 800 | cret := xTaskGetTaskData(x.GoPointer()) | |
| 780 | 801 | return cret | |
| 781 | 802 | } | |
| @@ -784,6 +805,8 @@ var xTaskHadError func(uintptr) bool | |||
| 784 | 805 | ||
| 785 | 806 | // Tests if @task resulted in an error. | |
| 786 | 807 | func (x *Task) HadError() bool { | |
| 808 | + | core.LazyRegister(&xTaskHadError, "GIO", "g_task_had_error", false) | |
| 809 | + | ||
| 787 | 810 | cret := xTaskHadError(x.GoPointer()) | |
| 788 | 811 | return cret | |
| 789 | 812 | } | |
| @@ -798,6 +821,7 @@ var xTaskPropagateBoolean func(uintptr, **glib.Error) bool | |||
| 798 | 821 | // Since this method transfers ownership of the return value (or | |
| 799 | 822 | // error) to the caller, you may only call it once. | |
| 800 | 823 | func (x *Task) PropagateBoolean() (bool, error) { | |
| 824 | + | core.LazyRegister(&xTaskPropagateBoolean, "GIO", "g_task_propagate_boolean", false) | |
| 801 | 825 | var cerr *glib.Error | |
| 802 | 826 | ||
| 803 | 827 | cret := xTaskPropagateBoolean(x.GoPointer(), &cerr) | |
| @@ -817,6 +841,7 @@ var xTaskPropagateInt func(uintptr, **glib.Error) int | |||
| 817 | 841 | // Since this method transfers ownership of the return value (or | |
| 818 | 842 | // error) to the caller, you may only call it once. | |
| 819 | 843 | func (x *Task) PropagateInt() (int, error) { | |
| 844 | + | core.LazyRegister(&xTaskPropagateInt, "GIO", "g_task_propagate_int", false) | |
| 820 | 845 | var cerr *glib.Error | |
| 821 | 846 | ||
| 822 | 847 | cret := xTaskPropagateInt(x.GoPointer(), &cerr) | |
| @@ -837,6 +862,7 @@ var xTaskPropagatePointer func(uintptr, **glib.Error) uintptr | |||
| 837 | 862 | // Since this method transfers ownership of the return value (or | |
| 838 | 863 | // error) to the caller, you may only call it once. | |
| 839 | 864 | func (x *Task) PropagatePointer() (uintptr, error) { | |
| 865 | + | core.LazyRegister(&xTaskPropagatePointer, "GIO", "g_task_propagate_pointer", false) | |
| 840 | 866 | var cerr *glib.Error | |
| 841 | 867 | ||
| 842 | 868 | cret := xTaskPropagatePointer(x.GoPointer(), &cerr) | |
| @@ -859,6 +885,7 @@ var xTaskPropagateValue func(uintptr, *gobject.Value, **glib.Error) bool | |||
| 859 | 885 | // Since this method transfers ownership of the return value (or | |
| 860 | 886 | // error) to the caller, you may only call it once. | |
| 861 | 887 | func (x *Task) PropagateValue(ValueVar *gobject.Value) (bool, error) { | |
| 888 | + | core.LazyRegister(&xTaskPropagateValue, "GIO", "g_task_propagate_value", false) | |
| 862 | 889 | var cerr *glib.Error | |
| 863 | 890 | ||
| 864 | 891 | cret := xTaskPropagateValue(x.GoPointer(), ValueVar, &cerr) | |
| @@ -874,6 +901,8 @@ var xTaskReturnBoolean func(uintptr, bool) | |||
| 874 | 901 | // g_task_return_pointer() for more discussion of exactly what this | |
| 875 | 902 | // means). | |
| 876 | 903 | func (x *Task) ReturnBoolean(ResultVar bool) { | |
| 904 | + | core.LazyRegister(&xTaskReturnBoolean, "GIO", "g_task_return_boolean", false) | |
| 905 | + | ||
| 877 | 906 | xTaskReturnBoolean(x.GoPointer(), ResultVar) | |
| 878 | 907 | } | |
| 879 | 908 | ||
| @@ -892,6 +921,8 @@ var xTaskReturnError func(uintptr, *glib.Error) | |||
| 892 | 921 | // See also [method@Gio.Task.return_new_error], | |
| 893 | 922 | // [method@Gio.Task.return_new_error_literal]. | |
| 894 | 923 | func (x *Task) ReturnError(ErrorVar *glib.Error) { | |
| 924 | + | core.LazyRegister(&xTaskReturnError, "GIO", "g_task_return_error", false) | |
| 925 | + | ||
| 895 | 926 | xTaskReturnError(x.GoPointer(), ErrorVar) | |
| 896 | 927 | } | |
| 897 | 928 | ||
| @@ -902,6 +933,8 @@ var xTaskReturnErrorIfCancelled func(uintptr) bool | |||
| 902 | 933 | // g_task_return_pointer() for more discussion of exactly what this | |
| 903 | 934 | // means). | |
| 904 | 935 | func (x *Task) ReturnErrorIfCancelled() bool { | |
| 936 | + | core.LazyRegister(&xTaskReturnErrorIfCancelled, "GIO", "g_task_return_error_if_cancelled", false) | |
| 937 | + | ||
| 905 | 938 | cret := xTaskReturnErrorIfCancelled(x.GoPointer()) | |
| 906 | 939 | return cret | |
| 907 | 940 | } | |
| @@ -912,6 +945,8 @@ var xTaskReturnInt func(uintptr, int) | |||
| 912 | 945 | // g_task_return_pointer() for more discussion of exactly what this | |
| 913 | 946 | // means). | |
| 914 | 947 | func (x *Task) ReturnInt(ResultVar int) { | |
| 948 | + | core.LazyRegister(&xTaskReturnInt, "GIO", "g_task_return_int", false) | |
| 949 | + | ||
| 915 | 950 | xTaskReturnInt(x.GoPointer(), ResultVar) | |
| 916 | 951 | } | |
| 917 | 952 | ||
| @@ -924,6 +959,8 @@ var xTaskReturnNewError func(uintptr, glib.Quark, int, string, ...interface{}) | |||
| 924 | 959 | // | |
| 925 | 960 | // See also g_task_return_error(). | |
| 926 | 961 | func (x *Task) ReturnNewError(DomainVar glib.Quark, CodeVar int, FormatVar string, varArgs ...interface{}) { | |
| 962 | + | core.LazyRegister(&xTaskReturnNewError, "GIO", "g_task_return_new_error", false) | |
| 963 | + | ||
| 927 | 964 | xTaskReturnNewError(x.GoPointer(), DomainVar, CodeVar, FormatVar, varArgs...) | |
| 928 | 965 | } | |
| 929 | 966 | ||
| @@ -937,6 +974,8 @@ var xTaskReturnNewErrorLiteral func(uintptr, glib.Quark, int, string) | |||
| 937 | 974 | // | |
| 938 | 975 | // See also [method@Gio.Task.return_new_error]. | |
| 939 | 976 | func (x *Task) ReturnNewErrorLiteral(DomainVar glib.Quark, CodeVar int, MessageVar string) { | |
| 977 | + | core.LazyRegister(&xTaskReturnNewErrorLiteral, "GIO", "g_task_return_new_error_literal", false) | |
| 978 | + | ||
| 940 | 979 | xTaskReturnNewErrorLiteral(x.GoPointer(), DomainVar, CodeVar, MessageVar) | |
| 941 | 980 | } | |
| 942 | 981 | ||
| @@ -961,6 +1000,8 @@ var xTaskReturnPointer func(uintptr, uintptr, uintptr) | |||
| 961 | 1000 | // valid after calling this, unless you are still holding another | |
| 962 | 1001 | // reference on it. | |
| 963 | 1002 | func (x *Task) ReturnPointer(ResultVar uintptr, ResultDestroyVar *glib.DestroyNotify) { | |
| 1003 | + | core.LazyRegister(&xTaskReturnPointer, "GIO", "g_task_return_pointer", false) | |
| 1004 | + | ||
| 964 | 1005 | xTaskReturnPointer(x.GoPointer(), ResultVar, glib.NewCallbackNullable(ResultDestroyVar)) | |
| 965 | 1006 | } | |
| 966 | 1007 | ||
| @@ -979,6 +1020,8 @@ var xTaskReturnPrefixedError func(uintptr, *glib.Error, string, ...interface{}) | |||
| 979 | 1020 | // | |
| 980 | 1021 | // See also g_task_return_error(), g_prefix_error(). | |
| 981 | 1022 | func (x *Task) ReturnPrefixedError(ErrorVar *glib.Error, FormatVar string, varArgs ...interface{}) { | |
| 1023 | + | core.LazyRegister(&xTaskReturnPrefixedError, "GIO", "g_task_return_prefixed_error", false) | |
| 1024 | + | ||
| 982 | 1025 | xTaskReturnPrefixedError(x.GoPointer(), ErrorVar, FormatVar, varArgs...) | |
| 983 | 1026 | } | |
| 984 | 1027 | ||
| @@ -993,6 +1036,8 @@ var xTaskReturnValue func(uintptr, *gobject.Value) | |||
| 993 | 1036 | // by language bindings; for C code, g_task_return_pointer() and the | |
| 994 | 1037 | // like will normally be much easier to use. | |
| 995 | 1038 | func (x *Task) ReturnValue(ResultVar *gobject.Value) { | |
| 1039 | + | core.LazyRegister(&xTaskReturnValue, "GIO", "g_task_return_value", false) | |
| 1040 | + | ||
| 996 | 1041 | xTaskReturnValue(x.GoPointer(), ResultVar) | |
| 997 | 1042 | } | |
| 998 | 1043 | ||
| @@ -1018,6 +1063,8 @@ var xTaskRunInThread func(uintptr, uintptr) | |||
| 1018 | 1063 | // separate worker thread or thread pool explicitly, rather than using | |
| 1019 | 1064 | // g_task_run_in_thread(). | |
| 1020 | 1065 | func (x *Task) RunInThread(TaskFuncVar *TaskThreadFunc) { | |
| 1066 | + | core.LazyRegister(&xTaskRunInThread, "GIO", "g_task_run_in_thread", false) | |
| 1067 | + | ||
| 1021 | 1068 | xTaskRunInThread(x.GoPointer(), glib.NewCallback(TaskFuncVar)) | |
| 1022 | 1069 | } | |
| 1023 | 1070 | ||
| @@ -1040,6 +1087,8 @@ var xTaskRunInThreadSync func(uintptr, uintptr) | |||
| 1040 | 1087 | // but don't want them to all run at once, you should only queue a | |
| 1041 | 1088 | // limited number of them at a time. | |
| 1042 | 1089 | func (x *Task) RunInThreadSync(TaskFuncVar *TaskThreadFunc) { | |
| 1090 | + | core.LazyRegister(&xTaskRunInThreadSync, "GIO", "g_task_run_in_thread_sync", false) | |
| 1091 | + | ||
| 1043 | 1092 | xTaskRunInThreadSync(x.GoPointer(), glib.NewCallback(TaskFuncVar)) | |
| 1044 | 1093 | } | |
| 1045 | 1094 | ||
| @@ -1060,6 +1109,8 @@ var xTaskSetCheckCancellable func(uintptr, bool) | |||
| 1060 | 1109 | // If you are using g_task_set_return_on_cancel() as well, then | |
| 1061 | 1110 | // you must leave check-cancellable set %TRUE. | |
| 1062 | 1111 | func (x *Task) SetCheckCancellable(CheckCancellableVar bool) { | |
| 1112 | + | core.LazyRegister(&xTaskSetCheckCancellable, "GIO", "g_task_set_check_cancellable", false) | |
| 1113 | + | ||
| 1063 | 1114 | xTaskSetCheckCancellable(x.GoPointer(), CheckCancellableVar) | |
| 1064 | 1115 | } | |
| 1065 | 1116 | ||
| @@ -1075,6 +1126,8 @@ var xTaskSetName func(uintptr, uintptr) | |||
| 1075 | 1126 | // This function may only be called before the @task is first used in a thread | |
| 1076 | 1127 | // other than the one it was constructed in. | |
| 1077 | 1128 | func (x *Task) SetName(NameVar *string) { | |
| 1129 | + | core.LazyRegister(&xTaskSetName, "GIO", "g_task_set_name", false) | |
| 1130 | + | ||
| 1078 | 1131 | NameVarPtr := core.GStrdupNullable(NameVar) | |
| 1079 | 1132 | defer core.GFreeNullable(NameVarPtr) | |
| 1080 | 1133 | ||
| @@ -1091,6 +1144,8 @@ var xTaskSetPriority func(uintptr, int) | |||
| 1091 | 1144 | // and can also be explicitly retrieved later via | |
| 1092 | 1145 | // g_task_get_priority(). | |
| 1093 | 1146 | func (x *Task) SetPriority(PriorityVar int) { | |
| 1147 | + | core.LazyRegister(&xTaskSetPriority, "GIO", "g_task_set_priority", false) | |
| 1148 | + | ||
| 1094 | 1149 | xTaskSetPriority(x.GoPointer(), PriorityVar) | |
| 1095 | 1150 | } | |
| 1096 | 1151 | ||
| @@ -1125,6 +1180,8 @@ var xTaskSetReturnOnCancel func(uintptr, bool) bool | |||
| 1125 | 1180 | // #GTaskThreadFunc will still be run (for consistency), but the task | |
| 1126 | 1181 | // will also be completed right away. | |
| 1127 | 1182 | func (x *Task) SetReturnOnCancel(ReturnOnCancelVar bool) bool { | |
| 1183 | + | core.LazyRegister(&xTaskSetReturnOnCancel, "GIO", "g_task_set_return_on_cancel", false) | |
| 1184 | + | ||
| 1128 | 1185 | cret := xTaskSetReturnOnCancel(x.GoPointer(), ReturnOnCancelVar) | |
| 1129 | 1186 | return cret | |
| 1130 | 1187 | } | |
| @@ -1144,6 +1201,8 @@ var xTaskSetSourceTag func(uintptr, uintptr) | |||
| 1144 | 1201 | // task’s name to the string form of @source_tag if it’s not already | |
| 1145 | 1202 | // set, for convenience. | |
| 1146 | 1203 | func (x *Task) SetSourceTag(SourceTagVar uintptr) { | |
| 1204 | + | core.LazyRegister(&xTaskSetSourceTag, "GIO", "g_task_set_source_tag", false) | |
| 1205 | + | ||
| 1147 | 1206 | xTaskSetSourceTag(x.GoPointer(), SourceTagVar) | |
| 1148 | 1207 | } | |
| 1149 | 1208 | ||
| @@ -1156,6 +1215,8 @@ var xTaskSetStaticName func(uintptr, uintptr) | |||
| 1156 | 1215 | // This function is called automatically by [method@Gio.Task.set_source_tag] | |
| 1157 | 1216 | // unless a name is set. | |
| 1158 | 1217 | func (x *Task) SetStaticName(NameVar *string) { | |
| 1218 | + | core.LazyRegister(&xTaskSetStaticName, "GIO", "g_task_set_static_name", false) | |
| 1219 | + | ||
| 1159 | 1220 | NameVarPtr := core.GStrdupNullable(NameVar) | |
| 1160 | 1221 | defer core.GFreeNullable(NameVarPtr) | |
| 1161 | 1222 | ||
| @@ -1166,6 +1227,8 @@ var xTaskSetTaskData func(uintptr, uintptr, uintptr) | |||
| 1166 | 1227 | ||
| 1167 | 1228 | // Sets @task's task data (freeing the existing task data, if any). | |
| 1168 | 1229 | func (x *Task) SetTaskData(TaskDataVar uintptr, TaskDataDestroyVar *glib.DestroyNotify) { | |
| 1230 | + | core.LazyRegister(&xTaskSetTaskData, "GIO", "g_task_set_task_data", false) | |
| 1231 | + | ||
| 1169 | 1232 | xTaskSetTaskData(x.GoPointer(), TaskDataVar, glib.NewCallbackNullable(TaskDataDestroyVar)) | |
| 1170 | 1233 | } | |
| 1171 | 1234 | ||
| @@ -1244,6 +1307,8 @@ var xTaskIsValid func(uintptr, uintptr) bool | |||
| 1244 | 1307 | // source object (or that @source_object is %NULL and @result has no | |
| 1245 | 1308 | // source object). This can be used in g_return_if_fail() checks. | |
| 1246 | 1309 | func TaskIsValid(ResultVar AsyncResult, SourceObjectVar *gobject.Object) bool { | |
| 1310 | + | core.LazyRegister(&xTaskIsValid, "GIO", "g_task_is_valid", false) | |
| 1311 | + | ||
| 1247 | 1312 | cret := xTaskIsValid(ResultVar.GoPointer(), SourceObjectVar.GoPointer()) | |
| 1248 | 1313 | return cret | |
| 1249 | 1314 | } | |
| @@ -1259,6 +1324,8 @@ var xTaskReportError func(uintptr, uintptr, uintptr, uintptr, *glib.Error) | |||
| 1259 | 1324 | // | |
| 1260 | 1325 | // See also g_task_report_new_error(). | |
| 1261 | 1326 | func TaskReportError(SourceObjectVar *gobject.Object, CallbackVar *AsyncReadyCallback, CallbackDataVar uintptr, SourceTagVar uintptr, ErrorVar *glib.Error) { | |
| 1327 | + | core.LazyRegister(&xTaskReportError, "GIO", "g_task_report_error", false) | |
| 1328 | + | ||
| 1262 | 1329 | xTaskReportError(SourceObjectVar.GoPointer(), glib.NewCallbackNullable(CallbackVar), CallbackDataVar, SourceTagVar, ErrorVar) | |
| 1263 | 1330 | } | |
| 1264 | 1331 | ||
| @@ -1274,61 +1341,12 @@ var xTaskReportNewError func(uintptr, uintptr, uintptr, uintptr, glib.Quark, int | |||
| 1274 | 1341 | // | |
| 1275 | 1342 | // See also g_task_report_error(). | |
| 1276 | 1343 | func TaskReportNewError(SourceObjectVar *gobject.Object, CallbackVar *AsyncReadyCallback, CallbackDataVar uintptr, SourceTagVar uintptr, DomainVar glib.Quark, CodeVar int, FormatVar string, varArgs ...interface{}) { | |
| 1344 | + | core.LazyRegister(&xTaskReportNewError, "GIO", "g_task_report_new_error", false) | |
| 1345 | + | ||
| 1277 | 1346 | xTaskReportNewError(SourceObjectVar.GoPointer(), glib.NewCallbackNullable(CallbackVar), CallbackDataVar, SourceTagVar, DomainVar, CodeVar, FormatVar, varArgs...) | |
| 1278 | 1347 | } | |
| 1279 | 1348 | ||
| 1280 | 1349 | func init() { | |
| 1281 | 1350 | core.SetPackageName("GIO", "gio-2.0") | |
| 1282 | 1351 | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0", "libgio-2.0.0.dylib"}) | |
| 1283 | - | var libs []uintptr | |
| 1284 | - | for _, libPath := range core.GetPaths("GIO") { | |
| 1285 | - | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 1286 | - | if err != nil { | |
| 1287 | - | panic(err) | |
| 1288 | - | } | |
| 1289 | - | libs = append(libs, lib) | |
| 1290 | - | } | |
| 1291 | - | ||
| 1292 | - | core.PuregoSafeRegister(&xTaskGLibType, libs, "g_task_get_type") | |
| 1293 | - | ||
| 1294 | - | core.PuregoSafeRegister(&xNewTask, libs, "g_task_new") | |
| 1295 | - | ||
| 1296 | - | core.PuregoSafeRegister(&xTaskAttachSource, libs, "g_task_attach_source") | |
| 1297 | - | core.PuregoSafeRegister(&xTaskGetCancellable, libs, "g_task_get_cancellable") | |
| 1298 | - | core.PuregoSafeRegister(&xTaskGetCheckCancellable, libs, "g_task_get_check_cancellable") | |
| 1299 | - | core.PuregoSafeRegister(&xTaskGetCompleted, libs, "g_task_get_completed") | |
| 1300 | - | core.PuregoSafeRegister(&xTaskGetContext, libs, "g_task_get_context") | |
| 1301 | - | core.PuregoSafeRegister(&xTaskGetName, libs, "g_task_get_name") | |
| 1302 | - | core.PuregoSafeRegister(&xTaskGetPriority, libs, "g_task_get_priority") | |
| 1303 | - | core.PuregoSafeRegister(&xTaskGetReturnOnCancel, libs, "g_task_get_return_on_cancel") | |
| 1304 | - | core.PuregoSafeRegister(&xTaskGetSourceObject, libs, "g_task_get_source_object") | |
| 1305 | - | core.PuregoSafeRegister(&xTaskGetSourceTag, libs, "g_task_get_source_tag") | |
| 1306 | - | core.PuregoSafeRegister(&xTaskGetTaskData, libs, "g_task_get_task_data") | |
| 1307 | - | core.PuregoSafeRegister(&xTaskHadError, libs, "g_task_had_error") | |
| 1308 | - | core.PuregoSafeRegister(&xTaskPropagateBoolean, libs, "g_task_propagate_boolean") | |
| 1309 | - | core.PuregoSafeRegister(&xTaskPropagateInt, libs, "g_task_propagate_int") | |
| 1310 | - | core.PuregoSafeRegister(&xTaskPropagatePointer, libs, "g_task_propagate_pointer") | |
| 1311 | - | core.PuregoSafeRegister(&xTaskPropagateValue, libs, "g_task_propagate_value") | |
| 1312 | - | core.PuregoSafeRegister(&xTaskReturnBoolean, libs, "g_task_return_boolean") | |
| 1313 | - | core.PuregoSafeRegister(&xTaskReturnError, libs, "g_task_return_error") | |
| 1314 | - | core.PuregoSafeRegister(&xTaskReturnErrorIfCancelled, libs, "g_task_return_error_if_cancelled") | |
| 1315 | - | core.PuregoSafeRegister(&xTaskReturnInt, libs, "g_task_return_int") | |
| 1316 | - | core.PuregoSafeRegister(&xTaskReturnNewError, libs, "g_task_return_new_error") | |
| 1317 | - | core.PuregoSafeRegister(&xTaskReturnNewErrorLiteral, libs, "g_task_return_new_error_literal") | |
| 1318 | - | core.PuregoSafeRegister(&xTaskReturnPointer, libs, "g_task_return_pointer") | |
| 1319 | - | core.PuregoSafeRegister(&xTaskReturnPrefixedError, libs, "g_task_return_prefixed_error") | |
| 1320 | - | core.PuregoSafeRegister(&xTaskReturnValue, libs, "g_task_return_value") | |
| 1321 | - | core.PuregoSafeRegister(&xTaskRunInThread, libs, "g_task_run_in_thread") | |
| 1322 | - | core.PuregoSafeRegister(&xTaskRunInThreadSync, libs, "g_task_run_in_thread_sync") | |
| 1323 | - | core.PuregoSafeRegister(&xTaskSetCheckCancellable, libs, "g_task_set_check_cancellable") | |
| 1324 | - | core.PuregoSafeRegister(&xTaskSetName, libs, "g_task_set_name") | |
| 1325 | - | core.PuregoSafeRegister(&xTaskSetPriority, libs, "g_task_set_priority") | |
| 1326 | - | core.PuregoSafeRegister(&xTaskSetReturnOnCancel, libs, "g_task_set_return_on_cancel") | |
| 1327 | - | core.PuregoSafeRegister(&xTaskSetSourceTag, libs, "g_task_set_source_tag") | |
| 1328 | - | core.PuregoSafeRegister(&xTaskSetStaticName, libs, "g_task_set_static_name") | |
| 1329 | - | core.PuregoSafeRegister(&xTaskSetTaskData, libs, "g_task_set_task_data") | |
| 1330 | - | ||
| 1331 | - | core.PuregoSafeRegister(&xTaskIsValid, libs, "g_task_is_valid") | |
| 1332 | - | core.PuregoSafeRegister(&xTaskReportError, libs, "g_task_report_error") | |
| 1333 | - | core.PuregoSafeRegister(&xTaskReportNewError, libs, "g_task_report_new_error") | |
| 1334 | 1352 | } | |
| @@ -5,7 +5,6 @@ import ( | |||||
| 5 | "structs" | 5 | "structs" | ||
| 6 | "unsafe" | 6 | "unsafe" | ||
| 7 | 7 | ||||
| 8 | - | "github.com/bnema/purego" | |||
| 9 | "github.com/bnema/puregotk/pkg/core" | 8 | "github.com/bnema/puregotk/pkg/core" | ||
| 10 | "github.com/bnema/puregotk/v4/glib" | 9 | "github.com/bnema/puregotk/v4/glib" | ||
| 11 | "github.com/bnema/puregotk/v4/gobject" | 10 | "github.com/bnema/puregotk/v4/gobject" | ||
| @@ -611,6 +610,7 @@ type Task struct { | |||||
| 611 | var xTaskGLibType func() types.GType | 610 | var xTaskGLibType func() types.GType | ||
| 612 | 611 | ||||
| 613 | func TaskGLibType() types.GType { | 612 | func TaskGLibType() types.GType { | ||
| 613 | + | core.LazyRegister(&xTaskGLibType, "GIO", "g_task_get_type", false) | |||
| 614 | return xTaskGLibType() | 614 | return xTaskGLibType() | ||
| 615 | } | 615 | } | ||
| 616 | 616 | ||||
| @@ -639,6 +639,7 @@ var xNewTask func(uintptr, uintptr, uintptr, uintptr) uintptr | |||||
| 639 | // do not want this behavior, you can use | 639 | // do not want this behavior, you can use | ||
| 640 | // g_task_set_check_cancellable() to change it. | 640 | // g_task_set_check_cancellable() to change it. | ||
| 641 | func NewTask(SourceObjectVar *gobject.Object, CancellableVar *Cancellable, CallbackVar *AsyncReadyCallback, CallbackDataVar uintptr) *Task { | 641 | func NewTask(SourceObjectVar *gobject.Object, CancellableVar *Cancellable, CallbackVar *AsyncReadyCallback, CallbackDataVar uintptr) *Task { | ||
| 642 | + | core.LazyRegister(&xNewTask, "GIO", "g_task_new", false) | |||
| 642 | var cls *Task | 643 | var cls *Task | ||
| 643 | 644 | ||||
| 644 | cret := xNewTask(SourceObjectVar.GoPointer(), CancellableVar.GoPointer(), glib.NewCallbackNullable(CallbackVar), CallbackDataVar) | 645 | cret := xNewTask(SourceObjectVar.GoPointer(), CancellableVar.GoPointer(), glib.NewCallbackNullable(CallbackVar), CallbackDataVar) | ||
| @@ -665,6 +666,8 @@ var xTaskAttachSource func(uintptr, *glib.Source, uintptr) | |||||
| 665 | // | 666 | // | ||
| 666 | // This takes a reference on @task until @source is destroyed. | 667 | // This takes a reference on @task until @source is destroyed. | ||
| 667 | func (x *Task) AttachSource(SourceVar *glib.Source, CallbackVar *glib.SourceFunc) { | 668 | func (x *Task) AttachSource(SourceVar *glib.Source, CallbackVar *glib.SourceFunc) { | ||
| 669 | + | core.LazyRegister(&xTaskAttachSource, "GIO", "g_task_attach_source", false) | |||
| 670 | + | ||||
| 668 | xTaskAttachSource(x.GoPointer(), SourceVar, glib.NewCallback(CallbackVar)) | 671 | xTaskAttachSource(x.GoPointer(), SourceVar, glib.NewCallback(CallbackVar)) | ||
| 669 | } | 672 | } | ||
| 670 | 673 | ||||
| @@ -672,6 +675,7 @@ var xTaskGetCancellable func(uintptr) uintptr | |||||
| 672 | 675 | ||||
| 673 | // Gets @task's #GCancellable | 676 | // Gets @task's #GCancellable | ||
| 674 | func (x *Task) GetCancellable() *Cancellable { | 677 | func (x *Task) GetCancellable() *Cancellable { | ||
| 678 | + | core.LazyRegister(&xTaskGetCancellable, "GIO", "g_task_get_cancellable", false) | |||
| 675 | var cls *Cancellable | 679 | var cls *Cancellable | ||
| 676 | 680 | ||||
| 677 | cret := xTaskGetCancellable(x.GoPointer()) | 681 | cret := xTaskGetCancellable(x.GoPointer()) | ||
| @@ -690,6 +694,8 @@ var xTaskGetCheckCancellable func(uintptr) bool | |||||
| 690 | // Gets @task's check-cancellable flag. See | 694 | // Gets @task's check-cancellable flag. See | ||
| 691 | // g_task_set_check_cancellable() for more details. | 695 | // g_task_set_check_cancellable() for more details. | ||
| 692 | func (x *Task) GetCheckCancellable() bool { | 696 | func (x *Task) GetCheckCancellable() bool { | ||
| 697 | + | core.LazyRegister(&xTaskGetCheckCancellable, "GIO", "g_task_get_check_cancellable", false) | |||
| 698 | + | ||||
| 693 | cret := xTaskGetCheckCancellable(x.GoPointer()) | 699 | cret := xTaskGetCheckCancellable(x.GoPointer()) | ||
| 694 | return cret | 700 | return cret | ||
| 695 | } | 701 | } | ||
| @@ -700,6 +706,8 @@ var xTaskGetCompleted func(uintptr) bool | |||||
| 700 | // the task’s callback is invoked, and will return %FALSE if called from inside | 706 | // the task’s callback is invoked, and will return %FALSE if called from inside | ||
| 701 | // the callback. | 707 | // the callback. | ||
| 702 | func (x *Task) GetCompleted() bool { | 708 | func (x *Task) GetCompleted() bool { | ||
| 709 | + | core.LazyRegister(&xTaskGetCompleted, "GIO", "g_task_get_completed", false) | |||
| 710 | + | ||||
| 703 | cret := xTaskGetCompleted(x.GoPointer()) | 711 | cret := xTaskGetCompleted(x.GoPointer()) | ||
| 704 | return cret | 712 | return cret | ||
| 705 | } | 713 | } | ||
| @@ -714,6 +722,8 @@ var xTaskGetContext func(uintptr) uintptr | |||||
| 714 | // This will always return a non-%NULL value, even if the task's | 722 | // This will always return a non-%NULL value, even if the task's | ||
| 715 | // context is the default #GMainContext. | 723 | // context is the default #GMainContext. | ||
| 716 | func (x *Task) GetContext() *glib.MainContext { | 724 | func (x *Task) GetContext() *glib.MainContext { | ||
| 725 | + | core.LazyRegister(&xTaskGetContext, "GIO", "g_task_get_context", false) | |||
| 726 | + | ||||
| 717 | cret := xTaskGetContext(x.GoPointer()) | 727 | cret := xTaskGetContext(x.GoPointer()) | ||
| 718 | if cret == 0 { | 728 | if cret == 0 { | ||
| 719 | return nil | 729 | return nil | ||
| @@ -725,6 +735,8 @@ var xTaskGetName func(uintptr) string | |||||
| 725 | 735 | ||||
| 726 | // Gets @task’s name. See g_task_set_name(). | 736 | // Gets @task’s name. See g_task_set_name(). | ||
| 727 | func (x *Task) GetName() string { | 737 | func (x *Task) GetName() string { | ||
| 738 | + | core.LazyRegister(&xTaskGetName, "GIO", "g_task_get_name", false) | |||
| 739 | + | ||||
| 728 | cret := xTaskGetName(x.GoPointer()) | 740 | cret := xTaskGetName(x.GoPointer()) | ||
| 729 | return cret | 741 | return cret | ||
| 730 | } | 742 | } | ||
| @@ -733,6 +745,8 @@ var xTaskGetPriority func(uintptr) int | |||||
| 733 | 745 | ||||
| 734 | // Gets @task's priority | 746 | // Gets @task's priority | ||
| 735 | func (x *Task) GetPriority() int { | 747 | func (x *Task) GetPriority() int { | ||
| 748 | + | core.LazyRegister(&xTaskGetPriority, "GIO", "g_task_get_priority", false) | |||
| 749 | + | ||||
| 736 | cret := xTaskGetPriority(x.GoPointer()) | 750 | cret := xTaskGetPriority(x.GoPointer()) | ||
| 737 | return cret | 751 | return cret | ||
| 738 | } | 752 | } | ||
| @@ -742,6 +756,8 @@ var xTaskGetReturnOnCancel func(uintptr) bool | |||||
| 742 | // Gets @task's return-on-cancel flag. See | 756 | // Gets @task's return-on-cancel flag. See | ||
| 743 | // g_task_set_return_on_cancel() for more details. | 757 | // g_task_set_return_on_cancel() for more details. | ||
| 744 | func (x *Task) GetReturnOnCancel() bool { | 758 | func (x *Task) GetReturnOnCancel() bool { | ||
| 759 | + | core.LazyRegister(&xTaskGetReturnOnCancel, "GIO", "g_task_get_return_on_cancel", false) | |||
| 760 | + | ||||
| 745 | cret := xTaskGetReturnOnCancel(x.GoPointer()) | 761 | cret := xTaskGetReturnOnCancel(x.GoPointer()) | ||
| 746 | return cret | 762 | return cret | ||
| 747 | } | 763 | } | ||
| @@ -751,6 +767,7 @@ var xTaskGetSourceObject func(uintptr) uintptr | |||||
| 751 | // Gets the source object from @task. Like | 767 | // Gets the source object from @task. Like | ||
| 752 | // g_async_result_get_source_object(), but does not ref the object. | 768 | // g_async_result_get_source_object(), but does not ref the object. | ||
| 753 | func (x *Task) GetSourceObject() *gobject.Object { | 769 | func (x *Task) GetSourceObject() *gobject.Object { | ||
| 770 | + | core.LazyRegister(&xTaskGetSourceObject, "GIO", "g_task_get_source_object", false) | |||
| 754 | var cls *gobject.Object | 771 | var cls *gobject.Object | ||
| 755 | 772 | ||||
| 756 | cret := xTaskGetSourceObject(x.GoPointer()) | 773 | cret := xTaskGetSourceObject(x.GoPointer()) | ||
| @@ -768,6 +785,8 @@ var xTaskGetSourceTag func(uintptr) uintptr | |||||
| 768 | 785 | ||||
| 769 | // Gets @task's source tag. See g_task_set_source_tag(). | 786 | // Gets @task's source tag. See g_task_set_source_tag(). | ||
| 770 | func (x *Task) GetSourceTag() uintptr { | 787 | func (x *Task) GetSourceTag() uintptr { | ||
| 788 | + | core.LazyRegister(&xTaskGetSourceTag, "GIO", "g_task_get_source_tag", false) | |||
| 789 | + | ||||
| 771 | cret := xTaskGetSourceTag(x.GoPointer()) | 790 | cret := xTaskGetSourceTag(x.GoPointer()) | ||
| 772 | return cret | 791 | return cret | ||
| 773 | } | 792 | } | ||
| @@ -776,6 +795,8 @@ var xTaskGetTaskData func(uintptr) uintptr | |||||
| 776 | 795 | ||||
| 777 | // Gets @task's `task_data`. | 796 | // Gets @task's `task_data`. | ||
| 778 | func (x *Task) GetTaskData() uintptr { | 797 | func (x *Task) GetTaskData() uintptr { | ||
| 798 | + | core.LazyRegister(&xTaskGetTaskData, "GIO", "g_task_get_task_data", false) | |||
| 799 | + | ||||
| 779 | cret := xTaskGetTaskData(x.GoPointer()) | 800 | cret := xTaskGetTaskData(x.GoPointer()) | ||
| 780 | return cret | 801 | return cret | ||
| 781 | } | 802 | } | ||
| @@ -784,6 +805,8 @@ var xTaskHadError func(uintptr) bool | |||||
| 784 | 805 | ||||
| 785 | // Tests if @task resulted in an error. | 806 | // Tests if @task resulted in an error. | ||
| 786 | func (x *Task) HadError() bool { | 807 | func (x *Task) HadError() bool { | ||
| 808 | + | core.LazyRegister(&xTaskHadError, "GIO", "g_task_had_error", false) | |||
| 809 | + | ||||
| 787 | cret := xTaskHadError(x.GoPointer()) | 810 | cret := xTaskHadError(x.GoPointer()) | ||
| 788 | return cret | 811 | return cret | ||
| 789 | } | 812 | } | ||
| @@ -798,6 +821,7 @@ var xTaskPropagateBoolean func(uintptr, **glib.Error) bool | |||||
| 798 | // Since this method transfers ownership of the return value (or | 821 | // Since this method transfers ownership of the return value (or | ||
| 799 | // error) to the caller, you may only call it once. | 822 | // error) to the caller, you may only call it once. | ||
| 800 | func (x *Task) PropagateBoolean() (bool, error) { | 823 | func (x *Task) PropagateBoolean() (bool, error) { | ||
| 824 | + | core.LazyRegister(&xTaskPropagateBoolean, "GIO", "g_task_propagate_boolean", false) | |||
| 801 | var cerr *glib.Error | 825 | var cerr *glib.Error | ||
| 802 | 826 | ||||
| 803 | cret := xTaskPropagateBoolean(x.GoPointer(), &cerr) | 827 | cret := xTaskPropagateBoolean(x.GoPointer(), &cerr) | ||
| @@ -817,6 +841,7 @@ var xTaskPropagateInt func(uintptr, **glib.Error) int | |||||
| 817 | // Since this method transfers ownership of the return value (or | 841 | // Since this method transfers ownership of the return value (or | ||
| 818 | // error) to the caller, you may only call it once. | 842 | // error) to the caller, you may only call it once. | ||
| 819 | func (x *Task) PropagateInt() (int, error) { | 843 | func (x *Task) PropagateInt() (int, error) { | ||
| 844 | + | core.LazyRegister(&xTaskPropagateInt, "GIO", "g_task_propagate_int", false) | |||
| 820 | var cerr *glib.Error | 845 | var cerr *glib.Error | ||
| 821 | 846 | ||||
| 822 | cret := xTaskPropagateInt(x.GoPointer(), &cerr) | 847 | cret := xTaskPropagateInt(x.GoPointer(), &cerr) | ||
| @@ -837,6 +862,7 @@ var xTaskPropagatePointer func(uintptr, **glib.Error) uintptr | |||||
| 837 | // Since this method transfers ownership of the return value (or | 862 | // Since this method transfers ownership of the return value (or | ||
| 838 | // error) to the caller, you may only call it once. | 863 | // error) to the caller, you may only call it once. | ||
| 839 | func (x *Task) PropagatePointer() (uintptr, error) { | 864 | func (x *Task) PropagatePointer() (uintptr, error) { | ||
| 865 | + | core.LazyRegister(&xTaskPropagatePointer, "GIO", "g_task_propagate_pointer", false) | |||
| 840 | var cerr *glib.Error | 866 | var cerr *glib.Error | ||
| 841 | 867 | ||||
| 842 | cret := xTaskPropagatePointer(x.GoPointer(), &cerr) | 868 | cret := xTaskPropagatePointer(x.GoPointer(), &cerr) | ||
| @@ -859,6 +885,7 @@ var xTaskPropagateValue func(uintptr, *gobject.Value, **glib.Error) bool | |||||
| 859 | // Since this method transfers ownership of the return value (or | 885 | // Since this method transfers ownership of the return value (or | ||
| 860 | // error) to the caller, you may only call it once. | 886 | // error) to the caller, you may only call it once. | ||
| 861 | func (x *Task) PropagateValue(ValueVar *gobject.Value) (bool, error) { | 887 | func (x *Task) PropagateValue(ValueVar *gobject.Value) (bool, error) { | ||
| 888 | + | core.LazyRegister(&xTaskPropagateValue, "GIO", "g_task_propagate_value", false) | |||
| 862 | var cerr *glib.Error | 889 | var cerr *glib.Error | ||
| 863 | 890 | ||||
| 864 | cret := xTaskPropagateValue(x.GoPointer(), ValueVar, &cerr) | 891 | cret := xTaskPropagateValue(x.GoPointer(), ValueVar, &cerr) | ||
| @@ -874,6 +901,8 @@ var xTaskReturnBoolean func(uintptr, bool) | |||||
| 874 | // g_task_return_pointer() for more discussion of exactly what this | 901 | // g_task_return_pointer() for more discussion of exactly what this | ||
| 875 | // means). | 902 | // means). | ||
| 876 | func (x *Task) ReturnBoolean(ResultVar bool) { | 903 | func (x *Task) ReturnBoolean(ResultVar bool) { | ||
| 904 | + | core.LazyRegister(&xTaskReturnBoolean, "GIO", "g_task_return_boolean", false) | |||
| 905 | + | ||||
| 877 | xTaskReturnBoolean(x.GoPointer(), ResultVar) | 906 | xTaskReturnBoolean(x.GoPointer(), ResultVar) | ||
| 878 | } | 907 | } | ||
| 879 | 908 | ||||
| @@ -892,6 +921,8 @@ var xTaskReturnError func(uintptr, *glib.Error) | |||||
| 892 | // See also [method@Gio.Task.return_new_error], | 921 | // See also [method@Gio.Task.return_new_error], | ||
| 893 | // [method@Gio.Task.return_new_error_literal]. | 922 | // [method@Gio.Task.return_new_error_literal]. | ||
| 894 | func (x *Task) ReturnError(ErrorVar *glib.Error) { | 923 | func (x *Task) ReturnError(ErrorVar *glib.Error) { | ||
| 924 | + | core.LazyRegister(&xTaskReturnError, "GIO", "g_task_return_error", false) | |||
| 925 | + | ||||
| 895 | xTaskReturnError(x.GoPointer(), ErrorVar) | 926 | xTaskReturnError(x.GoPointer(), ErrorVar) | ||
| 896 | } | 927 | } | ||
| 897 | 928 | ||||
| @@ -902,6 +933,8 @@ var xTaskReturnErrorIfCancelled func(uintptr) bool | |||||
| 902 | // g_task_return_pointer() for more discussion of exactly what this | 933 | // g_task_return_pointer() for more discussion of exactly what this | ||
| 903 | // means). | 934 | // means). | ||
| 904 | func (x *Task) ReturnErrorIfCancelled() bool { | 935 | func (x *Task) ReturnErrorIfCancelled() bool { | ||
| 936 | + | core.LazyRegister(&xTaskReturnErrorIfCancelled, "GIO", "g_task_return_error_if_cancelled", false) | |||
| 937 | + | ||||
| 905 | cret := xTaskReturnErrorIfCancelled(x.GoPointer()) | 938 | cret := xTaskReturnErrorIfCancelled(x.GoPointer()) | ||
| 906 | return cret | 939 | return cret | ||
| 907 | } | 940 | } | ||
| @@ -912,6 +945,8 @@ var xTaskReturnInt func(uintptr, int) | |||||
| 912 | // g_task_return_pointer() for more discussion of exactly what this | 945 | // g_task_return_pointer() for more discussion of exactly what this | ||
| 913 | // means). | 946 | // means). | ||
| 914 | func (x *Task) ReturnInt(ResultVar int) { | 947 | func (x *Task) ReturnInt(ResultVar int) { | ||
| 948 | + | core.LazyRegister(&xTaskReturnInt, "GIO", "g_task_return_int", false) | |||
| 949 | + | ||||
| 915 | xTaskReturnInt(x.GoPointer(), ResultVar) | 950 | xTaskReturnInt(x.GoPointer(), ResultVar) | ||
| 916 | } | 951 | } | ||
| 917 | 952 | ||||
| @@ -924,6 +959,8 @@ var xTaskReturnNewError func(uintptr, glib.Quark, int, string, ...interface{}) | |||||
| 924 | // | 959 | // | ||
| 925 | // See also g_task_return_error(). | 960 | // See also g_task_return_error(). | ||
| 926 | func (x *Task) ReturnNewError(DomainVar glib.Quark, CodeVar int, FormatVar string, varArgs ...interface{}) { | 961 | func (x *Task) ReturnNewError(DomainVar glib.Quark, CodeVar int, FormatVar string, varArgs ...interface{}) { | ||
| 962 | + | core.LazyRegister(&xTaskReturnNewError, "GIO", "g_task_return_new_error", false) | |||
| 963 | + | ||||
| 927 | xTaskReturnNewError(x.GoPointer(), DomainVar, CodeVar, FormatVar, varArgs...) | 964 | xTaskReturnNewError(x.GoPointer(), DomainVar, CodeVar, FormatVar, varArgs...) | ||
| 928 | } | 965 | } | ||
| 929 | 966 | ||||
| @@ -937,6 +974,8 @@ var xTaskReturnNewErrorLiteral func(uintptr, glib.Quark, int, string) | |||||
| 937 | // | 974 | // | ||
| 938 | // See also [method@Gio.Task.return_new_error]. | 975 | // See also [method@Gio.Task.return_new_error]. | ||
| 939 | func (x *Task) ReturnNewErrorLiteral(DomainVar glib.Quark, CodeVar int, MessageVar string) { | 976 | func (x *Task) ReturnNewErrorLiteral(DomainVar glib.Quark, CodeVar int, MessageVar string) { | ||
| 977 | + | core.LazyRegister(&xTaskReturnNewErrorLiteral, "GIO", "g_task_return_new_error_literal", false) | |||
| 978 | + | ||||
| 940 | xTaskReturnNewErrorLiteral(x.GoPointer(), DomainVar, CodeVar, MessageVar) | 979 | xTaskReturnNewErrorLiteral(x.GoPointer(), DomainVar, CodeVar, MessageVar) | ||
| 941 | } | 980 | } | ||
| 942 | 981 | ||||
| @@ -961,6 +1000,8 @@ var xTaskReturnPointer func(uintptr, uintptr, uintptr) | |||||
| 961 | // valid after calling this, unless you are still holding another | 1000 | // valid after calling this, unless you are still holding another | ||
| 962 | // reference on it. | 1001 | // reference on it. | ||
| 963 | func (x *Task) ReturnPointer(ResultVar uintptr, ResultDestroyVar *glib.DestroyNotify) { | 1002 | func (x *Task) ReturnPointer(ResultVar uintptr, ResultDestroyVar *glib.DestroyNotify) { | ||
| 1003 | + | core.LazyRegister(&xTaskReturnPointer, "GIO", "g_task_return_pointer", false) | |||
| 1004 | + | ||||
| 964 | xTaskReturnPointer(x.GoPointer(), ResultVar, glib.NewCallbackNullable(ResultDestroyVar)) | 1005 | xTaskReturnPointer(x.GoPointer(), ResultVar, glib.NewCallbackNullable(ResultDestroyVar)) | ||
| 965 | } | 1006 | } | ||
| 966 | 1007 | ||||
| @@ -979,6 +1020,8 @@ var xTaskReturnPrefixedError func(uintptr, *glib.Error, string, ...interface{}) | |||||
| 979 | // | 1020 | // | ||
| 980 | // See also g_task_return_error(), g_prefix_error(). | 1021 | // See also g_task_return_error(), g_prefix_error(). | ||
| 981 | func (x *Task) ReturnPrefixedError(ErrorVar *glib.Error, FormatVar string, varArgs ...interface{}) { | 1022 | func (x *Task) ReturnPrefixedError(ErrorVar *glib.Error, FormatVar string, varArgs ...interface{}) { | ||
| 1023 | + | core.LazyRegister(&xTaskReturnPrefixedError, "GIO", "g_task_return_prefixed_error", false) | |||
| 1024 | + | ||||
| 982 | xTaskReturnPrefixedError(x.GoPointer(), ErrorVar, FormatVar, varArgs...) | 1025 | xTaskReturnPrefixedError(x.GoPointer(), ErrorVar, FormatVar, varArgs...) | ||
| 983 | } | 1026 | } | ||
| 984 | 1027 | ||||
| @@ -993,6 +1036,8 @@ var xTaskReturnValue func(uintptr, *gobject.Value) | |||||
| 993 | // by language bindings; for C code, g_task_return_pointer() and the | 1036 | // by language bindings; for C code, g_task_return_pointer() and the | ||
| 994 | // like will normally be much easier to use. | 1037 | // like will normally be much easier to use. | ||
| 995 | func (x *Task) ReturnValue(ResultVar *gobject.Value) { | 1038 | func (x *Task) ReturnValue(ResultVar *gobject.Value) { | ||
| 1039 | + | core.LazyRegister(&xTaskReturnValue, "GIO", "g_task_return_value", false) | |||
| 1040 | + | ||||
| 996 | xTaskReturnValue(x.GoPointer(), ResultVar) | 1041 | xTaskReturnValue(x.GoPointer(), ResultVar) | ||
| 997 | } | 1042 | } | ||
| 998 | 1043 | ||||
| @@ -1018,6 +1063,8 @@ var xTaskRunInThread func(uintptr, uintptr) | |||||
| 1018 | // separate worker thread or thread pool explicitly, rather than using | 1063 | // separate worker thread or thread pool explicitly, rather than using | ||
| 1019 | // g_task_run_in_thread(). | 1064 | // g_task_run_in_thread(). | ||
| 1020 | func (x *Task) RunInThread(TaskFuncVar *TaskThreadFunc) { | 1065 | func (x *Task) RunInThread(TaskFuncVar *TaskThreadFunc) { | ||
| 1066 | + | core.LazyRegister(&xTaskRunInThread, "GIO", "g_task_run_in_thread", false) | |||
| 1067 | + | ||||
| 1021 | xTaskRunInThread(x.GoPointer(), glib.NewCallback(TaskFuncVar)) | 1068 | xTaskRunInThread(x.GoPointer(), glib.NewCallback(TaskFuncVar)) | ||
| 1022 | } | 1069 | } | ||
| 1023 | 1070 | ||||
| @@ -1040,6 +1087,8 @@ var xTaskRunInThreadSync func(uintptr, uintptr) | |||||
| 1040 | // but don't want them to all run at once, you should only queue a | 1087 | // but don't want them to all run at once, you should only queue a | ||
| 1041 | // limited number of them at a time. | 1088 | // limited number of them at a time. | ||
| 1042 | func (x *Task) RunInThreadSync(TaskFuncVar *TaskThreadFunc) { | 1089 | func (x *Task) RunInThreadSync(TaskFuncVar *TaskThreadFunc) { | ||
| 1090 | + | core.LazyRegister(&xTaskRunInThreadSync, "GIO", "g_task_run_in_thread_sync", false) | |||
| 1091 | + | ||||
| 1043 | xTaskRunInThreadSync(x.GoPointer(), glib.NewCallback(TaskFuncVar)) | 1092 | xTaskRunInThreadSync(x.GoPointer(), glib.NewCallback(TaskFuncVar)) | ||
| 1044 | } | 1093 | } | ||
| 1045 | 1094 | ||||
| @@ -1060,6 +1109,8 @@ var xTaskSetCheckCancellable func(uintptr, bool) | |||||
| 1060 | // If you are using g_task_set_return_on_cancel() as well, then | 1109 | // If you are using g_task_set_return_on_cancel() as well, then | ||
| 1061 | // you must leave check-cancellable set %TRUE. | 1110 | // you must leave check-cancellable set %TRUE. | ||
| 1062 | func (x *Task) SetCheckCancellable(CheckCancellableVar bool) { | 1111 | func (x *Task) SetCheckCancellable(CheckCancellableVar bool) { | ||
| 1112 | + | core.LazyRegister(&xTaskSetCheckCancellable, "GIO", "g_task_set_check_cancellable", false) | |||
| 1113 | + | ||||
| 1063 | xTaskSetCheckCancellable(x.GoPointer(), CheckCancellableVar) | 1114 | xTaskSetCheckCancellable(x.GoPointer(), CheckCancellableVar) | ||
| 1064 | } | 1115 | } | ||
| 1065 | 1116 | ||||
| @@ -1075,6 +1126,8 @@ var xTaskSetName func(uintptr, uintptr) | |||||
| 1075 | // This function may only be called before the @task is first used in a thread | 1126 | // This function may only be called before the @task is first used in a thread | ||
| 1076 | // other than the one it was constructed in. | 1127 | // other than the one it was constructed in. | ||
| 1077 | func (x *Task) SetName(NameVar *string) { | 1128 | func (x *Task) SetName(NameVar *string) { | ||
| 1129 | + | core.LazyRegister(&xTaskSetName, "GIO", "g_task_set_name", false) | |||
| 1130 | + | ||||
| 1078 | NameVarPtr := core.GStrdupNullable(NameVar) | 1131 | NameVarPtr := core.GStrdupNullable(NameVar) | ||
| 1079 | defer core.GFreeNullable(NameVarPtr) | 1132 | defer core.GFreeNullable(NameVarPtr) | ||
| 1080 | 1133 | ||||
| @@ -1091,6 +1144,8 @@ var xTaskSetPriority func(uintptr, int) | |||||
| 1091 | // and can also be explicitly retrieved later via | 1144 | // and can also be explicitly retrieved later via | ||
| 1092 | // g_task_get_priority(). | 1145 | // g_task_get_priority(). | ||
| 1093 | func (x *Task) SetPriority(PriorityVar int) { | 1146 | func (x *Task) SetPriority(PriorityVar int) { | ||
| 1147 | + | core.LazyRegister(&xTaskSetPriority, "GIO", "g_task_set_priority", false) | |||
| 1148 | + | ||||
| 1094 | xTaskSetPriority(x.GoPointer(), PriorityVar) | 1149 | xTaskSetPriority(x.GoPointer(), PriorityVar) | ||
| 1095 | } | 1150 | } | ||
| 1096 | 1151 | ||||
| @@ -1125,6 +1180,8 @@ var xTaskSetReturnOnCancel func(uintptr, bool) bool | |||||
| 1125 | // #GTaskThreadFunc will still be run (for consistency), but the task | 1180 | // #GTaskThreadFunc will still be run (for consistency), but the task | ||
| 1126 | // will also be completed right away. | 1181 | // will also be completed right away. | ||
| 1127 | func (x *Task) SetReturnOnCancel(ReturnOnCancelVar bool) bool { | 1182 | func (x *Task) SetReturnOnCancel(ReturnOnCancelVar bool) bool { | ||
| 1183 | + | core.LazyRegister(&xTaskSetReturnOnCancel, "GIO", "g_task_set_return_on_cancel", false) | |||
| 1184 | + | ||||
| 1128 | cret := xTaskSetReturnOnCancel(x.GoPointer(), ReturnOnCancelVar) | 1185 | cret := xTaskSetReturnOnCancel(x.GoPointer(), ReturnOnCancelVar) | ||
| 1129 | return cret | 1186 | return cret | ||
| 1130 | } | 1187 | } | ||
| @@ -1144,6 +1201,8 @@ var xTaskSetSourceTag func(uintptr, uintptr) | |||||
| 1144 | // task’s name to the string form of @source_tag if it’s not already | 1201 | // task’s name to the string form of @source_tag if it’s not already | ||
| 1145 | // set, for convenience. | 1202 | // set, for convenience. | ||
| 1146 | func (x *Task) SetSourceTag(SourceTagVar uintptr) { | 1203 | func (x *Task) SetSourceTag(SourceTagVar uintptr) { | ||
| 1204 | + | core.LazyRegister(&xTaskSetSourceTag, "GIO", "g_task_set_source_tag", false) | |||
| 1205 | + | ||||
| 1147 | xTaskSetSourceTag(x.GoPointer(), SourceTagVar) | 1206 | xTaskSetSourceTag(x.GoPointer(), SourceTagVar) | ||
| 1148 | } | 1207 | } | ||
| 1149 | 1208 | ||||
| @@ -1156,6 +1215,8 @@ var xTaskSetStaticName func(uintptr, uintptr) | |||||
| 1156 | // This function is called automatically by [method@Gio.Task.set_source_tag] | 1215 | // This function is called automatically by [method@Gio.Task.set_source_tag] | ||
| 1157 | // unless a name is set. | 1216 | // unless a name is set. | ||
| 1158 | func (x *Task) SetStaticName(NameVar *string) { | 1217 | func (x *Task) SetStaticName(NameVar *string) { | ||
| 1218 | + | core.LazyRegister(&xTaskSetStaticName, "GIO", "g_task_set_static_name", false) | |||
| 1219 | + | ||||
| 1159 | NameVarPtr := core.GStrdupNullable(NameVar) | 1220 | NameVarPtr := core.GStrdupNullable(NameVar) | ||
| 1160 | defer core.GFreeNullable(NameVarPtr) | 1221 | defer core.GFreeNullable(NameVarPtr) | ||
| 1161 | 1222 | ||||
| @@ -1166,6 +1227,8 @@ var xTaskSetTaskData func(uintptr, uintptr, uintptr) | |||||
| 1166 | 1227 | ||||
| 1167 | // Sets @task's task data (freeing the existing task data, if any). | 1228 | // Sets @task's task data (freeing the existing task data, if any). | ||
| 1168 | func (x *Task) SetTaskData(TaskDataVar uintptr, TaskDataDestroyVar *glib.DestroyNotify) { | 1229 | func (x *Task) SetTaskData(TaskDataVar uintptr, TaskDataDestroyVar *glib.DestroyNotify) { | ||
| 1230 | + | core.LazyRegister(&xTaskSetTaskData, "GIO", "g_task_set_task_data", false) | |||
| 1231 | + | ||||
| 1169 | xTaskSetTaskData(x.GoPointer(), TaskDataVar, glib.NewCallbackNullable(TaskDataDestroyVar)) | 1232 | xTaskSetTaskData(x.GoPointer(), TaskDataVar, glib.NewCallbackNullable(TaskDataDestroyVar)) | ||
| 1170 | } | 1233 | } | ||
| 1171 | 1234 | ||||
| @@ -1244,6 +1307,8 @@ var xTaskIsValid func(uintptr, uintptr) bool | |||||
| 1244 | // source object (or that @source_object is %NULL and @result has no | 1307 | // source object (or that @source_object is %NULL and @result has no | ||
| 1245 | // source object). This can be used in g_return_if_fail() checks. | 1308 | // source object). This can be used in g_return_if_fail() checks. | ||
| 1246 | func TaskIsValid(ResultVar AsyncResult, SourceObjectVar *gobject.Object) bool { | 1309 | func TaskIsValid(ResultVar AsyncResult, SourceObjectVar *gobject.Object) bool { | ||
| 1310 | + | core.LazyRegister(&xTaskIsValid, "GIO", "g_task_is_valid", false) | |||
| 1311 | + | ||||
| 1247 | cret := xTaskIsValid(ResultVar.GoPointer(), SourceObjectVar.GoPointer()) | 1312 | cret := xTaskIsValid(ResultVar.GoPointer(), SourceObjectVar.GoPointer()) | ||
| 1248 | return cret | 1313 | return cret | ||
| 1249 | } | 1314 | } | ||
| @@ -1259,6 +1324,8 @@ var xTaskReportError func(uintptr, uintptr, uintptr, uintptr, *glib.Error) | |||||
| 1259 | // | 1324 | // | ||
| 1260 | // See also g_task_report_new_error(). | 1325 | // See also g_task_report_new_error(). | ||
| 1261 | func TaskReportError(SourceObjectVar *gobject.Object, CallbackVar *AsyncReadyCallback, CallbackDataVar uintptr, SourceTagVar uintptr, ErrorVar *glib.Error) { | 1326 | func TaskReportError(SourceObjectVar *gobject.Object, CallbackVar *AsyncReadyCallback, CallbackDataVar uintptr, SourceTagVar uintptr, ErrorVar *glib.Error) { | ||
| 1327 | + | core.LazyRegister(&xTaskReportError, "GIO", "g_task_report_error", false) | |||
| 1328 | + | ||||
| 1262 | xTaskReportError(SourceObjectVar.GoPointer(), glib.NewCallbackNullable(CallbackVar), CallbackDataVar, SourceTagVar, ErrorVar) | 1329 | xTaskReportError(SourceObjectVar.GoPointer(), glib.NewCallbackNullable(CallbackVar), CallbackDataVar, SourceTagVar, ErrorVar) | ||
| 1263 | } | 1330 | } | ||
| 1264 | 1331 | ||||
| @@ -1274,61 +1341,12 @@ var xTaskReportNewError func(uintptr, uintptr, uintptr, uintptr, glib.Quark, int | |||||
| 1274 | // | 1341 | // | ||
| 1275 | // See also g_task_report_error(). | 1342 | // See also g_task_report_error(). | ||
| 1276 | func TaskReportNewError(SourceObjectVar *gobject.Object, CallbackVar *AsyncReadyCallback, CallbackDataVar uintptr, SourceTagVar uintptr, DomainVar glib.Quark, CodeVar int, FormatVar string, varArgs ...interface{}) { | 1343 | func TaskReportNewError(SourceObjectVar *gobject.Object, CallbackVar *AsyncReadyCallback, CallbackDataVar uintptr, SourceTagVar uintptr, DomainVar glib.Quark, CodeVar int, FormatVar string, varArgs ...interface{}) { | ||
| 1344 | + | core.LazyRegister(&xTaskReportNewError, "GIO", "g_task_report_new_error", false) | |||
| 1345 | + | ||||
| 1277 | xTaskReportNewError(SourceObjectVar.GoPointer(), glib.NewCallbackNullable(CallbackVar), CallbackDataVar, SourceTagVar, DomainVar, CodeVar, FormatVar, varArgs...) | 1346 | xTaskReportNewError(SourceObjectVar.GoPointer(), glib.NewCallbackNullable(CallbackVar), CallbackDataVar, SourceTagVar, DomainVar, CodeVar, FormatVar, varArgs...) | ||
| 1278 | } | 1347 | } | ||
| 1279 | 1348 | ||||
| 1280 | func init() { | 1349 | func init() { | ||
| 1281 | core.SetPackageName("GIO", "gio-2.0") | 1350 | core.SetPackageName("GIO", "gio-2.0") | ||
| 1282 | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0", "libgio-2.0.0.dylib"}) | 1351 | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0", "libgio-2.0.0.dylib"}) | ||
| 1283 | - | var libs []uintptr | |||
| 1284 | - | for _, libPath := range core.GetPaths("GIO") { | |||
| 1285 | - | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |||
| 1286 | - | if err != nil { | |||
| 1287 | - | panic(err) | |||
| 1288 | - | } | |||
| 1289 | - | libs = append(libs, lib) | |||
| 1290 | - | } | |||
| 1291 | - | ||||
| 1292 | - | core.PuregoSafeRegister(&xTaskGLibType, libs, "g_task_get_type") | |||
| 1293 | - | ||||
| 1294 | - | core.PuregoSafeRegister(&xNewTask, libs, "g_task_new") | |||
| 1295 | - | ||||
| 1296 | - | core.PuregoSafeRegister(&xTaskAttachSource, libs, "g_task_attach_source") | |||
| 1297 | - | core.PuregoSafeRegister(&xTaskGetCancellable, libs, "g_task_get_cancellable") | |||
| 1298 | - | core.PuregoSafeRegister(&xTaskGetCheckCancellable, libs, "g_task_get_check_cancellable") | |||
| 1299 | - | core.PuregoSafeRegister(&xTaskGetCompleted, libs, "g_task_get_completed") | |||
| 1300 | - | core.PuregoSafeRegister(&xTaskGetContext, libs, "g_task_get_context") | |||
| 1301 | - | core.PuregoSafeRegister(&xTaskGetName, libs, "g_task_get_name") | |||
| 1302 | - | core.PuregoSafeRegister(&xTaskGetPriority, libs, "g_task_get_priority") | |||
| 1303 | - | core.PuregoSafeRegister(&xTaskGetReturnOnCancel, libs, "g_task_get_return_on_cancel") | |||
| 1304 | - | core.PuregoSafeRegister(&xTaskGetSourceObject, libs, "g_task_get_source_object") | |||
| 1305 | - | core.PuregoSafeRegister(&xTaskGetSourceTag, libs, "g_task_get_source_tag") | |||
| 1306 | - | core.PuregoSafeRegister(&xTaskGetTaskData, libs, "g_task_get_task_data") | |||
| 1307 | - | core.PuregoSafeRegister(&xTaskHadError, libs, "g_task_had_error") | |||
| 1308 | - | core.PuregoSafeRegister(&xTaskPropagateBoolean, libs, "g_task_propagate_boolean") | |||
| 1309 | - | core.PuregoSafeRegister(&xTaskPropagateInt, libs, "g_task_propagate_int") | |||
| 1310 | - | core.PuregoSafeRegister(&xTaskPropagatePointer, libs, "g_task_propagate_pointer") | |||
| 1311 | - | core.PuregoSafeRegister(&xTaskPropagateValue, libs, "g_task_propagate_value") | |||
| 1312 | - | core.PuregoSafeRegister(&xTaskReturnBoolean, libs, "g_task_return_boolean") | |||
| 1313 | - | core.PuregoSafeRegister(&xTaskReturnError, libs, "g_task_return_error") | |||
| 1314 | - | core.PuregoSafeRegister(&xTaskReturnErrorIfCancelled, libs, "g_task_return_error_if_cancelled") | |||
| 1315 | - | core.PuregoSafeRegister(&xTaskReturnInt, libs, "g_task_return_int") | |||
| 1316 | - | core.PuregoSafeRegister(&xTaskReturnNewError, libs, "g_task_return_new_error") | |||
| 1317 | - | core.PuregoSafeRegister(&xTaskReturnNewErrorLiteral, libs, "g_task_return_new_error_literal") | |||
| 1318 | - | core.PuregoSafeRegister(&xTaskReturnPointer, libs, "g_task_return_pointer") | |||
| 1319 | - | core.PuregoSafeRegister(&xTaskReturnPrefixedError, libs, "g_task_return_prefixed_error") | |||
| 1320 | - | core.PuregoSafeRegister(&xTaskReturnValue, libs, "g_task_return_value") | |||
| 1321 | - | core.PuregoSafeRegister(&xTaskRunInThread, libs, "g_task_run_in_thread") | |||
| 1322 | - | core.PuregoSafeRegister(&xTaskRunInThreadSync, libs, "g_task_run_in_thread_sync") | |||
| 1323 | - | core.PuregoSafeRegister(&xTaskSetCheckCancellable, libs, "g_task_set_check_cancellable") | |||
| 1324 | - | core.PuregoSafeRegister(&xTaskSetName, libs, "g_task_set_name") | |||
| 1325 | - | core.PuregoSafeRegister(&xTaskSetPriority, libs, "g_task_set_priority") | |||
| 1326 | - | core.PuregoSafeRegister(&xTaskSetReturnOnCancel, libs, "g_task_set_return_on_cancel") | |||
| 1327 | - | core.PuregoSafeRegister(&xTaskSetSourceTag, libs, "g_task_set_source_tag") | |||
| 1328 | - | core.PuregoSafeRegister(&xTaskSetStaticName, libs, "g_task_set_static_name") | |||
| 1329 | - | core.PuregoSafeRegister(&xTaskSetTaskData, libs, "g_task_set_task_data") | |||
| 1330 | - | ||||
| 1331 | - | core.PuregoSafeRegister(&xTaskIsValid, libs, "g_task_is_valid") | |||
| 1332 | - | core.PuregoSafeRegister(&xTaskReportError, libs, "g_task_report_error") | |||
| 1333 | - | core.PuregoSafeRegister(&xTaskReportNewError, libs, "g_task_report_new_error") | |||
| 1334 | } | 1352 | } | ||