Skip to content

Commit 28b179f

Browse files
AzathothasAzathothas
committed
♻️ Synced dbin 📦 <-- 1.3: no improvements. Just cleanup ⌚
1 parent 399c92d commit 28b179f

File tree

3 files changed

+139
-29
lines changed

3 files changed

+139
-29
lines changed

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

Lines changed: 65 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -386,34 +386,74 @@ func main() {
386386
}
387387

388388
repositories := []struct {
389-
Repo repository
390-
Handler RepositoryHandler
391-
}{
392-
{
393-
Repo: repository{
394-
Name: "bincache",
395-
URL: "https://meta.pkgforge.dev/bincache/%s.json",
396-
Single: true,
389+
Repo repository
390+
Handler RepositoryHandler
391+
}{
392+
{
393+
Repo: repository{
394+
Name: "bincache",
395+
URL: "https://meta.pkgforge.dev/bincache/%s.json",
396+
Single: true,
397+
},
398+
Handler: PkgForgeHandler{},
397399
},
398-
Handler: PkgForgeHandler{},
399-
},
400-
{
401-
Repo: repository{
402-
Name: "pkgcache",
403-
URL: "https://meta.pkgforge.dev/pkgcache/%s.json",
404-
Single: true,
400+
{
401+
Repo: repository{
402+
Name: "pkgcache",
403+
URL: "https://meta.pkgforge.dev/pkgcache/%s.json",
404+
Single: true,
405+
},
406+
Handler: PkgForgeHandler{},
405407
},
406-
Handler: PkgForgeHandler{},
407-
},
408-
{
409-
Repo: repository{
410-
Name: "appbundlehub",
411-
URL: "https://github.com/xplshn/AppBundleHUB/releases/download/latest_metadata/metadata_x86_64-Linux.json",
412-
Single: true,
408+
//{
409+
// Repo: repository{
410+
// Name: "pkgforge-go",
411+
// URL: "https://meta.pkgforge.dev/external/pkgforge-go/%s.json",
412+
// Standalone: true,
413+
// },
414+
// Handler: PkgForgeHandler{},
415+
//},
416+
//{
417+
// Repo: repository{
418+
// Name: "pkgforge-cargo",
419+
// URL: "https://meta.pkgforge.dev/external/pkgforge-cargo/%s.json",
420+
// Standalone: true,
421+
// },
422+
// Handler: PkgForgeHandler{},
423+
//},
424+
//{
425+
// Repo: repository{
426+
// Name: "AM",
427+
// URL: "https://meta.pkgforge.dev/external/am/%s.json",
428+
// Standalone: true,
429+
// },
430+
// Handler: PkgForgeHandler{},
431+
//},
432+
//{
433+
// Repo: repository{
434+
// Name: "appimage-github-io",
435+
// URL: "https://meta.pkgforge.dev/external/appimage.github.io/%s.json",
436+
// Standalone: true,
437+
// },
438+
// Handler: PkgForgeHandler{},
439+
//},
440+
{
441+
Repo: repository{
442+
Name: "AppBundleHUB",
443+
URL: "https://github.com/xplshn/AppBundleHUB/releases/download/latest_metadata/metadata_%s.json",
444+
Single: true,
445+
},
446+
Handler: DbinHandler{},
413447
},
414-
Handler: DbinHandler{},
415-
},
416-
}
448+
//{
449+
// Repo: repository{
450+
// Name: "dbin",
451+
// URL: "http://192.168.1.59/d/%s",
452+
// Single: true,
453+
// },
454+
// Handler: DbinHandler{},
455+
//},
456+
}
417457

418458
for arch, outputArch := range realArchs {
419459
dbinMetadata := make(DbinMetadata)

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

Lines changed: 37 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,9 @@ type PkgForgeItem struct {
3434
AppId string `json:"app_id,omitempty"`
3535
PkgType string `json:"pkg_type,omitempty"`
3636
Icon string `json:"icon,omitempty"`
37-
Screenshots []string `json:"screenshots,omitempty"`
3837
Description string `json:"description,omitempty"`
38+
Maintainers []string `json:"Maintainer,omitempty"`
39+
Screenshots []string `json:"screenshots,omitempty"`
3940
WebURLs []string `json:"homepage,omitempty"`
4041
Version string `json:"version,omitempty"`
4142
DownloadURL string `json:"download_url,omitempty"`
@@ -54,6 +55,7 @@ type PkgForgeItem struct {
5455
GhcrPkg string `json:"ghcr_pkg,omitempty"`
5556
HfPkg string `json:"hf_pkg,omitempty"`
5657
Rank string `json:"rank,omitempty"`
58+
WebManifest string `json:"pkg_webpage,omitempty"`
5759
}
5860

5961
type snapshot struct {
@@ -84,9 +86,11 @@ type DbinItem struct {
8486
Snapshots []snapshot `json:"snapshots,omitempty"`
8587
Provides string `json:"provides,omitempty"`
8688
License []string `json:"license,omitempty"`
89+
Maintainers string `json:"maintainers,omitempty"`
8790
Notes []string `json:"notes,omitempty"`
8891
Appstream string `json:"appstream,omitempty"`
8992
Rank uint `json:"rank,omitempty"`
93+
WebManifest string `json:"web_manifest,omitempty"`
9094
}
9195

9296
type DbinMetadata map[string][]DbinItem
@@ -243,7 +247,7 @@ func convertPkgForgeToDbinItem(item PkgForgeItem, useFamilyFormat map[string]boo
243247
return DbinItem{}, false
244248
}
245249

246-
var categories, provides, downloadURL string
250+
var categories, provides, maintainers, downloadURL string
247251

248252
if len(item.Category) > 0 {
249253
categories = strings.Join(item.Category, ",")
@@ -253,6 +257,10 @@ func convertPkgForgeToDbinItem(item PkgForgeItem, useFamilyFormat map[string]boo
253257
provides = strings.Join(item.Provides, ",")
254258
}
255259

260+
if len(item.Maintainers) > 0 {
261+
maintainers = strings.Join(item.Maintainers, ",")
262+
}
263+
256264
if item.GhcrPkg != "" {
257265
downloadURL = "oci://" + item.GhcrPkg
258266
} else if item.HfPkg != "" {
@@ -329,8 +337,10 @@ func convertPkgForgeToDbinItem(item PkgForgeItem, useFamilyFormat map[string]boo
329337
Snapshots: snapshots,
330338
Provides: provides,
331339
License: item.License,
340+
Maintainers: maintainers,
332341
Notes: item.Notes,
333342
Rank: uint(rank),
343+
WebManifest: item.WebManifest,
334344
}, true
335345
}
336346

@@ -443,6 +453,7 @@ func saveMetadata(filename string, metadata DbinMetadata) error {
443453
items[i].Provides = ""
444454
items[i].Shasum = ""
445455
items[i].Bsum = ""
456+
items[i].WebManifest = ""
446457
}
447458
}
448459
saveAll(filename+".web", webMetadata)
@@ -454,6 +465,7 @@ func saveMetadata(filename string, metadata DbinMetadata) error {
454465
items[i].Shasum = ""
455466
items[i].AppstreamId = ""
456467
items[i].LongDescription = ""
468+
items[i].WebManifest = ""
457469
items[i].Screenshots = []string{}
458470
}
459471
}
@@ -538,6 +550,29 @@ func main() {
538550
},
539551
Handler: PkgForgeHandler{},
540552
},
553+
{
554+
Repo: repository{
555+
Name: "pkgforge-go",
556+
URLs: []string{
557+
"https://github.com/pkgforge-go/builder/raw/refs/heads/main/data/%s.json",
558+
"https://meta.pkgforge.dev/external/pkgforge-go/%s.json",
559+
},
560+
Standalone: true,
561+
},
562+
Handler: PkgForgeHandler{},
563+
},
564+
{
565+
Repo: repository{
566+
Name: "pkgforge-cargo",
567+
URLs: []string{
568+
"https://raw.githubusercontent.com/pkgforge-cargo/builder/refs/heads/main/data/x86_64-Linux.json",
569+
"https://meta.pkgforge.dev/external/pkgforge-cargo/%s.json",
570+
"https://github.com/pkgforge-cargo/builder/raw/refs/heads/main/data/%s.json",
571+
},
572+
Standalone: true,
573+
},
574+
Handler: PkgForgeHandler{},
575+
},
541576
{
542577
Repo: repository{
543578
Name: "AM",

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

Lines changed: 37 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,9 @@ type PkgForgeItem struct {
3434
AppId string `json:"app_id,omitempty"`
3535
PkgType string `json:"pkg_type,omitempty"`
3636
Icon string `json:"icon,omitempty"`
37-
Screenshots []string `json:"screenshots,omitempty"`
3837
Description string `json:"description,omitempty"`
38+
Maintainers []string `json:"Maintainer,omitempty"`
39+
Screenshots []string `json:"screenshots,omitempty"`
3940
WebURLs []string `json:"homepage,omitempty"`
4041
Version string `json:"version,omitempty"`
4142
DownloadURL string `json:"download_url,omitempty"`
@@ -54,6 +55,7 @@ type PkgForgeItem struct {
5455
GhcrPkg string `json:"ghcr_pkg,omitempty"`
5556
HfPkg string `json:"hf_pkg,omitempty"`
5657
Rank string `json:"rank,omitempty"`
58+
WebManifest string `json:"pkg_webpage,omitempty"`
5759
}
5860

5961
type snapshot struct {
@@ -84,9 +86,11 @@ type DbinItem struct {
8486
Snapshots []snapshot `json:"snapshots,omitempty"`
8587
Provides string `json:"provides,omitempty"`
8688
License []string `json:"license,omitempty"`
89+
Maintainers string `json:"maintainers,omitempty"`
8790
Notes []string `json:"notes,omitempty"`
8891
Appstream string `json:"appstream,omitempty"`
8992
Rank uint `json:"rank,omitempty"`
93+
WebManifest string `json:"web_manifest,omitempty"`
9094
}
9195

9296
type DbinMetadata map[string][]DbinItem
@@ -243,7 +247,7 @@ func convertPkgForgeToDbinItem(item PkgForgeItem, useFamilyFormat map[string]boo
243247
return DbinItem{}, false
244248
}
245249

246-
var categories, provides, downloadURL string
250+
var categories, provides, maintainers, downloadURL string
247251

248252
if len(item.Category) > 0 {
249253
categories = strings.Join(item.Category, ",")
@@ -253,6 +257,10 @@ func convertPkgForgeToDbinItem(item PkgForgeItem, useFamilyFormat map[string]boo
253257
provides = strings.Join(item.Provides, ",")
254258
}
255259

260+
if len(item.Maintainers) > 0 {
261+
maintainers = strings.Join(item.Maintainers, ",")
262+
}
263+
256264
if item.GhcrPkg != "" {
257265
downloadURL = "oci://" + item.GhcrPkg
258266
} else if item.HfPkg != "" {
@@ -329,8 +337,10 @@ func convertPkgForgeToDbinItem(item PkgForgeItem, useFamilyFormat map[string]boo
329337
Snapshots: snapshots,
330338
Provides: provides,
331339
License: item.License,
340+
Maintainers: maintainers,
332341
Notes: item.Notes,
333342
Rank: uint(rank),
343+
WebManifest: item.WebManifest,
334344
}, true
335345
}
336346

@@ -443,6 +453,7 @@ func saveMetadata(filename string, metadata DbinMetadata) error {
443453
items[i].Provides = ""
444454
items[i].Shasum = ""
445455
items[i].Bsum = ""
456+
items[i].WebManifest = ""
446457
}
447458
}
448459
saveAll(filename+".web", webMetadata)
@@ -454,6 +465,7 @@ func saveMetadata(filename string, metadata DbinMetadata) error {
454465
items[i].Shasum = ""
455466
items[i].AppstreamId = ""
456467
items[i].LongDescription = ""
468+
items[i].WebManifest = ""
457469
items[i].Screenshots = []string{}
458470
}
459471
}
@@ -538,6 +550,29 @@ func main() {
538550
},
539551
Handler: PkgForgeHandler{},
540552
},
553+
{
554+
Repo: repository{
555+
Name: "pkgforge-go",
556+
URLs: []string{
557+
"https://github.com/pkgforge-go/builder/raw/refs/heads/main/data/%s.json",
558+
"https://meta.pkgforge.dev/external/pkgforge-go/%s.json",
559+
},
560+
Standalone: true,
561+
},
562+
Handler: PkgForgeHandler{},
563+
},
564+
{
565+
Repo: repository{
566+
Name: "pkgforge-cargo",
567+
URLs: []string{
568+
"https://raw.githubusercontent.com/pkgforge-cargo/builder/refs/heads/main/data/x86_64-Linux.json",
569+
"https://meta.pkgforge.dev/external/pkgforge-cargo/%s.json",
570+
"https://github.com/pkgforge-cargo/builder/raw/refs/heads/main/data/%s.json",
571+
},
572+
Standalone: true,
573+
},
574+
Handler: PkgForgeHandler{},
575+
},
541576
{
542577
Repo: repository{
543578
Name: "AM",

0 commit comments

Comments
 (0)