Remove extraneous code and prepare for commit

Author: ExplodingDragon

docs/content/usage/packages/rpm.en-us.md

@@ -27,17 +27,19 @@ The following examples use `dnf`.
 To register the RPM registry add the url to the list of known apt sources:
 
 ```shell
-dnf config-manager --add-repo https://gitea.example.com/api/packages/{owner}/rpm.repo
+dnf config-manager --add-repo https://gitea.example.com/api/packages/{owner}/rpm/{distribution}/{component}.repo
 ```
 
-| Placeholder | Description |
-| ----------- | ----------- |
-| `owner`     | The owner of the package. |
+| Placeholder | Description                                        |
+| ----------- |----------------------------------------------------|
+| `owner`     | The owner of the package.                          |
+| `distribution` | System Name, e.g. `centos`, `suse` , `rockylinux`. |
+| `component` | System version, e.g. `el7`, `el9` , `fc38`.        |
 
 If the registry is private, provide credentials in the url. You can use a password or a [personal access token](development/api-usage.md#authentication):
 
 ```shell
-dnf config-manager --add-repo https://{username}:{your_password_or_token}@gitea.example.com/api/packages/{owner}/rpm.repo
+dnf config-manager --add-repo https://{username}:{your_password_or_token}@gitea.example.com/api/packages/{owner}/rpm/{distribution}/{component}.repo
 ```
 
 You have to add the credentials to the urls in the `rpm.repo` file in `/etc/yum.repos.d` too.
@@ -47,19 +49,21 @@ You have to add the credentials to the urls in the `rpm.repo` file in `/etc/yum.
 To publish a RPM package (`*.rpm`), perform a HTTP PUT operation with the package content in the request body.
 
 ```
-PUT https://gitea.example.com/api/packages/{owner}/rpm/upload
+PUT https://gitea.example.com/api/packages/{owner}/rpm/{distribution}/{component}/upload
 ```
 
 | Parameter | Description |
 | --------- | ----------- |
 | `owner`   | The owner of the package. |
+| `distribution` | System Name, e.g. `centos`, `suse` , `rockylinux`. |
+| `component` | System version, e.g. `el7`, `el9` , `fc38`.        |
 
 Example request using HTTP Basic authentication:
 
 ```shell
 curl --user your_username:your_password_or_token \
      --upload-file path/to/file.rpm \
-     https://gitea.example.com/api/packages/testuser/rpm/upload
+     https://gitea.example.com/api/packages/testuser/rpm/centos/el7/upload
 ```
 
 If you are using 2FA or OAuth use a [personal access token](development/api-usage.md#authentication) instead of the password.
@@ -78,21 +82,23 @@ The server responds with the following HTTP Status codes.
 To delete an RPM package perform a HTTP DELETE operation. This will delete the package version too if there is no file left.
 
 ```
-DELETE https://gitea.example.com/api/packages/{owner}/rpm/{package_name}/{package_version}/{architecture}
+DELETE https://gitea.example.com/api/packages/{owner}/rpm/{distribution}/package/{package_name}/{package_version}/{architecture}
 ```
 
-| Parameter         | Description |
-| ----------------- | ----------- |
-| `owner`           | The owner of the package. |
-| `package_name`    | The package name. |
-| `package_version` | The package version. |
-| `architecture`    | The package architecture. |
+| Parameter         | Description                |
+|-------------------|----------------------------|
+| `owner`           | The owner of the package.  |
+| `distribution`    | The package distribution.  |
+| `component`       | The package group version. |
+| `package_name`    | The package name.          |
+| `package_version` | The package version.       |
+| `architecture`    | The package architecture.  |
 
 Example request using HTTP Basic authentication:
 
 ```shell
 curl --user your_username:your_token_or_password -X DELETE \
-     https://gitea.example.com/api/packages/testuser/rpm/test-package/1.0.0/x86_64
+     https://gitea.example.com/api/packages/testuser/rpm/centos/el7/package/test-package/1.0.0/x86_64
 ```
 
 The server responds with the following HTTP Status codes.

docs/content/usage/packages/rpm.zh-cn.md

@@ -27,17 +27,19 @@ menu:
 要注册RPM注册表，请将 URL 添加到已知 `apt` 源列表中：
 
 ```shell
-dnf config-manager --add-repo https://gitea.example.com/api/packages/{owner}/rpm.repo
+dnf config-manager --add-repo https://gitea.example.com/api/packages/{owner}/rpm/{distribution}/{component}.repo
 ```
 
-| 占位符  | 描述           |
-| ------- | -------------- |
-| `owner` | 软件包的所有者 |
+| 占位符  | 描述                                   |
+| ------- |--------------------------------------|
+| `owner` | 软件包的所有者                              |
+| `distribution` | 软件包适配的系统名称，例如 `centos`、`rocky linux` |
+| `component` | 软件包适合的目标版本,例如 `el7`、`fc38`           |
 
 如果注册表是私有的，请在URL中提供凭据。您可以使用密码或[个人访问令牌](development/api-usage.md#通过-api-认证)：
 
 ```shell
-dnf config-manager --add-repo https://{username}:{your_password_or_token}@gitea.example.com/api/packages/{owner}/rpm.repo
+dnf config-manager --add-repo https://{username}:{your_password_or_token}@gitea.example.com/api/packages/{owner}/rpm/{distribution}/{component}.repo
 ```
 
 您还必须将凭据添加到 `/etc/yum.repos.d` 中的 `rpm.repo` 文件中的URL中。
@@ -47,19 +49,21 @@ dnf config-manager --add-repo https://{username}:{your_password_or_token}@gitea.
 要发布RPM软件包（`*.rpm`），请执行带有软件包内容的 HTTP `PUT` 操作。
 
 ```
-PUT https://gitea.example.com/api/packages/{owner}/rpm/upload
+PUT https://gitea.example.com/api/packages/{owner}/rpm/{distribution}/{component}/upload
 ```
 
 | 参数    | 描述           |
-| ------- | -------------- |
-| `owner` | 软件包的所有者 |
+| ------- |--------------|
+| `owner` | 软件包的所有者      |
+| `distribution` | 软件包适配的系统名称   |
+| `component` | 软件包适配的系统发行版本 |
 
 使用HTTP基本身份验证的示例请求：
 
 ```shell
 curl --user your_username:your_password_or_token \
      --upload-file path/to/file.rpm \
-     https://gitea.example.com/api/packages/testuser/rpm/upload
+     https://gitea.example.com/api/packages/testuser/rpm/centos/el7/version/upload
 ```
 
 如果您使用 2FA 或 OAuth，请使用[个人访问令牌](development/api-usage.md#通过-api-认证)替代密码。您无法将具有相同名称的文件两次发布到软件包中。您必须先删除现有的软件包版本。
@@ -77,12 +81,14 @@ curl --user your_username:your_password_or_token \
 要删除 RPM 软件包，请执行 HTTP `DELETE` 操作。如果没有文件剩余，这也将删除软件包版本。
 
 ```
-DELETE https://gitea.example.com/api/packages/{owner}/rpm/{package_name}/{package_version}/{architecture}
+DELETE https://gitea.example.com/api/packages/{owner}/rpm/{distribution}/{component}/package/{package_name}/{package_version}/{architecture}
 ```
 
 | 参数              | 描述           |
 | ----------------- | -------------- |
 | `owner`           | 软件包的所有者 |
+| `distribution`    | 软件包适配的系统名称  |
+| `component`    | 软件包适配的系统发行版本  |
 | `package_name`    | 软件包名称     |
 | `package_version` | 软件包版本     |
 | `architecture`    | 软件包架构     |
@@ -91,7 +97,7 @@ DELETE https://gitea.example.com/api/packages/{owner}/rpm/{package_name}/{packag
 
 ```shell
 curl --user your_username:your_token_or_password -X DELETE \
-     https://gitea.example.com/api/packages/testuser/rpm/test-package/1.0.0/x86_64
+     https://gitea.example.com/api/packages/testuser/rpm/centos/el7/package/test-package/1.0.0/x86_64
 ```
 
 服务器将以以下HTTP状态码响应：

models/migrations/migrations.go

@@ -532,6 +532,8 @@ var migrations = []Migration{
 	NewMigration("Add Actions artifacts expiration date", v1_21.AddExpiredUnixColumnInActionArtifactTable),
 	// v275 -> v276
 	NewMigration("Add ScheduleID for ActionRun", v1_21.AddScheduleIDForActionRun),
+	// v276 -> v277
+	NewMigration("Migrate old rpm package index", v1_21.RebuildRpmPackage),
 }
 
 // GetCurrentDBVersion returns the current db version

models/migrations/v1_21/v276.go

@@ -0,0 +1,86 @@
+// Copyright 2023 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package v1_21 //nolint
+
+import (
+	"fmt"
+
+	"code.gitea.io/gitea/modules/json"
+	"code.gitea.io/gitea/modules/packages/rpm"
+
+	"xorm.io/xorm"
+)
+
+func RebuildRpmPackage(x *xorm.Engine) error {
+	sess := x.NewSession()
+	defer sess.Close()
+	defaultDistribution := rpm.RepositoryDefaultDistribution
+	defaultComponent := rpm.RepositoryDefaultComponent
+	compositeKey, _ := fmt.Printf("%s|%s", defaultDistribution, defaultComponent)
+	// select all old rpm package
+	var oldRpmIds []int64
+	ss := sess.Cols("id").
+		Table("package_file").
+		Where("composite_key not like", "%|%").
+		And("lower_name like ?", "%.rpm")
+	err := ss.Find(&oldRpmIds)
+	if err != nil {
+		return err
+	}
+	// add metadata
+	// NOTE: package_property[name='rpm.metdata'] is very large,
+	// and to avoid querying all of them resulting in large memory,
+	// a single RPM package is now used for updating.
+	for _, id := range oldRpmIds {
+
+		metadata := make([]string, 0, 3)
+		_, err := sess.Cols("ref_type", "ref_id", "value").
+			Table("package_property").
+			Where("name = 'rpm.metdata'").
+			And("ref_id = ?", id).
+			Get(&metadata)
+		if err != nil {
+			return err
+		}
+		// get rpm info
+		var rpmMetadata rpm.FileMetadata
+		err = json.Unmarshal([]byte(metadata[2]), &rpmMetadata)
+		if err != nil {
+			return err
+		}
+		_, err = sess.Exec(
+			"INSERT INTO package_property(ref_type, ref_id, name, value) values (?,?,?,?),(?,?,?,?),(?,?,?,?)",
+			metadata[0], metadata[1], "rpm.distribution", defaultDistribution,
+			metadata[0], metadata[1], "rpm.component", defaultComponent,
+			metadata[0], metadata[1], "rpm.architecture", rpmMetadata.Architecture,
+		)
+		if err != nil {
+			return err
+		}
+		// set default distribution
+		_, err = sess.Table("package_file").
+			Where("id = ?", id).
+			Update(map[string]any{
+				"composite_key": compositeKey,
+			})
+		if err != nil {
+			return err
+		}
+	}
+	// set old rpm index file to default distribution
+	_, err = sess.Table("package_file").
+		Where(
+			"composite_key = '' AND " +
+				"lower_name IN" +
+				"(" +
+				"'primary.xml.gz','other.xml.gz','filelists.xml.gz','other.xml.gz','repomd.xml','repomd.xml.asc'" +
+				")").
+		Update(map[string]any{
+			"composite_key": compositeKey,
+		})
+	if err != nil {
+		return err
+	}
+	return nil
+}

modules/packages/rpm/metadata.go

@@ -15,13 +15,18 @@ import (
 )
 
 const (
-	PropertyMetadata = "rpm.metadata"
-
-	SettingKeyPrivate = "rpm.key.private"
-	SettingKeyPublic  = "rpm.key.public"
+	PropertyMetadata     = "rpm.metadata"
+	PropertyDistribution = "rpm.distribution"
+	PropertyComponent    = "rpm.component"
+	PropertyArchitecture = "rpm.architecture"
+	SettingKeyPrivate    = "rpm.key.private"
+	SettingKeyPublic     = "rpm.key.public"
 
 	RepositoryPackage = "_rpm"
 	RepositoryVersion = "_repository"
+
+	RepositoryDefaultDistribution = "default"
+	RepositoryDefaultComponent    = "stable"
 )
 
 const (

options/locale/locale_en-US.ini

@@ -3383,6 +3383,10 @@ rpm.registry = Setup this registry from the command line:
 rpm.distros.redhat = on RedHat based distributions
 rpm.distros.suse = on SUSE based distributions
 rpm.install = To install the package, run the following command:
+rpm.package.info = Package Info
+rpm.package.architectures = Architectures
+rpm.package.description = Description
+rpm.package.summary = Summary
 rubygems.install = To install the package using gem, run the following command:
 rubygems.install2 = or add it to the Gemfile:
 rubygems.dependencies.runtime = Runtime Dependencies

routers/api/packages/api.go

@@ -513,14 +513,16 @@ func CommonRoutes() *web.Route {
 			r.Get("/simple/{id}", pypi.PackageMetadata)
 		}, reqPackageAccess(perm.AccessModeRead))
 		r.Group("/rpm", func() {
-			r.Get(".repo", rpm.GetRepositoryConfig)
 			r.Get("/repository.key", rpm.GetRepositoryKey)
-			r.Put("/upload", reqPackageAccess(perm.AccessModeWrite), rpm.UploadPackageFile)
-			r.Group("/package/{name}/{version}/{architecture}", func() {
-				r.Get("", rpm.DownloadPackageFile)
-				r.Delete("", reqPackageAccess(perm.AccessModeWrite), rpm.DeletePackageFile)
+			r.Group("/{distribution}/{component}", func() {
+				r.Get(".repo", rpm.GetRepositoryConfig)
+				r.Put("/upload", reqPackageAccess(perm.AccessModeWrite), rpm.UploadPackageFile)
+				r.Group("/package/{name}/{version}/{architecture}", func() {
+					r.Get("", rpm.DownloadPackageFile)
+					r.Delete("", reqPackageAccess(perm.AccessModeWrite), rpm.DeletePackageFile)
+				})
+				r.Get("/repodata/{filename}", rpm.GetRepositoryFile)
 			})
-			r.Get("/repodata/{filename}", rpm.GetRepositoryFile)
 		}, reqPackageAccess(perm.AccessModeRead))
 		r.Group("/rubygems", func() {
 			r.Get("/specs.4.8.gz", rubygems.EnumeratePackages)