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 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gtcpconnection.go +5 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gtcpwrapperconnection.go +3 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gtestdbus.go +16 -22 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gthemedicon.go +10 -19 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gthreadedresolver.go +7 -0 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gthreadedsocketservice.go +2 -12 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gtlsbackend.go +69 -33 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gtlscertificate.go +25 -29 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gtlsclientconnection.go +55 -29 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gtlsconnection.go +56 -46 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gtlsdatabase.go +51 -48 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gtlsfiledatabase.go +2 -13 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gtlsinteraction.go +27 -31 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gtlspassword.go +20 -22 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gtlsserverconnection.go +2 -13 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gunixconnection.go +11 -20 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gunixcredentialsmessage.go +6 -17 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gunixfdlist.go +11 -19 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gunixsocketaddress.go +14 -22 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gvfs.go +18 -24 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gvolume.go +143 -58 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gvolumemonitor.go +11 -19 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gzlibcompressor.go +9 -18 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/gzlibdecompressor.go +3 -15 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/gio/main.go +2 -11 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gallocator.go +32 -28 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/garray.go +82 -59 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gasyncqueue.go +56 -39 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gatomic.go +43 -34 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gbacktrace.go +5 -15 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gbase64.go +13 -19 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gbitlock.go +23 -24 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gbookmarkfile.go +69 -61 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gcache.go +10 -15 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gcharset.go +13 -19 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gchecksum.go +23 -25 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gcompletion.go +14 -17 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gconvert.go +25 -28 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gdataset.go +36 -28 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gdate.go +103 -65 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gdatetime.go +107 -66 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gdir.go +12 -19 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/genviron.go +17 -21 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gerror.go +30 -29 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gfileutils.go +45 -38 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/ggettext.go +13 -19 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/ghash.go +81 -53 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/ghmac.go +21 -24 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/ghook.go +28 -26 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/ghostutils.go +11 -18 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/giochannel.go +83 -67 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gkeyfile.go +72 -62 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/glib-types.go +4 -12 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/glist.go +2 -11 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gmain.go +181 -117 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gmappedfile.go +15 -21 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gmarkup.go +51 -43 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gmem.go +44 -31 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gmessages.go +70 -45 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gnode.go +50 -35 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/goption.go +57 -43 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gpathbuf.go +26 -24 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gpattern.go +19 -23 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gpoll.go +3 -13 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gprimes.go +3 -14 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gprintf.go +15 -20 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gqsort.go +5 -15 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gquark.go +13 -19 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gqueue.go +84 -52 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/grand.go +33 -30 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/grcbox.go +29 -27 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/grefcount.go +17 -21 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/grefstring.go +15 -20 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gregex.go +72 -57 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/grel.go +20 -21 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gscanner.go +40 -30 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gsequence.go +74 -49 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gshell.go +5 -16 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gslice.go +17 -21 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gslist.go +2 -11 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gspawn.go +12 -23 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gstdio.go +33 -27 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gstrfuncs.go +115 -71 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gstring.go +77 -51 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gstringchunk.go +10 -15 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gstrvbuilder.go +19 -22 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gtestutils.go +132 -80 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gthread.go +146 -97 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gthreadpool.go +26 -25 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gtimer.go +18 -20 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gtimezone.go +27 -26 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gtrashstack.go +8 -14 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gtree.go +63 -45 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gtypes.go +4 -12 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/gunicode.go +132 -85 collapsed to keep the page light
M vendor/github.com/bnema/puregotk/v4/glib/guri.go +63 -50
| @@ -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/gobject/types" | |
| 11 | 10 | ) | |
| @@ -178,6 +177,7 @@ type Uri struct { | |||
| 178 | 177 | var xUriGLibType func() types.GType | |
| 179 | 178 | ||
| 180 | 179 | func UriGLibType() types.GType { | |
| 180 | + | core.LazyRegister(&xUriGLibType, "GLIB", "g_uri_get_type", false) | |
| 181 | 181 | return xUriGLibType() | |
| 182 | 182 | } | |
| 183 | 183 | ||
| @@ -203,6 +203,8 @@ var xUriGetAuthParams func(uintptr) string | |||
| 203 | 203 | // Depending on the URI scheme, g_uri_parse_params() may be useful for | |
| 204 | 204 | // further parsing this information. | |
| 205 | 205 | func (x *Uri) GetAuthParams() string { | |
| 206 | + | core.LazyRegister(&xUriGetAuthParams, "GLIB", "g_uri_get_auth_params", false) | |
| 207 | + | ||
| 206 | 208 | cret := xUriGetAuthParams(x.GoPointer()) | |
| 207 | 209 | return cret | |
| 208 | 210 | } | |
| @@ -211,6 +213,8 @@ var xUriGetFlags func(uintptr) UriFlags | |||
| 211 | 213 | ||
| 212 | 214 | // Gets @uri's flags set upon construction. | |
| 213 | 215 | func (x *Uri) GetFlags() UriFlags { | |
| 216 | + | core.LazyRegister(&xUriGetFlags, "GLIB", "g_uri_get_flags", false) | |
| 217 | + | ||
| 214 | 218 | cret := xUriGetFlags(x.GoPointer()) | |
| 215 | 219 | return cret | |
| 216 | 220 | } | |
| @@ -220,6 +224,8 @@ var xUriGetFragment func(uintptr) string | |||
| 220 | 224 | // Gets @uri's fragment, which may contain `%`-encoding, depending on | |
| 221 | 225 | // the flags with which @uri was created. | |
| 222 | 226 | func (x *Uri) GetFragment() string { | |
| 227 | + | core.LazyRegister(&xUriGetFragment, "GLIB", "g_uri_get_fragment", false) | |
| 228 | + | ||
| 223 | 229 | cret := xUriGetFragment(x.GoPointer()) | |
| 224 | 230 | return cret | |
| 225 | 231 | } | |
| @@ -236,6 +242,8 @@ var xUriGetHost func(uintptr) string | |||
| 236 | 242 | // be a scope ID attached to the address. Eg, `fe80::1234%“em1` (or | |
| 237 | 243 | // `fe80::1234%“25em1` if the string is still encoded). | |
| 238 | 244 | func (x *Uri) GetHost() string { | |
| 245 | + | core.LazyRegister(&xUriGetHost, "GLIB", "g_uri_get_host", false) | |
| 246 | + | ||
| 239 | 247 | cret := xUriGetHost(x.GoPointer()) | |
| 240 | 248 | return cret | |
| 241 | 249 | } | |
| @@ -246,6 +254,8 @@ var xUriGetPassword func(uintptr) string | |||
| 246 | 254 | // the flags with which @uri was created. (If @uri was not created | |
| 247 | 255 | // with %G_URI_FLAGS_HAS_PASSWORD then this will be %NULL.) | |
| 248 | 256 | func (x *Uri) GetPassword() string { | |
| 257 | + | core.LazyRegister(&xUriGetPassword, "GLIB", "g_uri_get_password", false) | |
| 258 | + | ||
| 249 | 259 | cret := xUriGetPassword(x.GoPointer()) | |
| 250 | 260 | return cret | |
| 251 | 261 | } | |
| @@ -255,6 +265,8 @@ var xUriGetPath func(uintptr) string | |||
| 255 | 265 | // Gets @uri's path, which may contain `%`-encoding, depending on the | |
| 256 | 266 | // flags with which @uri was created. | |
| 257 | 267 | func (x *Uri) GetPath() string { | |
| 268 | + | core.LazyRegister(&xUriGetPath, "GLIB", "g_uri_get_path", false) | |
| 269 | + | ||
| 258 | 270 | cret := xUriGetPath(x.GoPointer()) | |
| 259 | 271 | return cret | |
| 260 | 272 | } | |
| @@ -263,6 +275,8 @@ var xUriGetPort func(uintptr) int | |||
| 263 | 275 | ||
| 264 | 276 | // Gets @uri's port. | |
| 265 | 277 | func (x *Uri) GetPort() int { | |
| 278 | + | core.LazyRegister(&xUriGetPort, "GLIB", "g_uri_get_port", false) | |
| 279 | + | ||
| 266 | 280 | cret := xUriGetPort(x.GoPointer()) | |
| 267 | 281 | return cret | |
| 268 | 282 | } | |
| @@ -275,6 +289,8 @@ var xUriGetQuery func(uintptr) string | |||
| 275 | 289 | // For queries consisting of a series of `name=value` parameters, | |
| 276 | 290 | // #GUriParamsIter or g_uri_parse_params() may be useful. | |
| 277 | 291 | func (x *Uri) GetQuery() string { | |
| 292 | + | core.LazyRegister(&xUriGetQuery, "GLIB", "g_uri_get_query", false) | |
| 293 | + | ||
| 278 | 294 | cret := xUriGetQuery(x.GoPointer()) | |
| 279 | 295 | return cret | |
| 280 | 296 | } | |
| @@ -284,6 +300,8 @@ var xUriGetScheme func(uintptr) string | |||
| 284 | 300 | // Gets @uri's scheme. Note that this will always be all-lowercase, | |
| 285 | 301 | // regardless of the string or strings that @uri was created from. | |
| 286 | 302 | func (x *Uri) GetScheme() string { | |
| 303 | + | core.LazyRegister(&xUriGetScheme, "GLIB", "g_uri_get_scheme", false) | |
| 304 | + | ||
| 287 | 305 | cret := xUriGetScheme(x.GoPointer()) | |
| 288 | 306 | return cret | |
| 289 | 307 | } | |
| @@ -295,6 +313,8 @@ var xUriGetUser func(uintptr) string | |||
| 295 | 313 | // If @uri was not created with %G_URI_FLAGS_HAS_PASSWORD or | |
| 296 | 314 | // %G_URI_FLAGS_HAS_AUTH_PARAMS, this is the same as g_uri_get_userinfo(). | |
| 297 | 315 | func (x *Uri) GetUser() string { | |
| 316 | + | core.LazyRegister(&xUriGetUser, "GLIB", "g_uri_get_user", false) | |
| 317 | + | ||
| 298 | 318 | cret := xUriGetUser(x.GoPointer()) | |
| 299 | 319 | return cret | |
| 300 | 320 | } | |
| @@ -304,6 +324,8 @@ var xUriGetUserinfo func(uintptr) string | |||
| 304 | 324 | // Gets @uri's userinfo, which may contain `%`-encoding, depending on | |
| 305 | 325 | // the flags with which @uri was created. | |
| 306 | 326 | func (x *Uri) GetUserinfo() string { | |
| 327 | + | core.LazyRegister(&xUriGetUserinfo, "GLIB", "g_uri_get_userinfo", false) | |
| 328 | + | ||
| 307 | 329 | cret := xUriGetUserinfo(x.GoPointer()) | |
| 308 | 330 | return cret | |
| 309 | 331 | } | |
| @@ -315,6 +337,7 @@ var xUriParseRelative func(uintptr, string, UriFlags, **Error) uintptr | |||
| 315 | 337 | // If the result is not a valid absolute URI, it will be discarded, and an error | |
| 316 | 338 | // returned. | |
| 317 | 339 | func (x *Uri) ParseRelative(UriRefVar string, FlagsVar UriFlags) (*Uri, error) { | |
| 340 | + | core.LazyRegister(&xUriParseRelative, "GLIB", "g_uri_parse_relative", false) | |
| 318 | 341 | var cerr *Error | |
| 319 | 342 | ||
| 320 | 343 | cret := xUriParseRelative(x.GoPointer(), UriRefVar, FlagsVar, &cerr) | |
| @@ -331,6 +354,8 @@ var xUriRef func(uintptr) uintptr | |||
| 331 | 354 | ||
| 332 | 355 | // Increments the reference count of @uri by one. | |
| 333 | 356 | func (x *Uri) Ref() *Uri { | |
| 357 | + | core.LazyRegister(&xUriRef, "GLIB", "g_uri_ref", false) | |
| 358 | + | ||
| 334 | 359 | cret := xUriRef(x.GoPointer()) | |
| 335 | 360 | if cret == 0 { | |
| 336 | 361 | return nil | |
| @@ -353,6 +378,8 @@ var xUriToString func(uintptr) string | |||
| 353 | 378 | // or private data in its query string, and the returned string is going to be | |
| 354 | 379 | // logged, then consider using g_uri_to_string_partial() to redact parts. | |
| 355 | 380 | func (x *Uri) ToString() string { | |
| 381 | + | core.LazyRegister(&xUriToString, "GLIB", "g_uri_to_string", false) | |
| 382 | + | ||
| 356 | 383 | cret := xUriToString(x.GoPointer()) | |
| 357 | 384 | return cret | |
| 358 | 385 | } | |
| @@ -362,6 +389,8 @@ var xUriToStringPartial func(uintptr, UriHideFlags) string | |||
| 362 | 389 | // Returns a string representing @uri, subject to the options in | |
| 363 | 390 | // @flags. See g_uri_to_string() and #GUriHideFlags for more details. | |
| 364 | 391 | func (x *Uri) ToStringPartial(FlagsVar UriHideFlags) string { | |
| 392 | + | core.LazyRegister(&xUriToStringPartial, "GLIB", "g_uri_to_string_partial", false) | |
| 393 | + | ||
| 365 | 394 | cret := xUriToStringPartial(x.GoPointer(), FlagsVar) | |
| 366 | 395 | return cret | |
| 367 | 396 | } | |
| @@ -373,6 +402,8 @@ var xUriUnref func(uintptr) | |||
| 373 | 402 | // When the reference count reaches zero, the resources allocated by | |
| 374 | 403 | // @uri are freed | |
| 375 | 404 | func (x *Uri) Unref() { | |
| 405 | + | core.LazyRegister(&xUriUnref, "GLIB", "g_uri_unref", false) | |
| 406 | + | ||
| 376 | 407 | xUriUnref(x.GoPointer()) | |
| 377 | 408 | } | |
| 378 | 409 | ||
| @@ -449,6 +480,8 @@ var xUriParamsIterInit func(uintptr, string, int, string, UriParamsFlags) | |||
| 449 | 480 | // | |
| 450 | 481 | // ]| | |
| 451 | 482 | func (x *UriParamsIter) Init(ParamsVar string, LengthVar int, SeparatorsVar string, FlagsVar UriParamsFlags) { | |
| 483 | + | core.LazyRegister(&xUriParamsIterInit, "GLIB", "g_uri_params_iter_init", false) | |
| 484 | + | ||
| 452 | 485 | xUriParamsIterInit(x.GoPointer(), ParamsVar, LengthVar, SeparatorsVar, FlagsVar) | |
| 453 | 486 | } | |
| 454 | 487 | ||
| @@ -464,6 +497,7 @@ var xUriParamsIterNext func(uintptr, *string, *string, **Error) bool | |||
| 464 | 497 | // Note that the same @attribute may be returned multiple times, since URIs | |
| 465 | 498 | // allow repeated attributes. | |
| 466 | 499 | func (x *UriParamsIter) Next(AttributeVar *string, ValueVar *string) (bool, error) { | |
| 500 | + | core.LazyRegister(&xUriParamsIterNext, "GLIB", "g_uri_params_iter_next", false) | |
| 467 | 501 | var cerr *Error | |
| 468 | 502 | ||
| 469 | 503 | cret := xUriParamsIterNext(x.GoPointer(), AttributeVar, ValueVar, &cerr) | |
| @@ -607,6 +641,8 @@ var xUriBuild func(UriFlags, string, uintptr, uintptr, int, string, uintptr, uin | |||
| 607 | 641 | // See also g_uri_build_with_user(), which allows specifying the | |
| 608 | 642 | // components of the "userinfo" separately. | |
| 609 | 643 | func UriBuild(FlagsVar UriFlags, SchemeVar string, UserinfoVar *string, HostVar *string, PortVar int, PathVar string, QueryVar *string, FragmentVar *string) *Uri { | |
| 644 | + | core.LazyRegister(&xUriBuild, "GLIB", "g_uri_build", false) | |
| 645 | + | ||
| 610 | 646 | UserinfoVarPtr := core.GStrdupNullable(UserinfoVar) | |
| 611 | 647 | defer core.GFreeNullable(UserinfoVarPtr) | |
| 612 | 648 | ||
| @@ -637,6 +673,8 @@ var xUriBuildWithUser func(UriFlags, string, uintptr, uintptr, uintptr, uintptr, | |||
| 637 | 673 | // of the ‘userinfo’ field separately. Note that @user must be non-%NULL | |
| 638 | 674 | // if either @password or @auth_params is non-%NULL. | |
| 639 | 675 | func UriBuildWithUser(FlagsVar UriFlags, SchemeVar string, UserVar *string, PasswordVar *string, AuthParamsVar *string, HostVar *string, PortVar int, PathVar string, QueryVar *string, FragmentVar *string) *Uri { | |
| 676 | + | core.LazyRegister(&xUriBuildWithUser, "GLIB", "g_uri_build_with_user", false) | |
| 677 | + | ||
| 640 | 678 | UserVarPtr := core.GStrdupNullable(UserVar) | |
| 641 | 679 | defer core.GFreeNullable(UserVarPtr) | |
| 642 | 680 | ||
| @@ -676,6 +714,8 @@ var xUriEscapeBytes func([]byte, uint, uintptr) string | |||
| 676 | 714 | // Though technically incorrect, this will also allow escaping nul | |
| 677 | 715 | // bytes as `%“00`. | |
| 678 | 716 | func UriEscapeBytes(UnescapedVar []byte, LengthVar uint, ReservedCharsAllowedVar *string) string { | |
| 717 | + | core.LazyRegister(&xUriEscapeBytes, "GLIB", "g_uri_escape_bytes", false) | |
| 718 | + | ||
| 679 | 719 | ReservedCharsAllowedVarPtr := core.GStrdupNullable(ReservedCharsAllowedVar) | |
| 680 | 720 | defer core.GFreeNullable(ReservedCharsAllowedVarPtr) | |
| 681 | 721 | ||
| @@ -694,6 +734,8 @@ var xUriEscapeString func(string, uintptr, bool) string | |||
| 694 | 734 | // in the URI specification, since those are allowed unescaped in some | |
| 695 | 735 | // portions of a URI. | |
| 696 | 736 | func UriEscapeString(UnescapedVar string, ReservedCharsAllowedVar *string, AllowUtf8Var bool) string { | |
| 737 | + | core.LazyRegister(&xUriEscapeString, "GLIB", "g_uri_escape_string", false) | |
| 738 | + | ||
| 697 | 739 | ReservedCharsAllowedVarPtr := core.GStrdupNullable(ReservedCharsAllowedVar) | |
| 698 | 740 | defer core.GFreeNullable(ReservedCharsAllowedVarPtr) | |
| 699 | 741 | ||
| @@ -712,6 +754,7 @@ var xUriIsValid func(string, UriFlags, **Error) bool | |||
| 712 | 754 | // See g_uri_split(), and the definition of #GUriFlags, for more | |
| 713 | 755 | // information on the effect of @flags. | |
| 714 | 756 | func UriIsValid(UriStringVar string, FlagsVar UriFlags) (bool, error) { | |
| 757 | + | core.LazyRegister(&xUriIsValid, "GLIB", "g_uri_is_valid", false) | |
| 715 | 758 | var cerr *Error | |
| 716 | 759 | ||
| 717 | 760 | cret := xUriIsValid(UriStringVar, FlagsVar, &cerr) | |
| @@ -738,6 +781,8 @@ var xUriJoin func(UriFlags, uintptr, uintptr, uintptr, int, string, uintptr, uin | |||
| 738 | 781 | // %G_URI_FLAGS_HAS_PASSWORD and %G_URI_FLAGS_HAS_AUTH_PARAMS are ignored if set | |
| 739 | 782 | // in @flags. | |
| 740 | 783 | func UriJoin(FlagsVar UriFlags, SchemeVar *string, UserinfoVar *string, HostVar *string, PortVar int, PathVar string, QueryVar *string, FragmentVar *string) string { | |
| 784 | + | core.LazyRegister(&xUriJoin, "GLIB", "g_uri_join", false) | |
| 785 | + | ||
| 741 | 786 | SchemeVarPtr := core.GStrdupNullable(SchemeVar) | |
| 742 | 787 | defer core.GFreeNullable(SchemeVarPtr) | |
| 743 | 788 | ||
| @@ -769,6 +814,8 @@ var xUriJoinWithUser func(UriFlags, uintptr, uintptr, uintptr, uintptr, uintptr, | |||
| 769 | 814 | // %G_URI_FLAGS_HAS_PASSWORD and %G_URI_FLAGS_HAS_AUTH_PARAMS are ignored if set | |
| 770 | 815 | // in @flags. | |
| 771 | 816 | func UriJoinWithUser(FlagsVar UriFlags, SchemeVar *string, UserVar *string, PasswordVar *string, AuthParamsVar *string, HostVar *string, PortVar int, PathVar string, QueryVar *string, FragmentVar *string) string { | |
| 817 | + | core.LazyRegister(&xUriJoinWithUser, "GLIB", "g_uri_join_with_user", false) | |
| 818 | + | ||
| 772 | 819 | SchemeVarPtr := core.GStrdupNullable(SchemeVar) | |
| 773 | 820 | defer core.GFreeNullable(SchemeVarPtr) | |
| 774 | 821 | ||
| @@ -800,6 +847,7 @@ var xUriParse func(string, UriFlags, **Error) uintptr | |||
| 800 | 847 | // valid [absolute URI](#relative-and-absolute-uris), it will be discarded, and an | |
| 801 | 848 | // error returned. | |
| 802 | 849 | func UriParse(UriStringVar string, FlagsVar UriFlags) (*Uri, error) { | |
| 850 | + | core.LazyRegister(&xUriParse, "GLIB", "g_uri_parse", false) | |
| 803 | 851 | var cerr *Error | |
| 804 | 852 | ||
| 805 | 853 | cret := xUriParse(UriStringVar, FlagsVar, &cerr) | |
| @@ -839,6 +887,7 @@ var xUriParseParams func(string, int, string, UriParamsFlags, **Error) uintptr | |||
| 839 | 887 | // If @params cannot be parsed (for example, it contains two @separators | |
| 840 | 888 | // characters in a row), then @error is set and %NULL is returned. | |
| 841 | 889 | func UriParseParams(ParamsVar string, LengthVar int, SeparatorsVar string, FlagsVar UriParamsFlags) (*HashTable, error) { | |
| 890 | + | core.LazyRegister(&xUriParseParams, "GLIB", "g_uri_parse_params", false) | |
| 842 | 891 | var cerr *Error | |
| 843 | 892 | ||
| 844 | 893 | cret := xUriParseParams(ParamsVar, LengthVar, SeparatorsVar, FlagsVar, &cerr) | |
| @@ -861,6 +910,8 @@ var xUriParseScheme func(string) string | |||
| 861 | 910 | // ]| | |
| 862 | 911 | // Common schemes include `file`, `https`, `svn+ssh`, etc. | |
| 863 | 912 | func UriParseScheme(UriVar string) string { | |
| 913 | + | core.LazyRegister(&xUriParseScheme, "GLIB", "g_uri_parse_scheme", false) | |
| 914 | + | ||
| 864 | 915 | cret := xUriParseScheme(UriVar) | |
| 865 | 916 | return cret | |
| 866 | 917 | } | |
| @@ -878,6 +929,8 @@ var xUriPeekScheme func(string) string | |||
| 878 | 929 | // Unlike g_uri_parse_scheme(), the returned scheme is normalized to | |
| 879 | 930 | // all-lowercase and does not need to be freed. | |
| 880 | 931 | func UriPeekScheme(UriVar string) string { | |
| 932 | + | core.LazyRegister(&xUriPeekScheme, "GLIB", "g_uri_peek_scheme", false) | |
| 933 | + | ||
| 881 | 934 | cret := xUriPeekScheme(UriVar) | |
| 882 | 935 | return cret | |
| 883 | 936 | } | |
| @@ -892,6 +945,7 @@ var xUriResolveRelative func(uintptr, string, UriFlags, **Error) string | |||
| 892 | 945 | // (If @base_uri_string is %NULL, this just returns @uri_ref, or | |
| 893 | 946 | // %NULL if @uri_ref is invalid or not absolute.) | |
| 894 | 947 | func UriResolveRelative(BaseUriStringVar *string, UriRefVar string, FlagsVar UriFlags) (string, error) { | |
| 948 | + | core.LazyRegister(&xUriResolveRelative, "GLIB", "g_uri_resolve_relative", false) | |
| 895 | 949 | var cerr *Error | |
| 896 | 950 | ||
| 897 | 951 | BaseUriStringVarPtr := core.GStrdupNullable(BaseUriStringVar) | |
| @@ -923,6 +977,7 @@ var xUriSplit func(string, UriFlags, *string, *string, *string, *int, *string, * | |||
| 923 | 977 | // since it always returns only the full userinfo; use | |
| 924 | 978 | // g_uri_split_with_user() if you want it split up. | |
| 925 | 979 | func UriSplit(UriRefVar string, FlagsVar UriFlags, SchemeVar *string, UserinfoVar *string, HostVar *string, PortVar *int, PathVar *string, QueryVar *string, FragmentVar *string) (bool, error) { | |
| 980 | + | core.LazyRegister(&xUriSplit, "GLIB", "g_uri_split", false) | |
| 926 | 981 | var cerr *Error | |
| 927 | 982 | ||
| 928 | 983 | cret := xUriSplit(UriRefVar, FlagsVar, SchemeVar, UserinfoVar, HostVar, PortVar, PathVar, QueryVar, FragmentVar, &cerr) | |
| @@ -941,6 +996,7 @@ var xUriSplitNetwork func(string, UriFlags, *string, *string, *int, **Error) boo | |||
| 941 | 996 | // However, it will return an error if @uri_string is a relative URI, | |
| 942 | 997 | // or does not contain a hostname component. | |
| 943 | 998 | func UriSplitNetwork(UriStringVar string, FlagsVar UriFlags, SchemeVar *string, HostVar *string, PortVar *int) (bool, error) { | |
| 999 | + | core.LazyRegister(&xUriSplitNetwork, "GLIB", "g_uri_split_network", false) | |
| 944 | 1000 | var cerr *Error | |
| 945 | 1001 | ||
| 946 | 1002 | cret := xUriSplitNetwork(UriStringVar, FlagsVar, SchemeVar, HostVar, PortVar, &cerr) | |
| @@ -964,6 +1020,7 @@ var xUriSplitWithUser func(string, UriFlags, *string, *string, *string, *string, | |||
| 964 | 1020 | // @auth_params will only be parsed out if @flags contains | |
| 965 | 1021 | // %G_URI_FLAGS_HAS_AUTH_PARAMS. | |
| 966 | 1022 | func UriSplitWithUser(UriRefVar string, FlagsVar UriFlags, SchemeVar *string, UserVar *string, PasswordVar *string, AuthParamsVar *string, HostVar *string, PortVar *int, PathVar *string, QueryVar *string, FragmentVar *string) (bool, error) { | |
| 1023 | + | core.LazyRegister(&xUriSplitWithUser, "GLIB", "g_uri_split_with_user", false) | |
| 967 | 1024 | var cerr *Error | |
| 968 | 1025 | ||
| 969 | 1026 | cret := xUriSplitWithUser(UriRefVar, FlagsVar, SchemeVar, UserVar, PasswordVar, AuthParamsVar, HostVar, PortVar, PathVar, QueryVar, FragmentVar, &cerr) | |
| @@ -986,6 +1043,7 @@ var xUriUnescapeBytes func(string, int, uintptr, **Error) uintptr | |||
| 986 | 1043 | // being expanded in an escaped path element, which might confuse pathname | |
| 987 | 1044 | // handling. | |
| 988 | 1045 | func UriUnescapeBytes(EscapedStringVar string, LengthVar int, IllegalCharactersVar *string) (*Bytes, error) { | |
| 1046 | + | core.LazyRegister(&xUriUnescapeBytes, "GLIB", "g_uri_unescape_bytes", false) | |
| 989 | 1047 | var cerr *Error | |
| 990 | 1048 | ||
| 991 | 1049 | IllegalCharactersVarPtr := core.GStrdupNullable(IllegalCharactersVar) | |
| @@ -1014,6 +1072,8 @@ var xUriUnescapeSegment func(uintptr, uintptr, uintptr) string | |||
| 1014 | 1072 | // Note: `NUL` byte is not accepted in the output, in contrast to | |
| 1015 | 1073 | // g_uri_unescape_bytes(). | |
| 1016 | 1074 | func UriUnescapeSegment(EscapedStringVar *string, EscapedStringEndVar *string, IllegalCharactersVar *string) string { | |
| 1075 | + | core.LazyRegister(&xUriUnescapeSegment, "GLIB", "g_uri_unescape_segment", false) | |
| 1076 | + | ||
| 1017 | 1077 | EscapedStringVarPtr := core.GStrdupNullable(EscapedStringVar) | |
| 1018 | 1078 | defer core.GFreeNullable(EscapedStringVarPtr) | |
| 1019 | 1079 | ||
| @@ -1037,6 +1097,8 @@ var xUriUnescapeString func(string, uintptr) string | |||
| 1037 | 1097 | // want to avoid for instance having a slash being expanded in an | |
| 1038 | 1098 | // escaped path element, which might confuse pathname handling. | |
| 1039 | 1099 | func UriUnescapeString(EscapedStringVar string, IllegalCharactersVar *string) string { | |
| 1100 | + | core.LazyRegister(&xUriUnescapeString, "GLIB", "g_uri_unescape_string", false) | |
| 1101 | + | ||
| 1040 | 1102 | IllegalCharactersVarPtr := core.GStrdupNullable(IllegalCharactersVar) | |
| 1041 | 1103 | defer core.GFreeNullable(IllegalCharactersVarPtr) | |
| 1042 | 1104 | ||
| @@ -1047,53 +1109,4 @@ func UriUnescapeString(EscapedStringVar string, IllegalCharactersVar *string) st | |||
| 1047 | 1109 | func init() { | |
| 1048 | 1110 | core.SetPackageName("GLIB", "glib-2.0") | |
| 1049 | 1111 | core.SetSharedLibraries("GLIB", []string{"libgobject-2.0.so.0", "libglib-2.0.so.0", "libgobject-2.0.0.dylib", "libglib-2.0.0.dylib"}) | |
| 1050 | - | var libs []uintptr | |
| 1051 | - | for _, libPath := range core.GetPaths("GLIB") { | |
| 1052 | - | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 1053 | - | if err != nil { | |
| 1054 | - | panic(err) | |
| 1055 | - | } | |
| 1056 | - | libs = append(libs, lib) | |
| 1057 | - | } | |
| 1058 | - | ||
| 1059 | - | core.PuregoSafeRegister(&xUriBuild, libs, "g_uri_build") | |
| 1060 | - | core.PuregoSafeRegister(&xUriBuildWithUser, libs, "g_uri_build_with_user") | |
| 1061 | - | core.PuregoSafeRegister(&xUriEscapeBytes, libs, "g_uri_escape_bytes") | |
| 1062 | - | core.PuregoSafeRegister(&xUriEscapeString, libs, "g_uri_escape_string") | |
| 1063 | - | core.PuregoSafeRegister(&xUriIsValid, libs, "g_uri_is_valid") | |
| 1064 | - | core.PuregoSafeRegister(&xUriJoin, libs, "g_uri_join") | |
| 1065 | - | core.PuregoSafeRegister(&xUriJoinWithUser, libs, "g_uri_join_with_user") | |
| 1066 | - | core.PuregoSafeRegister(&xUriParse, libs, "g_uri_parse") | |
| 1067 | - | core.PuregoSafeRegister(&xUriParseParams, libs, "g_uri_parse_params") | |
| 1068 | - | core.PuregoSafeRegister(&xUriParseScheme, libs, "g_uri_parse_scheme") | |
| 1069 | - | core.PuregoSafeRegister(&xUriPeekScheme, libs, "g_uri_peek_scheme") | |
| 1070 | - | core.PuregoSafeRegister(&xUriResolveRelative, libs, "g_uri_resolve_relative") | |
| 1071 | - | core.PuregoSafeRegister(&xUriSplit, libs, "g_uri_split") | |
| 1072 | - | core.PuregoSafeRegister(&xUriSplitNetwork, libs, "g_uri_split_network") | |
| 1073 | - | core.PuregoSafeRegister(&xUriSplitWithUser, libs, "g_uri_split_with_user") | |
| 1074 | - | core.PuregoSafeRegister(&xUriUnescapeBytes, libs, "g_uri_unescape_bytes") | |
| 1075 | - | core.PuregoSafeRegister(&xUriUnescapeSegment, libs, "g_uri_unescape_segment") | |
| 1076 | - | core.PuregoSafeRegister(&xUriUnescapeString, libs, "g_uri_unescape_string") | |
| 1077 | - | ||
| 1078 | - | core.PuregoSafeRegister(&xUriGLibType, libs, "g_uri_get_type") | |
| 1079 | - | ||
| 1080 | - | core.PuregoSafeRegister(&xUriGetAuthParams, libs, "g_uri_get_auth_params") | |
| 1081 | - | core.PuregoSafeRegister(&xUriGetFlags, libs, "g_uri_get_flags") | |
| 1082 | - | core.PuregoSafeRegister(&xUriGetFragment, libs, "g_uri_get_fragment") | |
| 1083 | - | core.PuregoSafeRegister(&xUriGetHost, libs, "g_uri_get_host") | |
| 1084 | - | core.PuregoSafeRegister(&xUriGetPassword, libs, "g_uri_get_password") | |
| 1085 | - | core.PuregoSafeRegister(&xUriGetPath, libs, "g_uri_get_path") | |
| 1086 | - | core.PuregoSafeRegister(&xUriGetPort, libs, "g_uri_get_port") | |
| 1087 | - | core.PuregoSafeRegister(&xUriGetQuery, libs, "g_uri_get_query") | |
| 1088 | - | core.PuregoSafeRegister(&xUriGetScheme, libs, "g_uri_get_scheme") | |
| 1089 | - | core.PuregoSafeRegister(&xUriGetUser, libs, "g_uri_get_user") | |
| 1090 | - | core.PuregoSafeRegister(&xUriGetUserinfo, libs, "g_uri_get_userinfo") | |
| 1091 | - | core.PuregoSafeRegister(&xUriParseRelative, libs, "g_uri_parse_relative") | |
| 1092 | - | core.PuregoSafeRegister(&xUriRef, libs, "g_uri_ref") | |
| 1093 | - | core.PuregoSafeRegister(&xUriToString, libs, "g_uri_to_string") | |
| 1094 | - | core.PuregoSafeRegister(&xUriToStringPartial, libs, "g_uri_to_string_partial") | |
| 1095 | - | core.PuregoSafeRegister(&xUriUnref, libs, "g_uri_unref") | |
| 1096 | - | ||
| 1097 | - | core.PuregoSafeRegister(&xUriParamsIterInit, libs, "g_uri_params_iter_init") | |
| 1098 | - | core.PuregoSafeRegister(&xUriParamsIterNext, libs, "g_uri_params_iter_next") | |
| 1099 | 1112 | } | |
| @@ -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/gobject/types" | 9 | "github.com/bnema/puregotk/v4/gobject/types" | ||
| 11 | ) | 10 | ) | ||
| @@ -178,6 +177,7 @@ type Uri struct { | |||||
| 178 | var xUriGLibType func() types.GType | 177 | var xUriGLibType func() types.GType | ||
| 179 | 178 | ||||
| 180 | func UriGLibType() types.GType { | 179 | func UriGLibType() types.GType { | ||
| 180 | + | core.LazyRegister(&xUriGLibType, "GLIB", "g_uri_get_type", false) | |||
| 181 | return xUriGLibType() | 181 | return xUriGLibType() | ||
| 182 | } | 182 | } | ||
| 183 | 183 | ||||
| @@ -203,6 +203,8 @@ var xUriGetAuthParams func(uintptr) string | |||||
| 203 | // Depending on the URI scheme, g_uri_parse_params() may be useful for | 203 | // Depending on the URI scheme, g_uri_parse_params() may be useful for | ||
| 204 | // further parsing this information. | 204 | // further parsing this information. | ||
| 205 | func (x *Uri) GetAuthParams() string { | 205 | func (x *Uri) GetAuthParams() string { | ||
| 206 | + | core.LazyRegister(&xUriGetAuthParams, "GLIB", "g_uri_get_auth_params", false) | |||
| 207 | + | ||||
| 206 | cret := xUriGetAuthParams(x.GoPointer()) | 208 | cret := xUriGetAuthParams(x.GoPointer()) | ||
| 207 | return cret | 209 | return cret | ||
| 208 | } | 210 | } | ||
| @@ -211,6 +213,8 @@ var xUriGetFlags func(uintptr) UriFlags | |||||
| 211 | 213 | ||||
| 212 | // Gets @uri's flags set upon construction. | 214 | // Gets @uri's flags set upon construction. | ||
| 213 | func (x *Uri) GetFlags() UriFlags { | 215 | func (x *Uri) GetFlags() UriFlags { | ||
| 216 | + | core.LazyRegister(&xUriGetFlags, "GLIB", "g_uri_get_flags", false) | |||
| 217 | + | ||||
| 214 | cret := xUriGetFlags(x.GoPointer()) | 218 | cret := xUriGetFlags(x.GoPointer()) | ||
| 215 | return cret | 219 | return cret | ||
| 216 | } | 220 | } | ||
| @@ -220,6 +224,8 @@ var xUriGetFragment func(uintptr) string | |||||
| 220 | // Gets @uri's fragment, which may contain `%`-encoding, depending on | 224 | // Gets @uri's fragment, which may contain `%`-encoding, depending on | ||
| 221 | // the flags with which @uri was created. | 225 | // the flags with which @uri was created. | ||
| 222 | func (x *Uri) GetFragment() string { | 226 | func (x *Uri) GetFragment() string { | ||
| 227 | + | core.LazyRegister(&xUriGetFragment, "GLIB", "g_uri_get_fragment", false) | |||
| 228 | + | ||||
| 223 | cret := xUriGetFragment(x.GoPointer()) | 229 | cret := xUriGetFragment(x.GoPointer()) | ||
| 224 | return cret | 230 | return cret | ||
| 225 | } | 231 | } | ||
| @@ -236,6 +242,8 @@ var xUriGetHost func(uintptr) string | |||||
| 236 | // be a scope ID attached to the address. Eg, `fe80::1234%“em1` (or | 242 | // be a scope ID attached to the address. Eg, `fe80::1234%“em1` (or | ||
| 237 | // `fe80::1234%“25em1` if the string is still encoded). | 243 | // `fe80::1234%“25em1` if the string is still encoded). | ||
| 238 | func (x *Uri) GetHost() string { | 244 | func (x *Uri) GetHost() string { | ||
| 245 | + | core.LazyRegister(&xUriGetHost, "GLIB", "g_uri_get_host", false) | |||
| 246 | + | ||||
| 239 | cret := xUriGetHost(x.GoPointer()) | 247 | cret := xUriGetHost(x.GoPointer()) | ||
| 240 | return cret | 248 | return cret | ||
| 241 | } | 249 | } | ||
| @@ -246,6 +254,8 @@ var xUriGetPassword func(uintptr) string | |||||
| 246 | // the flags with which @uri was created. (If @uri was not created | 254 | // the flags with which @uri was created. (If @uri was not created | ||
| 247 | // with %G_URI_FLAGS_HAS_PASSWORD then this will be %NULL.) | 255 | // with %G_URI_FLAGS_HAS_PASSWORD then this will be %NULL.) | ||
| 248 | func (x *Uri) GetPassword() string { | 256 | func (x *Uri) GetPassword() string { | ||
| 257 | + | core.LazyRegister(&xUriGetPassword, "GLIB", "g_uri_get_password", false) | |||
| 258 | + | ||||
| 249 | cret := xUriGetPassword(x.GoPointer()) | 259 | cret := xUriGetPassword(x.GoPointer()) | ||
| 250 | return cret | 260 | return cret | ||
| 251 | } | 261 | } | ||
| @@ -255,6 +265,8 @@ var xUriGetPath func(uintptr) string | |||||
| 255 | // Gets @uri's path, which may contain `%`-encoding, depending on the | 265 | // Gets @uri's path, which may contain `%`-encoding, depending on the | ||
| 256 | // flags with which @uri was created. | 266 | // flags with which @uri was created. | ||
| 257 | func (x *Uri) GetPath() string { | 267 | func (x *Uri) GetPath() string { | ||
| 268 | + | core.LazyRegister(&xUriGetPath, "GLIB", "g_uri_get_path", false) | |||
| 269 | + | ||||
| 258 | cret := xUriGetPath(x.GoPointer()) | 270 | cret := xUriGetPath(x.GoPointer()) | ||
| 259 | return cret | 271 | return cret | ||
| 260 | } | 272 | } | ||
| @@ -263,6 +275,8 @@ var xUriGetPort func(uintptr) int | |||||
| 263 | 275 | ||||
| 264 | // Gets @uri's port. | 276 | // Gets @uri's port. | ||
| 265 | func (x *Uri) GetPort() int { | 277 | func (x *Uri) GetPort() int { | ||
| 278 | + | core.LazyRegister(&xUriGetPort, "GLIB", "g_uri_get_port", false) | |||
| 279 | + | ||||
| 266 | cret := xUriGetPort(x.GoPointer()) | 280 | cret := xUriGetPort(x.GoPointer()) | ||
| 267 | return cret | 281 | return cret | ||
| 268 | } | 282 | } | ||
| @@ -275,6 +289,8 @@ var xUriGetQuery func(uintptr) string | |||||
| 275 | // For queries consisting of a series of `name=value` parameters, | 289 | // For queries consisting of a series of `name=value` parameters, | ||
| 276 | // #GUriParamsIter or g_uri_parse_params() may be useful. | 290 | // #GUriParamsIter or g_uri_parse_params() may be useful. | ||
| 277 | func (x *Uri) GetQuery() string { | 291 | func (x *Uri) GetQuery() string { | ||
| 292 | + | core.LazyRegister(&xUriGetQuery, "GLIB", "g_uri_get_query", false) | |||
| 293 | + | ||||
| 278 | cret := xUriGetQuery(x.GoPointer()) | 294 | cret := xUriGetQuery(x.GoPointer()) | ||
| 279 | return cret | 295 | return cret | ||
| 280 | } | 296 | } | ||
| @@ -284,6 +300,8 @@ var xUriGetScheme func(uintptr) string | |||||
| 284 | // Gets @uri's scheme. Note that this will always be all-lowercase, | 300 | // Gets @uri's scheme. Note that this will always be all-lowercase, | ||
| 285 | // regardless of the string or strings that @uri was created from. | 301 | // regardless of the string or strings that @uri was created from. | ||
| 286 | func (x *Uri) GetScheme() string { | 302 | func (x *Uri) GetScheme() string { | ||
| 303 | + | core.LazyRegister(&xUriGetScheme, "GLIB", "g_uri_get_scheme", false) | |||
| 304 | + | ||||
| 287 | cret := xUriGetScheme(x.GoPointer()) | 305 | cret := xUriGetScheme(x.GoPointer()) | ||
| 288 | return cret | 306 | return cret | ||
| 289 | } | 307 | } | ||
| @@ -295,6 +313,8 @@ var xUriGetUser func(uintptr) string | |||||
| 295 | // If @uri was not created with %G_URI_FLAGS_HAS_PASSWORD or | 313 | // If @uri was not created with %G_URI_FLAGS_HAS_PASSWORD or | ||
| 296 | // %G_URI_FLAGS_HAS_AUTH_PARAMS, this is the same as g_uri_get_userinfo(). | 314 | // %G_URI_FLAGS_HAS_AUTH_PARAMS, this is the same as g_uri_get_userinfo(). | ||
| 297 | func (x *Uri) GetUser() string { | 315 | func (x *Uri) GetUser() string { | ||
| 316 | + | core.LazyRegister(&xUriGetUser, "GLIB", "g_uri_get_user", false) | |||
| 317 | + | ||||
| 298 | cret := xUriGetUser(x.GoPointer()) | 318 | cret := xUriGetUser(x.GoPointer()) | ||
| 299 | return cret | 319 | return cret | ||
| 300 | } | 320 | } | ||
| @@ -304,6 +324,8 @@ var xUriGetUserinfo func(uintptr) string | |||||
| 304 | // Gets @uri's userinfo, which may contain `%`-encoding, depending on | 324 | // Gets @uri's userinfo, which may contain `%`-encoding, depending on | ||
| 305 | // the flags with which @uri was created. | 325 | // the flags with which @uri was created. | ||
| 306 | func (x *Uri) GetUserinfo() string { | 326 | func (x *Uri) GetUserinfo() string { | ||
| 327 | + | core.LazyRegister(&xUriGetUserinfo, "GLIB", "g_uri_get_userinfo", false) | |||
| 328 | + | ||||
| 307 | cret := xUriGetUserinfo(x.GoPointer()) | 329 | cret := xUriGetUserinfo(x.GoPointer()) | ||
| 308 | return cret | 330 | return cret | ||
| 309 | } | 331 | } | ||
| @@ -315,6 +337,7 @@ var xUriParseRelative func(uintptr, string, UriFlags, **Error) uintptr | |||||
| 315 | // If the result is not a valid absolute URI, it will be discarded, and an error | 337 | // If the result is not a valid absolute URI, it will be discarded, and an error | ||
| 316 | // returned. | 338 | // returned. | ||
| 317 | func (x *Uri) ParseRelative(UriRefVar string, FlagsVar UriFlags) (*Uri, error) { | 339 | func (x *Uri) ParseRelative(UriRefVar string, FlagsVar UriFlags) (*Uri, error) { | ||
| 340 | + | core.LazyRegister(&xUriParseRelative, "GLIB", "g_uri_parse_relative", false) | |||
| 318 | var cerr *Error | 341 | var cerr *Error | ||
| 319 | 342 | ||||
| 320 | cret := xUriParseRelative(x.GoPointer(), UriRefVar, FlagsVar, &cerr) | 343 | cret := xUriParseRelative(x.GoPointer(), UriRefVar, FlagsVar, &cerr) | ||
| @@ -331,6 +354,8 @@ var xUriRef func(uintptr) uintptr | |||||
| 331 | 354 | ||||
| 332 | // Increments the reference count of @uri by one. | 355 | // Increments the reference count of @uri by one. | ||
| 333 | func (x *Uri) Ref() *Uri { | 356 | func (x *Uri) Ref() *Uri { | ||
| 357 | + | core.LazyRegister(&xUriRef, "GLIB", "g_uri_ref", false) | |||
| 358 | + | ||||
| 334 | cret := xUriRef(x.GoPointer()) | 359 | cret := xUriRef(x.GoPointer()) | ||
| 335 | if cret == 0 { | 360 | if cret == 0 { | ||
| 336 | return nil | 361 | return nil | ||
| @@ -353,6 +378,8 @@ var xUriToString func(uintptr) string | |||||
| 353 | // or private data in its query string, and the returned string is going to be | 378 | // or private data in its query string, and the returned string is going to be | ||
| 354 | // logged, then consider using g_uri_to_string_partial() to redact parts. | 379 | // logged, then consider using g_uri_to_string_partial() to redact parts. | ||
| 355 | func (x *Uri) ToString() string { | 380 | func (x *Uri) ToString() string { | ||
| 381 | + | core.LazyRegister(&xUriToString, "GLIB", "g_uri_to_string", false) | |||
| 382 | + | ||||
| 356 | cret := xUriToString(x.GoPointer()) | 383 | cret := xUriToString(x.GoPointer()) | ||
| 357 | return cret | 384 | return cret | ||
| 358 | } | 385 | } | ||
| @@ -362,6 +389,8 @@ var xUriToStringPartial func(uintptr, UriHideFlags) string | |||||
| 362 | // Returns a string representing @uri, subject to the options in | 389 | // Returns a string representing @uri, subject to the options in | ||
| 363 | // @flags. See g_uri_to_string() and #GUriHideFlags for more details. | 390 | // @flags. See g_uri_to_string() and #GUriHideFlags for more details. | ||
| 364 | func (x *Uri) ToStringPartial(FlagsVar UriHideFlags) string { | 391 | func (x *Uri) ToStringPartial(FlagsVar UriHideFlags) string { | ||
| 392 | + | core.LazyRegister(&xUriToStringPartial, "GLIB", "g_uri_to_string_partial", false) | |||
| 393 | + | ||||
| 365 | cret := xUriToStringPartial(x.GoPointer(), FlagsVar) | 394 | cret := xUriToStringPartial(x.GoPointer(), FlagsVar) | ||
| 366 | return cret | 395 | return cret | ||
| 367 | } | 396 | } | ||
| @@ -373,6 +402,8 @@ var xUriUnref func(uintptr) | |||||
| 373 | // When the reference count reaches zero, the resources allocated by | 402 | // When the reference count reaches zero, the resources allocated by | ||
| 374 | // @uri are freed | 403 | // @uri are freed | ||
| 375 | func (x *Uri) Unref() { | 404 | func (x *Uri) Unref() { | ||
| 405 | + | core.LazyRegister(&xUriUnref, "GLIB", "g_uri_unref", false) | |||
| 406 | + | ||||
| 376 | xUriUnref(x.GoPointer()) | 407 | xUriUnref(x.GoPointer()) | ||
| 377 | } | 408 | } | ||
| 378 | 409 | ||||
| @@ -449,6 +480,8 @@ var xUriParamsIterInit func(uintptr, string, int, string, UriParamsFlags) | |||||
| 449 | // | 480 | // | ||
| 450 | // ]| | 481 | // ]| | ||
| 451 | func (x *UriParamsIter) Init(ParamsVar string, LengthVar int, SeparatorsVar string, FlagsVar UriParamsFlags) { | 482 | func (x *UriParamsIter) Init(ParamsVar string, LengthVar int, SeparatorsVar string, FlagsVar UriParamsFlags) { | ||
| 483 | + | core.LazyRegister(&xUriParamsIterInit, "GLIB", "g_uri_params_iter_init", false) | |||
| 484 | + | ||||
| 452 | xUriParamsIterInit(x.GoPointer(), ParamsVar, LengthVar, SeparatorsVar, FlagsVar) | 485 | xUriParamsIterInit(x.GoPointer(), ParamsVar, LengthVar, SeparatorsVar, FlagsVar) | ||
| 453 | } | 486 | } | ||
| 454 | 487 | ||||
| @@ -464,6 +497,7 @@ var xUriParamsIterNext func(uintptr, *string, *string, **Error) bool | |||||
| 464 | // Note that the same @attribute may be returned multiple times, since URIs | 497 | // Note that the same @attribute may be returned multiple times, since URIs | ||
| 465 | // allow repeated attributes. | 498 | // allow repeated attributes. | ||
| 466 | func (x *UriParamsIter) Next(AttributeVar *string, ValueVar *string) (bool, error) { | 499 | func (x *UriParamsIter) Next(AttributeVar *string, ValueVar *string) (bool, error) { | ||
| 500 | + | core.LazyRegister(&xUriParamsIterNext, "GLIB", "g_uri_params_iter_next", false) | |||
| 467 | var cerr *Error | 501 | var cerr *Error | ||
| 468 | 502 | ||||
| 469 | cret := xUriParamsIterNext(x.GoPointer(), AttributeVar, ValueVar, &cerr) | 503 | cret := xUriParamsIterNext(x.GoPointer(), AttributeVar, ValueVar, &cerr) | ||
| @@ -607,6 +641,8 @@ var xUriBuild func(UriFlags, string, uintptr, uintptr, int, string, uintptr, uin | |||||
| 607 | // See also g_uri_build_with_user(), which allows specifying the | 641 | // See also g_uri_build_with_user(), which allows specifying the | ||
| 608 | // components of the "userinfo" separately. | 642 | // components of the "userinfo" separately. | ||
| 609 | func UriBuild(FlagsVar UriFlags, SchemeVar string, UserinfoVar *string, HostVar *string, PortVar int, PathVar string, QueryVar *string, FragmentVar *string) *Uri { | 643 | func UriBuild(FlagsVar UriFlags, SchemeVar string, UserinfoVar *string, HostVar *string, PortVar int, PathVar string, QueryVar *string, FragmentVar *string) *Uri { | ||
| 644 | + | core.LazyRegister(&xUriBuild, "GLIB", "g_uri_build", false) | |||
| 645 | + | ||||
| 610 | UserinfoVarPtr := core.GStrdupNullable(UserinfoVar) | 646 | UserinfoVarPtr := core.GStrdupNullable(UserinfoVar) | ||
| 611 | defer core.GFreeNullable(UserinfoVarPtr) | 647 | defer core.GFreeNullable(UserinfoVarPtr) | ||
| 612 | 648 | ||||
| @@ -637,6 +673,8 @@ var xUriBuildWithUser func(UriFlags, string, uintptr, uintptr, uintptr, uintptr, | |||||
| 637 | // of the ‘userinfo’ field separately. Note that @user must be non-%NULL | 673 | // of the ‘userinfo’ field separately. Note that @user must be non-%NULL | ||
| 638 | // if either @password or @auth_params is non-%NULL. | 674 | // if either @password or @auth_params is non-%NULL. | ||
| 639 | func UriBuildWithUser(FlagsVar UriFlags, SchemeVar string, UserVar *string, PasswordVar *string, AuthParamsVar *string, HostVar *string, PortVar int, PathVar string, QueryVar *string, FragmentVar *string) *Uri { | 675 | func UriBuildWithUser(FlagsVar UriFlags, SchemeVar string, UserVar *string, PasswordVar *string, AuthParamsVar *string, HostVar *string, PortVar int, PathVar string, QueryVar *string, FragmentVar *string) *Uri { | ||
| 676 | + | core.LazyRegister(&xUriBuildWithUser, "GLIB", "g_uri_build_with_user", false) | |||
| 677 | + | ||||
| 640 | UserVarPtr := core.GStrdupNullable(UserVar) | 678 | UserVarPtr := core.GStrdupNullable(UserVar) | ||
| 641 | defer core.GFreeNullable(UserVarPtr) | 679 | defer core.GFreeNullable(UserVarPtr) | ||
| 642 | 680 | ||||
| @@ -676,6 +714,8 @@ var xUriEscapeBytes func([]byte, uint, uintptr) string | |||||
| 676 | // Though technically incorrect, this will also allow escaping nul | 714 | // Though technically incorrect, this will also allow escaping nul | ||
| 677 | // bytes as `%“00`. | 715 | // bytes as `%“00`. | ||
| 678 | func UriEscapeBytes(UnescapedVar []byte, LengthVar uint, ReservedCharsAllowedVar *string) string { | 716 | func UriEscapeBytes(UnescapedVar []byte, LengthVar uint, ReservedCharsAllowedVar *string) string { | ||
| 717 | + | core.LazyRegister(&xUriEscapeBytes, "GLIB", "g_uri_escape_bytes", false) | |||
| 718 | + | ||||
| 679 | ReservedCharsAllowedVarPtr := core.GStrdupNullable(ReservedCharsAllowedVar) | 719 | ReservedCharsAllowedVarPtr := core.GStrdupNullable(ReservedCharsAllowedVar) | ||
| 680 | defer core.GFreeNullable(ReservedCharsAllowedVarPtr) | 720 | defer core.GFreeNullable(ReservedCharsAllowedVarPtr) | ||
| 681 | 721 | ||||
| @@ -694,6 +734,8 @@ var xUriEscapeString func(string, uintptr, bool) string | |||||
| 694 | // in the URI specification, since those are allowed unescaped in some | 734 | // in the URI specification, since those are allowed unescaped in some | ||
| 695 | // portions of a URI. | 735 | // portions of a URI. | ||
| 696 | func UriEscapeString(UnescapedVar string, ReservedCharsAllowedVar *string, AllowUtf8Var bool) string { | 736 | func UriEscapeString(UnescapedVar string, ReservedCharsAllowedVar *string, AllowUtf8Var bool) string { | ||
| 737 | + | core.LazyRegister(&xUriEscapeString, "GLIB", "g_uri_escape_string", false) | |||
| 738 | + | ||||
| 697 | ReservedCharsAllowedVarPtr := core.GStrdupNullable(ReservedCharsAllowedVar) | 739 | ReservedCharsAllowedVarPtr := core.GStrdupNullable(ReservedCharsAllowedVar) | ||
| 698 | defer core.GFreeNullable(ReservedCharsAllowedVarPtr) | 740 | defer core.GFreeNullable(ReservedCharsAllowedVarPtr) | ||
| 699 | 741 | ||||
| @@ -712,6 +754,7 @@ var xUriIsValid func(string, UriFlags, **Error) bool | |||||
| 712 | // See g_uri_split(), and the definition of #GUriFlags, for more | 754 | // See g_uri_split(), and the definition of #GUriFlags, for more | ||
| 713 | // information on the effect of @flags. | 755 | // information on the effect of @flags. | ||
| 714 | func UriIsValid(UriStringVar string, FlagsVar UriFlags) (bool, error) { | 756 | func UriIsValid(UriStringVar string, FlagsVar UriFlags) (bool, error) { | ||
| 757 | + | core.LazyRegister(&xUriIsValid, "GLIB", "g_uri_is_valid", false) | |||
| 715 | var cerr *Error | 758 | var cerr *Error | ||
| 716 | 759 | ||||
| 717 | cret := xUriIsValid(UriStringVar, FlagsVar, &cerr) | 760 | cret := xUriIsValid(UriStringVar, FlagsVar, &cerr) | ||
| @@ -738,6 +781,8 @@ var xUriJoin func(UriFlags, uintptr, uintptr, uintptr, int, string, uintptr, uin | |||||
| 738 | // %G_URI_FLAGS_HAS_PASSWORD and %G_URI_FLAGS_HAS_AUTH_PARAMS are ignored if set | 781 | // %G_URI_FLAGS_HAS_PASSWORD and %G_URI_FLAGS_HAS_AUTH_PARAMS are ignored if set | ||
| 739 | // in @flags. | 782 | // in @flags. | ||
| 740 | func UriJoin(FlagsVar UriFlags, SchemeVar *string, UserinfoVar *string, HostVar *string, PortVar int, PathVar string, QueryVar *string, FragmentVar *string) string { | 783 | func UriJoin(FlagsVar UriFlags, SchemeVar *string, UserinfoVar *string, HostVar *string, PortVar int, PathVar string, QueryVar *string, FragmentVar *string) string { | ||
| 784 | + | core.LazyRegister(&xUriJoin, "GLIB", "g_uri_join", false) | |||
| 785 | + | ||||
| 741 | SchemeVarPtr := core.GStrdupNullable(SchemeVar) | 786 | SchemeVarPtr := core.GStrdupNullable(SchemeVar) | ||
| 742 | defer core.GFreeNullable(SchemeVarPtr) | 787 | defer core.GFreeNullable(SchemeVarPtr) | ||
| 743 | 788 | ||||
| @@ -769,6 +814,8 @@ var xUriJoinWithUser func(UriFlags, uintptr, uintptr, uintptr, uintptr, uintptr, | |||||
| 769 | // %G_URI_FLAGS_HAS_PASSWORD and %G_URI_FLAGS_HAS_AUTH_PARAMS are ignored if set | 814 | // %G_URI_FLAGS_HAS_PASSWORD and %G_URI_FLAGS_HAS_AUTH_PARAMS are ignored if set | ||
| 770 | // in @flags. | 815 | // in @flags. | ||
| 771 | func UriJoinWithUser(FlagsVar UriFlags, SchemeVar *string, UserVar *string, PasswordVar *string, AuthParamsVar *string, HostVar *string, PortVar int, PathVar string, QueryVar *string, FragmentVar *string) string { | 816 | func UriJoinWithUser(FlagsVar UriFlags, SchemeVar *string, UserVar *string, PasswordVar *string, AuthParamsVar *string, HostVar *string, PortVar int, PathVar string, QueryVar *string, FragmentVar *string) string { | ||
| 817 | + | core.LazyRegister(&xUriJoinWithUser, "GLIB", "g_uri_join_with_user", false) | |||
| 818 | + | ||||
| 772 | SchemeVarPtr := core.GStrdupNullable(SchemeVar) | 819 | SchemeVarPtr := core.GStrdupNullable(SchemeVar) | ||
| 773 | defer core.GFreeNullable(SchemeVarPtr) | 820 | defer core.GFreeNullable(SchemeVarPtr) | ||
| 774 | 821 | ||||
| @@ -800,6 +847,7 @@ var xUriParse func(string, UriFlags, **Error) uintptr | |||||
| 800 | // valid [absolute URI](#relative-and-absolute-uris), it will be discarded, and an | 847 | // valid [absolute URI](#relative-and-absolute-uris), it will be discarded, and an | ||
| 801 | // error returned. | 848 | // error returned. | ||
| 802 | func UriParse(UriStringVar string, FlagsVar UriFlags) (*Uri, error) { | 849 | func UriParse(UriStringVar string, FlagsVar UriFlags) (*Uri, error) { | ||
| 850 | + | core.LazyRegister(&xUriParse, "GLIB", "g_uri_parse", false) | |||
| 803 | var cerr *Error | 851 | var cerr *Error | ||
| 804 | 852 | ||||
| 805 | cret := xUriParse(UriStringVar, FlagsVar, &cerr) | 853 | cret := xUriParse(UriStringVar, FlagsVar, &cerr) | ||
| @@ -839,6 +887,7 @@ var xUriParseParams func(string, int, string, UriParamsFlags, **Error) uintptr | |||||
| 839 | // If @params cannot be parsed (for example, it contains two @separators | 887 | // If @params cannot be parsed (for example, it contains two @separators | ||
| 840 | // characters in a row), then @error is set and %NULL is returned. | 888 | // characters in a row), then @error is set and %NULL is returned. | ||
| 841 | func UriParseParams(ParamsVar string, LengthVar int, SeparatorsVar string, FlagsVar UriParamsFlags) (*HashTable, error) { | 889 | func UriParseParams(ParamsVar string, LengthVar int, SeparatorsVar string, FlagsVar UriParamsFlags) (*HashTable, error) { | ||
| 890 | + | core.LazyRegister(&xUriParseParams, "GLIB", "g_uri_parse_params", false) | |||
| 842 | var cerr *Error | 891 | var cerr *Error | ||
| 843 | 892 | ||||
| 844 | cret := xUriParseParams(ParamsVar, LengthVar, SeparatorsVar, FlagsVar, &cerr) | 893 | cret := xUriParseParams(ParamsVar, LengthVar, SeparatorsVar, FlagsVar, &cerr) | ||
| @@ -861,6 +910,8 @@ var xUriParseScheme func(string) string | |||||
| 861 | // ]| | 910 | // ]| | ||
| 862 | // Common schemes include `file`, `https`, `svn+ssh`, etc. | 911 | // Common schemes include `file`, `https`, `svn+ssh`, etc. | ||
| 863 | func UriParseScheme(UriVar string) string { | 912 | func UriParseScheme(UriVar string) string { | ||
| 913 | + | core.LazyRegister(&xUriParseScheme, "GLIB", "g_uri_parse_scheme", false) | |||
| 914 | + | ||||
| 864 | cret := xUriParseScheme(UriVar) | 915 | cret := xUriParseScheme(UriVar) | ||
| 865 | return cret | 916 | return cret | ||
| 866 | } | 917 | } | ||
| @@ -878,6 +929,8 @@ var xUriPeekScheme func(string) string | |||||
| 878 | // Unlike g_uri_parse_scheme(), the returned scheme is normalized to | 929 | // Unlike g_uri_parse_scheme(), the returned scheme is normalized to | ||
| 879 | // all-lowercase and does not need to be freed. | 930 | // all-lowercase and does not need to be freed. | ||
| 880 | func UriPeekScheme(UriVar string) string { | 931 | func UriPeekScheme(UriVar string) string { | ||
| 932 | + | core.LazyRegister(&xUriPeekScheme, "GLIB", "g_uri_peek_scheme", false) | |||
| 933 | + | ||||
| 881 | cret := xUriPeekScheme(UriVar) | 934 | cret := xUriPeekScheme(UriVar) | ||
| 882 | return cret | 935 | return cret | ||
| 883 | } | 936 | } | ||
| @@ -892,6 +945,7 @@ var xUriResolveRelative func(uintptr, string, UriFlags, **Error) string | |||||
| 892 | // (If @base_uri_string is %NULL, this just returns @uri_ref, or | 945 | // (If @base_uri_string is %NULL, this just returns @uri_ref, or | ||
| 893 | // %NULL if @uri_ref is invalid or not absolute.) | 946 | // %NULL if @uri_ref is invalid or not absolute.) | ||
| 894 | func UriResolveRelative(BaseUriStringVar *string, UriRefVar string, FlagsVar UriFlags) (string, error) { | 947 | func UriResolveRelative(BaseUriStringVar *string, UriRefVar string, FlagsVar UriFlags) (string, error) { | ||
| 948 | + | core.LazyRegister(&xUriResolveRelative, "GLIB", "g_uri_resolve_relative", false) | |||
| 895 | var cerr *Error | 949 | var cerr *Error | ||
| 896 | 950 | ||||
| 897 | BaseUriStringVarPtr := core.GStrdupNullable(BaseUriStringVar) | 951 | BaseUriStringVarPtr := core.GStrdupNullable(BaseUriStringVar) | ||
| @@ -923,6 +977,7 @@ var xUriSplit func(string, UriFlags, *string, *string, *string, *int, *string, * | |||||
| 923 | // since it always returns only the full userinfo; use | 977 | // since it always returns only the full userinfo; use | ||
| 924 | // g_uri_split_with_user() if you want it split up. | 978 | // g_uri_split_with_user() if you want it split up. | ||
| 925 | func UriSplit(UriRefVar string, FlagsVar UriFlags, SchemeVar *string, UserinfoVar *string, HostVar *string, PortVar *int, PathVar *string, QueryVar *string, FragmentVar *string) (bool, error) { | 979 | func UriSplit(UriRefVar string, FlagsVar UriFlags, SchemeVar *string, UserinfoVar *string, HostVar *string, PortVar *int, PathVar *string, QueryVar *string, FragmentVar *string) (bool, error) { | ||
| 980 | + | core.LazyRegister(&xUriSplit, "GLIB", "g_uri_split", false) | |||
| 926 | var cerr *Error | 981 | var cerr *Error | ||
| 927 | 982 | ||||
| 928 | cret := xUriSplit(UriRefVar, FlagsVar, SchemeVar, UserinfoVar, HostVar, PortVar, PathVar, QueryVar, FragmentVar, &cerr) | 983 | cret := xUriSplit(UriRefVar, FlagsVar, SchemeVar, UserinfoVar, HostVar, PortVar, PathVar, QueryVar, FragmentVar, &cerr) | ||
| @@ -941,6 +996,7 @@ var xUriSplitNetwork func(string, UriFlags, *string, *string, *int, **Error) boo | |||||
| 941 | // However, it will return an error if @uri_string is a relative URI, | 996 | // However, it will return an error if @uri_string is a relative URI, | ||
| 942 | // or does not contain a hostname component. | 997 | // or does not contain a hostname component. | ||
| 943 | func UriSplitNetwork(UriStringVar string, FlagsVar UriFlags, SchemeVar *string, HostVar *string, PortVar *int) (bool, error) { | 998 | func UriSplitNetwork(UriStringVar string, FlagsVar UriFlags, SchemeVar *string, HostVar *string, PortVar *int) (bool, error) { | ||
| 999 | + | core.LazyRegister(&xUriSplitNetwork, "GLIB", "g_uri_split_network", false) | |||
| 944 | var cerr *Error | 1000 | var cerr *Error | ||
| 945 | 1001 | ||||
| 946 | cret := xUriSplitNetwork(UriStringVar, FlagsVar, SchemeVar, HostVar, PortVar, &cerr) | 1002 | cret := xUriSplitNetwork(UriStringVar, FlagsVar, SchemeVar, HostVar, PortVar, &cerr) | ||
| @@ -964,6 +1020,7 @@ var xUriSplitWithUser func(string, UriFlags, *string, *string, *string, *string, | |||||
| 964 | // @auth_params will only be parsed out if @flags contains | 1020 | // @auth_params will only be parsed out if @flags contains | ||
| 965 | // %G_URI_FLAGS_HAS_AUTH_PARAMS. | 1021 | // %G_URI_FLAGS_HAS_AUTH_PARAMS. | ||
| 966 | func UriSplitWithUser(UriRefVar string, FlagsVar UriFlags, SchemeVar *string, UserVar *string, PasswordVar *string, AuthParamsVar *string, HostVar *string, PortVar *int, PathVar *string, QueryVar *string, FragmentVar *string) (bool, error) { | 1022 | func UriSplitWithUser(UriRefVar string, FlagsVar UriFlags, SchemeVar *string, UserVar *string, PasswordVar *string, AuthParamsVar *string, HostVar *string, PortVar *int, PathVar *string, QueryVar *string, FragmentVar *string) (bool, error) { | ||
| 1023 | + | core.LazyRegister(&xUriSplitWithUser, "GLIB", "g_uri_split_with_user", false) | |||
| 967 | var cerr *Error | 1024 | var cerr *Error | ||
| 968 | 1025 | ||||
| 969 | cret := xUriSplitWithUser(UriRefVar, FlagsVar, SchemeVar, UserVar, PasswordVar, AuthParamsVar, HostVar, PortVar, PathVar, QueryVar, FragmentVar, &cerr) | 1026 | cret := xUriSplitWithUser(UriRefVar, FlagsVar, SchemeVar, UserVar, PasswordVar, AuthParamsVar, HostVar, PortVar, PathVar, QueryVar, FragmentVar, &cerr) | ||
| @@ -986,6 +1043,7 @@ var xUriUnescapeBytes func(string, int, uintptr, **Error) uintptr | |||||
| 986 | // being expanded in an escaped path element, which might confuse pathname | 1043 | // being expanded in an escaped path element, which might confuse pathname | ||
| 987 | // handling. | 1044 | // handling. | ||
| 988 | func UriUnescapeBytes(EscapedStringVar string, LengthVar int, IllegalCharactersVar *string) (*Bytes, error) { | 1045 | func UriUnescapeBytes(EscapedStringVar string, LengthVar int, IllegalCharactersVar *string) (*Bytes, error) { | ||
| 1046 | + | core.LazyRegister(&xUriUnescapeBytes, "GLIB", "g_uri_unescape_bytes", false) | |||
| 989 | var cerr *Error | 1047 | var cerr *Error | ||
| 990 | 1048 | ||||
| 991 | IllegalCharactersVarPtr := core.GStrdupNullable(IllegalCharactersVar) | 1049 | IllegalCharactersVarPtr := core.GStrdupNullable(IllegalCharactersVar) | ||
| @@ -1014,6 +1072,8 @@ var xUriUnescapeSegment func(uintptr, uintptr, uintptr) string | |||||
| 1014 | // Note: `NUL` byte is not accepted in the output, in contrast to | 1072 | // Note: `NUL` byte is not accepted in the output, in contrast to | ||
| 1015 | // g_uri_unescape_bytes(). | 1073 | // g_uri_unescape_bytes(). | ||
| 1016 | func UriUnescapeSegment(EscapedStringVar *string, EscapedStringEndVar *string, IllegalCharactersVar *string) string { | 1074 | func UriUnescapeSegment(EscapedStringVar *string, EscapedStringEndVar *string, IllegalCharactersVar *string) string { | ||
| 1075 | + | core.LazyRegister(&xUriUnescapeSegment, "GLIB", "g_uri_unescape_segment", false) | |||
| 1076 | + | ||||
| 1017 | EscapedStringVarPtr := core.GStrdupNullable(EscapedStringVar) | 1077 | EscapedStringVarPtr := core.GStrdupNullable(EscapedStringVar) | ||
| 1018 | defer core.GFreeNullable(EscapedStringVarPtr) | 1078 | defer core.GFreeNullable(EscapedStringVarPtr) | ||
| 1019 | 1079 | ||||
| @@ -1037,6 +1097,8 @@ var xUriUnescapeString func(string, uintptr) string | |||||
| 1037 | // want to avoid for instance having a slash being expanded in an | 1097 | // want to avoid for instance having a slash being expanded in an | ||
| 1038 | // escaped path element, which might confuse pathname handling. | 1098 | // escaped path element, which might confuse pathname handling. | ||
| 1039 | func UriUnescapeString(EscapedStringVar string, IllegalCharactersVar *string) string { | 1099 | func UriUnescapeString(EscapedStringVar string, IllegalCharactersVar *string) string { | ||
| 1100 | + | core.LazyRegister(&xUriUnescapeString, "GLIB", "g_uri_unescape_string", false) | |||
| 1101 | + | ||||
| 1040 | IllegalCharactersVarPtr := core.GStrdupNullable(IllegalCharactersVar) | 1102 | IllegalCharactersVarPtr := core.GStrdupNullable(IllegalCharactersVar) | ||
| 1041 | defer core.GFreeNullable(IllegalCharactersVarPtr) | 1103 | defer core.GFreeNullable(IllegalCharactersVarPtr) | ||
| 1042 | 1104 | ||||
| @@ -1047,53 +1109,4 @@ func UriUnescapeString(EscapedStringVar string, IllegalCharactersVar *string) st | |||||
| 1047 | func init() { | 1109 | func init() { | ||
| 1048 | core.SetPackageName("GLIB", "glib-2.0") | 1110 | core.SetPackageName("GLIB", "glib-2.0") | ||
| 1049 | core.SetSharedLibraries("GLIB", []string{"libgobject-2.0.so.0", "libglib-2.0.so.0", "libgobject-2.0.0.dylib", "libglib-2.0.0.dylib"}) | 1111 | core.SetSharedLibraries("GLIB", []string{"libgobject-2.0.so.0", "libglib-2.0.so.0", "libgobject-2.0.0.dylib", "libglib-2.0.0.dylib"}) | ||
| 1050 | - | var libs []uintptr | |||
| 1051 | - | for _, libPath := range core.GetPaths("GLIB") { | |||
| 1052 | - | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |||
| 1053 | - | if err != nil { | |||
| 1054 | - | panic(err) | |||
| 1055 | - | } | |||
| 1056 | - | libs = append(libs, lib) | |||
| 1057 | - | } | |||
| 1058 | - | ||||
| 1059 | - | core.PuregoSafeRegister(&xUriBuild, libs, "g_uri_build") | |||
| 1060 | - | core.PuregoSafeRegister(&xUriBuildWithUser, libs, "g_uri_build_with_user") | |||
| 1061 | - | core.PuregoSafeRegister(&xUriEscapeBytes, libs, "g_uri_escape_bytes") | |||
| 1062 | - | core.PuregoSafeRegister(&xUriEscapeString, libs, "g_uri_escape_string") | |||
| 1063 | - | core.PuregoSafeRegister(&xUriIsValid, libs, "g_uri_is_valid") | |||
| 1064 | - | core.PuregoSafeRegister(&xUriJoin, libs, "g_uri_join") | |||
| 1065 | - | core.PuregoSafeRegister(&xUriJoinWithUser, libs, "g_uri_join_with_user") | |||
| 1066 | - | core.PuregoSafeRegister(&xUriParse, libs, "g_uri_parse") | |||
| 1067 | - | core.PuregoSafeRegister(&xUriParseParams, libs, "g_uri_parse_params") | |||
| 1068 | - | core.PuregoSafeRegister(&xUriParseScheme, libs, "g_uri_parse_scheme") | |||
| 1069 | - | core.PuregoSafeRegister(&xUriPeekScheme, libs, "g_uri_peek_scheme") | |||
| 1070 | - | core.PuregoSafeRegister(&xUriResolveRelative, libs, "g_uri_resolve_relative") | |||
| 1071 | - | core.PuregoSafeRegister(&xUriSplit, libs, "g_uri_split") | |||
| 1072 | - | core.PuregoSafeRegister(&xUriSplitNetwork, libs, "g_uri_split_network") | |||
| 1073 | - | core.PuregoSafeRegister(&xUriSplitWithUser, libs, "g_uri_split_with_user") | |||
| 1074 | - | core.PuregoSafeRegister(&xUriUnescapeBytes, libs, "g_uri_unescape_bytes") | |||
| 1075 | - | core.PuregoSafeRegister(&xUriUnescapeSegment, libs, "g_uri_unescape_segment") | |||
| 1076 | - | core.PuregoSafeRegister(&xUriUnescapeString, libs, "g_uri_unescape_string") | |||
| 1077 | - | ||||
| 1078 | - | core.PuregoSafeRegister(&xUriGLibType, libs, "g_uri_get_type") | |||
| 1079 | - | ||||
| 1080 | - | core.PuregoSafeRegister(&xUriGetAuthParams, libs, "g_uri_get_auth_params") | |||
| 1081 | - | core.PuregoSafeRegister(&xUriGetFlags, libs, "g_uri_get_flags") | |||
| 1082 | - | core.PuregoSafeRegister(&xUriGetFragment, libs, "g_uri_get_fragment") | |||
| 1083 | - | core.PuregoSafeRegister(&xUriGetHost, libs, "g_uri_get_host") | |||
| 1084 | - | core.PuregoSafeRegister(&xUriGetPassword, libs, "g_uri_get_password") | |||
| 1085 | - | core.PuregoSafeRegister(&xUriGetPath, libs, "g_uri_get_path") | |||
| 1086 | - | core.PuregoSafeRegister(&xUriGetPort, libs, "g_uri_get_port") | |||
| 1087 | - | core.PuregoSafeRegister(&xUriGetQuery, libs, "g_uri_get_query") | |||
| 1088 | - | core.PuregoSafeRegister(&xUriGetScheme, libs, "g_uri_get_scheme") | |||
| 1089 | - | core.PuregoSafeRegister(&xUriGetUser, libs, "g_uri_get_user") | |||
| 1090 | - | core.PuregoSafeRegister(&xUriGetUserinfo, libs, "g_uri_get_userinfo") | |||
| 1091 | - | core.PuregoSafeRegister(&xUriParseRelative, libs, "g_uri_parse_relative") | |||
| 1092 | - | core.PuregoSafeRegister(&xUriRef, libs, "g_uri_ref") | |||
| 1093 | - | core.PuregoSafeRegister(&xUriToString, libs, "g_uri_to_string") | |||
| 1094 | - | core.PuregoSafeRegister(&xUriToStringPartial, libs, "g_uri_to_string_partial") | |||
| 1095 | - | core.PuregoSafeRegister(&xUriUnref, libs, "g_uri_unref") | |||
| 1096 | - | ||||
| 1097 | - | core.PuregoSafeRegister(&xUriParamsIterInit, libs, "g_uri_params_iter_init") | |||
| 1098 | - | core.PuregoSafeRegister(&xUriParamsIterNext, libs, "g_uri_params_iter_next") | |||
| 1099 | } | 1112 | } | ||