Mirrors/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2024-09-01 14:56:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

import naming unification with other package types

Browse Source
This commit is contained in:
Danila Fominykh 2023-10-12 11:56:54 -03:00
parent f812aa7cf7
commit 95a1df6dfc
No known key found for this signature in database
GPG Key ID: FC04D07F75B663FC
4 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/packages/arch/metadata.go
View File

@ -14,7 +14,7 @@ import (
"strconv" "strconv"
"strings" "strings"
pkg_module "code.gitea.io/gitea/modules/packages" packages_module "code.gitea.io/gitea/modules/packages"
"github.com/mholt/archiver/v3" "github.com/mholt/archiver/v3"
) )
@ -58,7 +58,7 @@ type DbDesc struct {
} }
// Function that receives arch package archive data and returns it's metadata. // Function that receives arch package archive data and returns it's metadata.
func ParseMetadata(file, distro string, b *pkg_module.HashedBuffer) (*DbDesc, error) { func ParseMetadata(file, distro string, b *packages_module.HashedBuffer) (*DbDesc, error) {
pkginfo, err := getPkginfo(b) pkginfo, err := getPkginfo(b)
if err != nil { if err != nil {
return nil, err return nil, err
@ -188,7 +188,7 @@ func (m *DbDesc) String() string {
// Create pacman database archive based on provided package metadata structs. // Create pacman database archive based on provided package metadata structs.
func CreatePacmanDb(entries map[string][]byte) (io.ReadSeeker, error) { func CreatePacmanDb(entries map[string][]byte) (io.ReadSeeker, error) {
out, err := pkg_module.NewHashedBuffer() out, err := packages_module.NewHashedBuffer()
if err != nil { if err != nil {
return nil, err return nil, err
} }

4
modules/packages/arch/metadata_test.go
View File

@ -11,7 +11,7 @@ import (
"testing/fstest" "testing/fstest"
"time" "time"
pkg_module "code.gitea.io/gitea/modules/packages" packages_module "code.gitea.io/gitea/modules/packages"
"github.com/mholt/archiver/v3" "github.com/mholt/archiver/v3"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
@ -118,7 +118,7 @@ func TestMetadata(t *testing.T) {
file, err := fs.Open("pkginfo") file, err := fs.Open("pkginfo")
assert.NoError(t, err) assert.NoError(t, err)
buf, err := pkg_module.NewHashedBuffer() buf, err := packages_module.NewHashedBuffer()
assert.NoError(t, err) assert.NoError(t, err)
archive := archiver.NewTarZstd() archive := archiver.NewTarZstd()

16
routers/api/packages/arch/arch.go
View File

@ -7,10 +7,10 @@ import (
"net/http" "net/http"
"strings" "strings"
pkg_model "code.gitea.io/gitea/models/packages" packages_model "code.gitea.io/gitea/models/packages"
"code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/routers/api/packages/helper" "code.gitea.io/gitea/routers/api/packages/helper"
pkg_service "code.gitea.io/gitea/services/packages" packages_service "code.gitea.io/gitea/services/packages"
arch_service "code.gitea.io/gitea/services/packages/arch" arch_service "code.gitea.io/gitea/services/packages/arch"
) )
@ -40,9 +40,9 @@ func Push(ctx *context.Context) {
_, _, err = arch_service.UploadArchPackage(ctx, upload, filename, distro, sign) _, _, err = arch_service.UploadArchPackage(ctx, upload, filename, distro, sign)
if err != nil { if err != nil {
switch err { switch err {
case pkg_model.ErrDuplicatePackageVersion, pkg_model.ErrDuplicatePackageFile: case packages_model.ErrDuplicatePackageVersion, packages_model.ErrDuplicatePackageFile:
apiError(ctx, http.StatusConflict, err) apiError(ctx, http.StatusConflict, err)
case pkg_service.ErrQuotaTotalCount, pkg_service.ErrQuotaTypeSize, pkg_service.ErrQuotaTotalSize: case packages_service.ErrQuotaTotalCount, packages_service.ErrQuotaTypeSize, packages_service.ErrQuotaTotalSize:
apiError(ctx, http.StatusForbidden, err) apiError(ctx, http.StatusForbidden, err)
default: default:
apiError(ctx, http.StatusInternalServerError, err) apiError(ctx, http.StatusInternalServerError, err)
@ -111,12 +111,12 @@ func Remove(ctx *context.Context) {
ver = ctx.Params("version") ver = ctx.Params("version")
) )
version, err := pkg_model.GetVersionByNameAndVersion( version, err := packages_model.GetVersionByNameAndVersion(
ctx, ctx.Package.Owner.ID, pkg_model.TypeArch, pkg, ver, ctx, ctx.Package.Owner.ID, packages_model.TypeArch, pkg, ver,
) )
if err != nil { if err != nil {
switch err { switch err {
case pkg_model.ErrPackageNotExist: case packages_model.ErrPackageNotExist:
apiError(ctx, http.StatusNotFound, err) apiError(ctx, http.StatusNotFound, err)
default: default:
apiError(ctx, http.StatusInternalServerError, err) apiError(ctx, http.StatusInternalServerError, err)
@ -124,7 +124,7 @@ func Remove(ctx *context.Context) {
return return
} }
err = pkg_service.RemovePackageVersion(ctx, ctx.Package.Owner, version) err = packages_service.RemovePackageVersion(ctx, ctx.Package.Owner, version)
if err != nil { if err != nil {
apiError(ctx, http.StatusInternalServerError, err) apiError(ctx, http.StatusInternalServerError, err)
return return

30
services/packages/arch/service.go
View File

@ -12,10 +12,10 @@ import (
"sort" "sort"
"strings" "strings"
pkg_model "code.gitea.io/gitea/models/packages" packages_model "code.gitea.io/gitea/models/packages"
"code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/context"
arch_module "code.gitea.io/gitea/modules/packages/arch" arch_module "code.gitea.io/gitea/modules/packages/arch"
pkg_service "code.gitea.io/gitea/services/packages" packages_service "code.gitea.io/gitea/services/packages"
) )
// Get data related to provided filename and distribution, for package files // Get data related to provided filename and distribution, for package files
@ -26,7 +26,7 @@ func GetPackageFile(ctx *context.Context, distro, file string) (io.ReadSeekClose
return nil, err return nil, err
} }
filestream, _, _, err := pkg_service.GetPackageFileStream(ctx, pf) filestream, _, _, err := packages_service.GetPackageFileStream(ctx, pf)
return filestream, err return filestream, err
} }
@ -38,7 +38,7 @@ func GetPackageSignature(ctx *context.Context, distro, file string) (*bytes.Read
return nil, err return nil, err
} }
proprs, err := pkg_model.GetProperties(ctx, pkg_model.PropertyTypeFile, pf.ID) proprs, err := packages_model.GetProperties(ctx, packages_model.PropertyTypeFile, pf.ID)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -57,21 +57,21 @@ func GetPackageSignature(ctx *context.Context, distro, file string) (*bytes.Read
} }
// Ejects parameters required to get package file property from file name. // Ejects parameters required to get package file property from file name.
func getPackageFile(ctx *context.Context, distro, file string) (*pkg_model.PackageFile, error) { func getPackageFile(ctx *context.Context, distro, file string) (*packages_model.PackageFile, error) {
var ( var (
splt = strings.Split(file, "-") splt = strings.Split(file, "-")
pkgname = strings.Join(splt[0:len(splt)-3], "-") pkgname = strings.Join(splt[0:len(splt)-3], "-")
vername = splt[len(splt)-3] + "-" + splt[len(splt)-2] vername = splt[len(splt)-3] + "-" + splt[len(splt)-2]
) )
version, err := pkg_model.GetVersionByNameAndVersion( version, err := packages_model.GetVersionByNameAndVersion(
ctx, ctx.Package.Owner.ID, pkg_model.TypeArch, pkgname, vername, ctx, ctx.Package.Owner.ID, packages_model.TypeArch, pkgname, vername,
) )
if err != nil { if err != nil {
return nil, err return nil, err
} }
pkgfile, err := pkg_model.GetFileForVersionByName(ctx, version.ID, file, distro) pkgfile, err := packages_model.GetFileForVersionByName(ctx, version.ID, file, distro)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -84,7 +84,7 @@ func getPackageFile(ctx *context.Context, distro, file string) (*pkg_model.Packa
// compatible version is found, related desc file will be loaded from package // compatible version is found, related desc file will be loaded from package
// properties and added to resulting .db.tar.gz archive. // properties and added to resulting .db.tar.gz archive.
func CreatePacmanDb(ctx *context.Context, owner, arch, distro string) (io.ReadSeeker, error) { func CreatePacmanDb(ctx *context.Context, owner, arch, distro string) (io.ReadSeeker, error) {
pkgs, err := pkg_model.GetPackagesByType(ctx, ctx.Package.Owner.ID, pkg_model.TypeArch) pkgs, err := packages_model.GetPackagesByType(ctx, ctx.Package.Owner.ID, packages_model.TypeArch)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -92,8 +92,8 @@ func CreatePacmanDb(ctx *context.Context, owner, arch, distro string) (io.ReadSe
entries := make(map[string][]byte) entries := make(map[string][]byte)
for _, pkg := range pkgs { for _, pkg := range pkgs {
versions, err := pkg_model.GetVersionsByPackageName( versions, err := packages_model.GetVersionsByPackageName(
ctx, ctx.Package.Owner.ID, pkg_model.TypeArch, pkg.Name, ctx, ctx.Package.Owner.ID, packages_model.TypeArch, pkg.Name,
) )
if err != nil { if err != nil {
return nil, err return nil, err
@ -106,17 +106,17 @@ func CreatePacmanDb(ctx *context.Context, owner, arch, distro string) (io.ReadSe
for _, ver := range versions { for _, ver := range versions {
file := fmt.Sprintf("%s-%s-%s.pkg.tar.zst", pkg.Name, ver.Version, arch) file := fmt.Sprintf("%s-%s-%s.pkg.tar.zst", pkg.Name, ver.Version, arch)
pf, err := pkg_model.GetFileForVersionByName(ctx, ver.ID, file, distro) pf, err := packages_model.GetFileForVersionByName(ctx, ver.ID, file, distro)
if err != nil { if err != nil {
file = fmt.Sprintf("%s-%s-any.pkg.tar.zst", pkg.Name, ver.Version) file = fmt.Sprintf("%s-%s-any.pkg.tar.zst", pkg.Name, ver.Version)
pf, err = pkg_model.GetFileForVersionByName(ctx, ver.ID, file, distro) pf, err = packages_model.GetFileForVersionByName(ctx, ver.ID, file, distro)
if err != nil { if err != nil {
continue continue
} }
} }
pps, err := pkg_model.GetPropertiesByName( pps, err := packages_model.GetPropertiesByName(
ctx, pkg_model.PropertyTypeFile, pf.ID, "desc", ctx, packages_model.PropertyTypeFile, pf.ID, "desc",
) )
if err != nil { if err != nil {
return nil, err return nil, err