EnumDev/bpm
1
0
Fork 0
mirror of https://github.com/EnumeratedDev/bpm.git synced 2026-09-16 10:36:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve readable info functions

Browse Source
This commit is contained in:
EnumDev
2026-01-25 19:55:09 +02:00
parent 9f8a20c671
commit 0a06808303
2 changed files with 58 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bpmlib/databases.go
+27 -27
View File
@@ -323,8 +323,8 @@ func (entry *BPMDatabaseEntry) GetEntryOptionalDependants() (dependants []string
}
func (entry *BPMDatabaseEntry) CreateReadableInfo(rootDir string, humanReadableSize bool) string {
ret := make([]string, 0)
appendArray := func(label string, array []string, sort bool) {
builder := strings.Builder{}
builderWriteArray := func(label string, array []string, sort bool) {
if len(array) == 0 {
return
}
@@ -334,52 +334,52 @@ func (entry *BPMDatabaseEntry) CreateReadableInfo(rootDir string, humanReadableS
slices.Sort(array)
}
ret = append(ret, label+":")
builder.WriteString(label + ":\n")
for _, val := range array {
ret = append(ret, " - "+val)
builder.WriteString(" - " + val + "\n")
}
}
ret = append(ret, "Name: "+entry.Info.Name)
ret = append(ret, "Database: "+entry.Database.Name)
ret = append(ret, "Description: "+entry.Info.Description)
ret = append(ret, "Version: "+entry.Info.GetFullVersion())
builder.WriteString("Name: " + entry.Info.Name + "\n")
builder.WriteString("Database: " + entry.Database.Name + "\n")
builder.WriteString("Description: " + entry.Info.Description + "\n")
builder.WriteString("Version: " + entry.Info.GetFullVersion() + "\n")
if entry.Info.Url != "" {
ret = append(ret, "URL: "+entry.Info.Url)
builder.WriteString("URL: " + entry.Info.Url + "\n")
}
if entry.Info.License != "" {
ret = append(ret, "License: "+entry.Info.License)
builder.WriteString("License: " + entry.Info.License + "\n")
}
appendArray("Maintainers", entry.Info.Maintainers, false)
ret = append(ret, "Architecture: "+entry.Info.Arch)
builderWriteArray("Maintainers", entry.Info.Maintainers, false)
builder.WriteString("Architecture: " + entry.Info.Arch + "\n")
if entry.Info.Type == "source" && entry.Info.OutputArch != "" && entry.Info.OutputArch != GetArch() {
ret = append(ret, "Output architecture: "+entry.Info.OutputArch)
builder.WriteString("Output architecture: " + entry.Info.OutputArch + "\n")
}
ret = append(ret, "Type: "+entry.Info.Type)
appendArray("Dependencies", entry.Info.Depends, true)
builder.WriteString("Type: " + entry.Info.Type + "\n")
builderWriteArray("Dependencies", entry.Info.Depends, true)
if entry.Info.Type == "source" {
appendArray("Make Dependencies", entry.Info.MakeDepends, true)
builderWriteArray("Make Dependencies", entry.Info.MakeDepends, true)
}
appendArray("Runtime dependencies", entry.Info.RuntimeDepends, true)
appendArray("Optional dependencies", entry.Info.OptionalDepends, true)
builderWriteArray("Runtime dependencies", entry.Info.RuntimeDepends, true)
builderWriteArray("Optional dependencies", entry.Info.OptionalDepends, true)
dependants := entry.GetEntryDependants()
if len(dependants) > 0 {
appendArray("Dependant packages", dependants, false)
builderWriteArray("Dependant packages", dependants, false)
}
optionalDependants := entry.GetEntryOptionalDependants()
if len(optionalDependants) > 0 {
appendArray("Optionally dependant packages", optionalDependants, false)
builderWriteArray("Optionally dependant packages", optionalDependants, false)
}
appendArray("Conflicting packages", entry.Info.Conflicts, true)
appendArray("Provided packages", entry.Info.Provides, true)
appendArray("Replaces packages", entry.Info.Replaces, true)
builderWriteArray("Conflicting packages", entry.Info.Conflicts, true)
builderWriteArray("Provided packages", entry.Info.Provides, true)
builderWriteArray("Replaces packages", entry.Info.Replaces, true)
if entry.Info.Type == "source" && len(entry.Info.SplitPackages) != 0 {
splitPkgs := make([]string, len(entry.Info.SplitPackages))
for i, splitPkgInfo := range entry.Info.SplitPackages {
splitPkgs[i] = splitPkgInfo.Name
}
appendArray("Split Packages", splitPkgs, true)
builderWriteArray("Split Packages", splitPkgs, true)
}
if rootDir != "" && IsPackageInstalled(entry.Info.Name, rootDir) {
@@ -395,7 +395,7 @@ func (entry *BPMDatabaseEntry) CreateReadableInfo(rootDir string, humanReadableS
default:
installationReasonString = "Unknown"
}
ret = append(ret, "Installation Reason: "+installationReasonString)
builder.WriteString("Installation Reason: " + installationReasonString + "\n")
}
if entry.Info.Type == "binary" {
installedSize := entry.InstalledSize
@@ -405,7 +405,7 @@ func (entry *BPMDatabaseEntry) CreateReadableInfo(rootDir string, humanReadableS
} else {
installedSizeStr = strconv.FormatInt(installedSize, 10)
}
ret = append(ret, "Installed size: "+installedSizeStr)
builder.WriteString("Installed size: " + installedSizeStr + "\n")
}
return strings.Join(ret, "\n")
return strings.TrimSpace(builder.String())
}
src/bpmlib/packages.go
+31 -26
View File
@@ -540,58 +540,63 @@ func ReadPackageInfo(contents string) (*PackageInfo, error) {
}
func (pkgInfo *PackageInfo) CreateReadableInfo(rootDir string) string {
ret := make([]string, 0)
appendArray := func(label string, array []string) {
builder := strings.Builder{}
builderWriteArray := func(label string, array []string, sort bool) {
if len(array) == 0 {
return
}
ret = append(ret, label+":")
// Sort array
if sort {
slices.Sort(array)
}
builder.WriteString(label + ":\n")
for _, val := range array {
ret = append(ret, " - "+val)
builder.WriteString(" - " + val + "\n")
}
}
ret = append(ret, "Name: "+pkgInfo.Name)
ret = append(ret, "Description: "+pkgInfo.Description)
ret = append(ret, "Version: "+pkgInfo.GetFullVersion())
builder.WriteString("Name: " + pkgInfo.Name + "\n")
builder.WriteString("Description: " + pkgInfo.Description + "\n")
builder.WriteString("Version: " + pkgInfo.GetFullVersion() + "\n")
if pkgInfo.Url != "" {
ret = append(ret, "URL: "+pkgInfo.Url)
builder.WriteString("URL: " + pkgInfo.Url + "\n")
}
if pkgInfo.License != "" {
ret = append(ret, "License: "+pkgInfo.License)
builder.WriteString("License: " + pkgInfo.License + "\n")
}
appendArray("Maintainers", pkgInfo.Maintainers)
ret = append(ret, "Architecture: "+pkgInfo.Arch)
builderWriteArray("Maintainers", pkgInfo.Maintainers, false)
builder.WriteString("Architecture: " + pkgInfo.Arch + "\n")
if pkgInfo.Type == "source" && pkgInfo.OutputArch != "" && pkgInfo.OutputArch != GetArch() {
ret = append(ret, "Output architecture: "+pkgInfo.Arch)
builder.WriteString("Output architecture: " + pkgInfo.Arch + "\n")
}
ret = append(ret, "Type: "+pkgInfo.Type)
appendArray("Dependencies", pkgInfo.Depends)
builder.WriteString("Type: " + pkgInfo.Type + "\n")
builderWriteArray("Dependencies", pkgInfo.Depends, true)
if pkgInfo.Type == "source" {
appendArray("Runtime Dependencies", pkgInfo.RuntimeDepends)
appendArray("Make Dependencies", pkgInfo.MakeDepends)
builderWriteArray("Runtime Dependencies", pkgInfo.RuntimeDepends, true)
builderWriteArray("Make Dependencies", pkgInfo.MakeDepends, true)
}
appendArray("Runtime dependencies", pkgInfo.RuntimeDepends)
appendArray("Optional dependencies", pkgInfo.OptionalDepends)
builderWriteArray("Runtime dependencies", pkgInfo.RuntimeDepends, true)
builderWriteArray("Optional dependencies", pkgInfo.OptionalDepends, true)
dependants := pkgInfo.GetPackageDependants(rootDir)
if len(dependants) > 0 {
appendArray("Dependant packages", dependants)
builderWriteArray("Dependant packages", dependants, true)
}
optionalDependants := pkgInfo.GetPackageOptionalDependants(rootDir)
if len(optionalDependants) > 0 {
appendArray("Optionally dependant packages", optionalDependants)
builderWriteArray("Optionally dependant packages", optionalDependants, true)
}
appendArray("Conflicting packages", pkgInfo.Conflicts)
appendArray("Provided packages", pkgInfo.Provides)
appendArray("Replaces packages", pkgInfo.Replaces)
builderWriteArray("Conflicting packages", pkgInfo.Conflicts, true)
builderWriteArray("Provided packages", pkgInfo.Provides, true)
builderWriteArray("Replaces packages", pkgInfo.Replaces, true)
if pkgInfo.Type == "source" && len(pkgInfo.SplitPackages) != 0 {
splitPkgs := make([]string, len(pkgInfo.SplitPackages))
for i, splitPkgInfo := range pkgInfo.SplitPackages {
splitPkgs[i] = splitPkgInfo.Name
}
appendArray("Split Packages", splitPkgs)
builderWriteArray("Split Packages", splitPkgs, true)
}
if rootDir != "" && IsPackageInstalled(pkgInfo.Name, rootDir) {
@@ -607,10 +612,10 @@ func (pkgInfo *PackageInfo) CreateReadableInfo(rootDir string) string {
default:
installationReasonString = "Unknown"
}
ret = append(ret, "Installation Reason: "+installationReasonString)
builder.WriteString("Installation Reason: " + installationReasonString + "\n")
}
return strings.Join(ret, "\n")
return strings.TrimSpace(builder.String())
}
func extractPackage(bpmpkg *BPMPackage, verbose bool, filename, rootDir string) error {