now packets can get LICENSE and pageurl from package table
This commit is contained in:
@@ -31,6 +31,8 @@ type PacketLua struct {
|
||||
Maintainer string
|
||||
Description string
|
||||
Serial int
|
||||
Page string
|
||||
License []string
|
||||
|
||||
Plataforms *map[OperationalSystem]Plataform
|
||||
GlobalSources *[]Source
|
||||
@@ -136,6 +138,8 @@ func ReadPacket(f []byte, cfg *Config) (PacketLua, error) {
|
||||
Maintainer: getStringFromTable(pkgTable, "maintainer"),
|
||||
Description: getStringFromTable(pkgTable, "description"),
|
||||
Serial: getIntFromTable(pkgTable, "serial"),
|
||||
Page: getStringFromTable(pkgTable, "pageurl"),
|
||||
License: getStringArrayFromTable(pkgTable, "LICENSE"),
|
||||
|
||||
Plataforms: getPlataformsFromTable(pkgTable, "plataforms"),
|
||||
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
package packet
|
||||
|
||||
func (pkg PacketLua) IsValid() bool {
|
||||
|
||||
var a, b int
|
||||
|
||||
for _, v := range *pkg.Plataforms {
|
||||
a += len(*v.Sources)
|
||||
b += len(v.Architetures)
|
||||
}
|
||||
|
||||
a += len(*pkg.GlobalSources)
|
||||
|
||||
if a < 1 || len(*pkg.Plataforms) > b {
|
||||
return false
|
||||
}
|
||||
|
||||
switch {
|
||||
case pkg.Serial == -133:
|
||||
return false
|
||||
case pkg.Description == "" || pkg.Maintainer == "" || pkg.Name == "" || pkg.Version == "":
|
||||
return false
|
||||
}
|
||||
return true
|
||||
}
|
||||
@@ -32,3 +32,34 @@ func NewId(id string) PackageID {
|
||||
ID.ID = id
|
||||
return ID
|
||||
}
|
||||
|
||||
func (pkg PacketLua) IsValid() bool {
|
||||
|
||||
var a, b int
|
||||
|
||||
for _, v := range *pkg.Plataforms {
|
||||
for _, src := range *v.Sources {
|
||||
a++
|
||||
if src.Method == "git" {
|
||||
if src.Specs.(GitSpecs).Branch == "" && src.Specs.(GitSpecs).Tag == nil {
|
||||
return false
|
||||
}
|
||||
}
|
||||
}
|
||||
b += len(v.Architetures)
|
||||
}
|
||||
|
||||
a += len(*pkg.GlobalSources)
|
||||
|
||||
if a < 1 || len(*pkg.Plataforms) > b {
|
||||
return false
|
||||
}
|
||||
|
||||
switch {
|
||||
case pkg.Serial == -133:
|
||||
return false
|
||||
case pkg.Description == "" || pkg.Maintainer == "" || pkg.Name == "" || pkg.Version == "":
|
||||
return false
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
@@ -4,7 +4,9 @@ return {
|
||||
version = "0.26.0", -- required
|
||||
maintainer = "robogg133", -- required
|
||||
description = "A cat(1) clone with syntax highlighting and Git integration.", -- required
|
||||
serial = 0, -- required
|
||||
serial = 0,
|
||||
LICENSE = {"APACHE", "MIT"},
|
||||
pageurl = "https://github.com/sharkdp/bat"
|
||||
|
||||
plataforms = {
|
||||
windows = {
|
||||
|
||||
Reference in New Issue
Block a user