Skip to content

Commit ad05798

Browse files
AzathothasAzathothas
committed
♻️ Synced dbin 📦 <-- dbin: update deps ⌚
1 parent 8746da9 commit ad05798

File tree

6 files changed

+110
-48
lines changed

6 files changed

+110
-48
lines changed

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ require (
1717
github.com/klauspost/compress v1.18.0
1818
github.com/pkg/xattr v0.4.12
1919
github.com/shamaton/msgpack/v2 v2.2.3
20-
github.com/tdewolff/minify/v2 v2.23.8
21-
github.com/tiendc/go-deepcopy v1.6.0
20+
github.com/tdewolff/minify/v2 v2.23.10
21+
github.com/tiendc/go-deepcopy v1.6.1
2222
github.com/urfave/cli/v3 v3.3.8
2323
github.com/zeebo/blake3 v0.2.4
2424
github.com/zeebo/errs v1.4.0

‎go.sum‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,16 @@ github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOf
5050
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
5151
github.com/tdewolff/minify/v2 v2.23.8 h1:tvjHzRer46kwOfpdCBCWsDblCw3QtnLJRd61pTVkyZ8=
5252
github.com/tdewolff/minify/v2 v2.23.8/go.mod h1:VW3ISUd3gDOZuQ/jwZr4sCzsuX+Qvsx87FDMjk6Rvno=
53+
github.com/tdewolff/minify/v2 v2.23.10 h1:puzRCH00Im+KDf+PxuuSmJykMTVd8Pp1HzTCxVutNmI=
54+
github.com/tdewolff/minify/v2 v2.23.10/go.mod h1:VW3ISUd3gDOZuQ/jwZr4sCzsuX+Qvsx87FDMjk6Rvno=
5355
github.com/tdewolff/parse/v2 v2.8.1 h1:J5GSHru6o3jF1uLlEKVXkDxxcVx6yzOlIVIotK4w2po=
5456
github.com/tdewolff/parse/v2 v2.8.1/go.mod h1:Hwlni2tiVNKyzR1o6nUs4FOF07URA+JLBLd6dlIXYqo=
5557
github.com/tdewolff/test v1.0.11 h1:FdLbwQVHxqG16SlkGveC0JVyrJN62COWTRyUFzfbtBE=
5658
github.com/tdewolff/test v1.0.11/go.mod h1:XPuWBzvdUzhCuxWO1ojpXsyzsA5bFoS3tO/Q3kFuTG8=
5759
github.com/tiendc/go-deepcopy v1.6.0 h1:0UtfV/imoCwlLxVsyfUd4hNHnB3drXsfle+wzSCA5Wo=
5860
github.com/tiendc/go-deepcopy v1.6.0/go.mod h1:toXoeQoUqXOOS/X4sKuiAoSk6elIdqc0pN7MTgOOo2I=
61+
github.com/tiendc/go-deepcopy v1.6.1 h1:uVRTItFeNHkMcLueHS7OCsxgxT9P8MzGB/taUa2Y4Tk=
62+
github.com/tiendc/go-deepcopy v1.6.1/go.mod h1:toXoeQoUqXOOS/X4sKuiAoSk6elIdqc0pN7MTgOOo2I=
5963
github.com/urfave/cli/v3 v3.3.8 h1:BzolUExliMdet9NlJ/u4m5vHSotJ3PzEqSAZ1oPMa/E=
6064
github.com/urfave/cli/v3 v3.3.8/go.mod h1:FJSKtM/9AiiTOJL4fJ6TbMUkxBXn7GO9guZqoZtpYpo=
6165
github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=

‎misc/cmd/dbinRepoIndexGenerators/1.4/generator.go‎

Lines changed: 33 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// TODO: Add blessed selection, a cherry-picked repo made up of programs from autogenerated repos like pkgforge-go/pkgforge-cargo, this one would be included in the default repo index _AND_ as standalone
2+
// - We'll have a PickFrom() function that accepts a repository index (DbinMetadata) and a .Pkg and .PkgId, it uses these two to get us the item we want. We'll use this in our blessed repo.
13
package main
24

35
import (
@@ -12,6 +14,7 @@ import (
1214

1315
"github.com/fxamacker/cbor/v2"
1416
"github.com/goccy/go-json"
17+
"github.com/klauspost/compress/zstd"
1518
minify "github.com/tdewolff/minify/v2"
1619
mjson "github.com/tdewolff/minify/v2/json"
1720
"github.com/tiendc/go-deepcopy"
@@ -170,21 +173,32 @@ func loadAppStreamMetadata() error {
170173
return nil
171174
}
172175

173-
//resp, err := http.Get("https://github.com/xplshn/dbin-metadata/raw/refs/heads/master/misc/cmd/flatpakAppStreamScrapper/appstream_metadata.cbor")
174-
resp, err := http.Get("https://d.xplshn.com.ar/misc/cmd/flatpakAppStreamScrapper/appstream_metadata.cbor")
176+
//resp, err := http.Get("https://d.xplshn.com.ar/misc/cmd/flatpakAppStreamScrapper/appstream_metadata.cbor")
177+
resp, err := http.Get("https://github.com/xplshn/dbin-metadata/raw/refs/heads/master/misc/cmd/flatpakAppStreamScrapper/appstream_metadata.cbor.zst")
175178
if err != nil {
176-
return err
179+
return fmt.Errorf("failed to fetch Flathub AppStream metadata: %v", err)
177180
}
178181
defer resp.Body.Close()
179182

180183
body, err := io.ReadAll(resp.Body)
181184
if err != nil {
182-
return err
185+
return fmt.Errorf("failed to read response body: %v", err)
183186
}
184187

185-
err = cbor.Unmarshal(body, &appStreamMetadata)
188+
zstdReader, err := zstd.NewReader(nil, zstd.WithDecoderConcurrency(1))
186189
if err != nil {
187-
return err
190+
return fmt.Errorf("failed to create zstd reader: %v", err)
191+
}
192+
defer zstdReader.Close()
193+
194+
decompressed, err := zstdReader.DecodeAll(body, nil)
195+
if err != nil {
196+
return fmt.Errorf("failed to decompress data: %v", err)
197+
}
198+
199+
err = cbor.Unmarshal(decompressed, &appStreamMetadata)
200+
if err != nil {
201+
return fmt.Errorf("failed to unmarshal Flathub AppStream metadata: %v", err)
188202
}
189203

190204
appStreamMetadataLoaded = true
@@ -575,17 +589,19 @@ func main() {
575589
"https://meta.pkgforge.dev/external/pkgforge-go/%s.json",
576590
},
577591
Standalone: true,
578-
//Filter: func(items *[]DbinItem) {
579-
// var filteredItems []DbinItem
580-
// for _, item := range *items {
581-
// if !strings.Contains(item.Description, "bindings") && !strings.Contains(item.Description, "key") {
582-
// filteredItems = append(filteredItems, item)
583-
// } /* else {
584-
// fmt.Printf("[pkgforge-go]: repo filter: %s#%s contains bad word (%s)", item.Name, item.PkgId, "bindings")
585-
// } */
586-
// }
587-
// *items = filteredItems
588-
//},
592+
Filter: func(items *[]DbinItem) {
593+
var filteredItems []DbinItem
594+
for _, item := range *items {
595+
//if !strings.Contains(item.Description, "bindings") && !strings.Contains(item.Description, "key") {
596+
// filteredItems = append(filteredItems, item)
597+
//} /* else {
598+
// fmt.Printf("[pkgforge-go]: repo filter: %s#%s contains bad word (%s)", item.Name, item.PkgId, "bindings")
599+
//} */
600+
item.PkgId = strings.Replace(item.PkgId, "#", ".", -1)
601+
filteredItems = append(filteredItems, item)
602+
}
603+
*items = filteredItems
604+
},
589605
},
590606
Handler: PkgForgeHandler{},
591607
},

‎misc/cmd/dbinRepoIndexGenerators/1.5/generator.go‎

Lines changed: 33 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// TODO: Add blessed selection, a cherry-picked repo made up of programs from autogenerated repos like pkgforge-go/pkgforge-cargo, this one would be included in the default repo index _AND_ as standalone
2+
// - We'll have a PickFrom() function that accepts a repository index (DbinMetadata) and a .Pkg and .PkgId, it uses these two to get us the item we want. We'll use this in our blessed repo.
13
package main
24

35
import (
@@ -12,6 +14,7 @@ import (
1214

1315
"github.com/fxamacker/cbor/v2"
1416
"github.com/goccy/go-json"
17+
"github.com/klauspost/compress/zstd"
1518
minify "github.com/tdewolff/minify/v2"
1619
mjson "github.com/tdewolff/minify/v2/json"
1720
"github.com/tiendc/go-deepcopy"
@@ -170,21 +173,32 @@ func loadAppStreamMetadata() error {
170173
return nil
171174
}
172175

173-
//resp, err := http.Get("https://github.com/xplshn/dbin-metadata/raw/refs/heads/master/misc/cmd/flatpakAppStreamScrapper/appstream_metadata.cbor")
174-
resp, err := http.Get("https://d.xplshn.com.ar/misc/cmd/flatpakAppStreamScrapper/appstream_metadata.cbor")
176+
//resp, err := http.Get("https://d.xplshn.com.ar/misc/cmd/flatpakAppStreamScrapper/appstream_metadata.cbor")
177+
resp, err := http.Get("https://github.com/xplshn/dbin-metadata/raw/refs/heads/master/misc/cmd/flatpakAppStreamScrapper/appstream_metadata.cbor.zst")
175178
if err != nil {
176-
return err
179+
return fmt.Errorf("failed to fetch Flathub AppStream metadata: %v", err)
177180
}
178181
defer resp.Body.Close()
179182

180183
body, err := io.ReadAll(resp.Body)
181184
if err != nil {
182-
return err
185+
return fmt.Errorf("failed to read response body: %v", err)
183186
}
184187

185-
err = cbor.Unmarshal(body, &appStreamMetadata)
188+
zstdReader, err := zstd.NewReader(nil, zstd.WithDecoderConcurrency(1))
186189
if err != nil {
187-
return err
190+
return fmt.Errorf("failed to create zstd reader: %v", err)
191+
}
192+
defer zstdReader.Close()
193+
194+
decompressed, err := zstdReader.DecodeAll(body, nil)
195+
if err != nil {
196+
return fmt.Errorf("failed to decompress data: %v", err)
197+
}
198+
199+
err = cbor.Unmarshal(decompressed, &appStreamMetadata)
200+
if err != nil {
201+
return fmt.Errorf("failed to unmarshal Flathub AppStream metadata: %v", err)
188202
}
189203

190204
appStreamMetadataLoaded = true
@@ -575,17 +589,19 @@ func main() {
575589
"https://meta.pkgforge.dev/external/pkgforge-go/%s.json",
576590
},
577591
Standalone: true,
578-
//Filter: func(items *[]DbinItem) {
579-
// var filteredItems []DbinItem
580-
// for _, item := range *items {
581-
// if !strings.Contains(item.Description, "bindings") && !strings.Contains(item.Description, "key") {
582-
// filteredItems = append(filteredItems, item)
583-
// } /* else {
584-
// fmt.Printf("[pkgforge-go]: repo filter: %s#%s contains bad word (%s)", item.Name, item.PkgId, "bindings")
585-
// } */
586-
// }
587-
// *items = filteredItems
588-
//},
592+
Filter: func(items *[]DbinItem) {
593+
var filteredItems []DbinItem
594+
for _, item := range *items {
595+
//if !strings.Contains(item.Description, "bindings") && !strings.Contains(item.Description, "key") {
596+
// filteredItems = append(filteredItems, item)
597+
//} /* else {
598+
// fmt.Printf("[pkgforge-go]: repo filter: %s#%s contains bad word (%s)", item.Name, item.PkgId, "bindings")
599+
//} */
600+
item.PkgId = strings.Replace(item.PkgId, "#", ".", -1)
601+
filteredItems = append(filteredItems, item)
602+
}
603+
*items = filteredItems
604+
},
589605
},
590606
Handler: PkgForgeHandler{},
591607
},

‎misc/cmd/dbinRepoIndexGenerators/1.6/generator.go‎

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// TODO: Add blessed selection, a cherry-picked repo made up of programs from autogenerated repos like pkgforge-go/pkgforge-cargo, this one would be included in the default repo index _AND_ as standalone
2+
// - We'll have a PickFrom() function that accepts a repository index (DbinMetadata) and a .Pkg and .PkgId, it uses these two to get us the item we want. We'll use this in our blessed repo.
23
package main
34

45
import (
@@ -13,6 +14,7 @@ import (
1314

1415
"github.com/fxamacker/cbor/v2"
1516
"github.com/goccy/go-json"
17+
"github.com/klauspost/compress/zstd"
1618
minify "github.com/tdewolff/minify/v2"
1719
mjson "github.com/tdewolff/minify/v2/json"
1820
"github.com/tiendc/go-deepcopy"
@@ -171,21 +173,32 @@ func loadAppStreamMetadata() error {
171173
return nil
172174
}
173175

174-
//resp, err := http.Get("https://github.com/xplshn/dbin-metadata/raw/refs/heads/master/misc/cmd/flatpakAppStreamScrapper/appstream_metadata.cbor")
175-
resp, err := http.Get("https://d.xplshn.com.ar/misc/cmd/flatpakAppStreamScrapper/appstream_metadata.cbor")
176+
//resp, err := http.Get("https://d.xplshn.com.ar/misc/cmd/flatpakAppStreamScrapper/appstream_metadata.cbor")
177+
resp, err := http.Get("https://github.com/xplshn/dbin-metadata/raw/refs/heads/master/misc/cmd/flatpakAppStreamScrapper/appstream_metadata.cbor.zst")
176178
if err != nil {
177-
return err
179+
return fmt.Errorf("failed to fetch Flathub AppStream metadata: %v", err)
178180
}
179181
defer resp.Body.Close()
180182

181183
body, err := io.ReadAll(resp.Body)
182184
if err != nil {
183-
return err
185+
return fmt.Errorf("failed to read response body: %v", err)
184186
}
185187

186-
err = cbor.Unmarshal(body, &appStreamMetadata)
188+
zstdReader, err := zstd.NewReader(nil, zstd.WithDecoderConcurrency(1))
187189
if err != nil {
188-
return err
190+
return fmt.Errorf("failed to create zstd reader: %v", err)
191+
}
192+
defer zstdReader.Close()
193+
194+
decompressed, err := zstdReader.DecodeAll(body, nil)
195+
if err != nil {
196+
return fmt.Errorf("failed to decompress data: %v", err)
197+
}
198+
199+
err = cbor.Unmarshal(decompressed, &appStreamMetadata)
200+
if err != nil {
201+
return fmt.Errorf("failed to unmarshal Flathub AppStream metadata: %v", err)
189202
}
190203

191204
appStreamMetadataLoaded = true

‎misc/cmd/dbinRepoIndexGenerators/1.7/generator.go‎

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// TODO: Add blessed selection, a cherry-picked repo made up of programs from autogenerated repos like pkgforge-go/pkgforge-cargo, this one would be included in the default repo index _AND_ as standalone
2+
// - We'll have a PickFrom() function that accepts a repository index (DbinMetadata) and a .Pkg and .PkgId, it uses these two to get us the item we want. We'll use this in our blessed repo.
23
package main
34

45
import (
@@ -13,6 +14,7 @@ import (
1314

1415
"github.com/fxamacker/cbor/v2"
1516
"github.com/goccy/go-json"
17+
"github.com/klauspost/compress/zstd"
1618
minify "github.com/tdewolff/minify/v2"
1719
mjson "github.com/tdewolff/minify/v2/json"
1820
"github.com/tiendc/go-deepcopy"
@@ -171,21 +173,32 @@ func loadAppStreamMetadata() error {
171173
return nil
172174
}
173175

174-
//resp, err := http.Get("https://github.com/xplshn/dbin-metadata/raw/refs/heads/master/misc/cmd/flatpakAppStreamScrapper/appstream_metadata.cbor")
175-
resp, err := http.Get("https://d.xplshn.com.ar/misc/cmd/flatpakAppStreamScrapper/appstream_metadata.cbor")
176+
//resp, err := http.Get("https://d.xplshn.com.ar/misc/cmd/flatpakAppStreamScrapper/appstream_metadata.cbor")
177+
resp, err := http.Get("https://github.com/xplshn/dbin-metadata/raw/refs/heads/master/misc/cmd/flatpakAppStreamScrapper/appstream_metadata.cbor.zst")
176178
if err != nil {
177-
return err
179+
return fmt.Errorf("failed to fetch Flathub AppStream metadata: %v", err)
178180
}
179181
defer resp.Body.Close()
180182

181183
body, err := io.ReadAll(resp.Body)
182184
if err != nil {
183-
return err
185+
return fmt.Errorf("failed to read response body: %v", err)
184186
}
185187

186-
err = cbor.Unmarshal(body, &appStreamMetadata)
188+
zstdReader, err := zstd.NewReader(nil, zstd.WithDecoderConcurrency(1))
187189
if err != nil {
188-
return err
190+
return fmt.Errorf("failed to create zstd reader: %v", err)
191+
}
192+
defer zstdReader.Close()
193+
194+
decompressed, err := zstdReader.DecodeAll(body, nil)
195+
if err != nil {
196+
return fmt.Errorf("failed to decompress data: %v", err)
197+
}
198+
199+
err = cbor.Unmarshal(decompressed, &appStreamMetadata)
200+
if err != nil {
201+
return fmt.Errorf("failed to unmarshal Flathub AppStream metadata: %v", err)
189202
}
190203

191204
appStreamMetadataLoaded = true

0 commit comments

Comments
 (0)