artixweb/artixweb_packages
10
0
Fork 1
Code Issues 1 Pull Requests Actions Packages Projects Releases 4 Wiki Activity

Compare commits

base: artixweb:v0.1.2
Branches Tags
artixweb:master artixweb:repo-url-fix artixweb:development artixweb:hide_stuff
artixweb:v0.1.4 artixweb:v0.1.3 artixweb:v0.1.2 artixweb:v0.1.1
...
compare: artixweb:repo-url-fix
Branches Tags
artixweb:master artixweb:repo-url-fix artixweb:development artixweb:hide_stuff
artixweb:v0.1.4 artixweb:v0.1.3 artixweb:v0.1.2 artixweb:v0.1.1

2 Commits
v0.1.2 ... repo-url-f

Author SHA1 Message Date
Cory Sanin
84f51bd2f3 feat: ignore repo URL stored in database
All checks were successful
Docker Image CI / build (pull_request) Successful in 7m39s
Details
2024-06-17 18:06:19 -05:00
Cory Sanin
9eec2a2671 Back to development: 0.1.3 2024-06-17 18:05:30 -05:00
5 changed files with 9 additions and 10 deletions
Expand all files Collapse all files

6
Cargo.lock generated
View File

@@ -410,7 +410,7 @@ dependencies = [
[[package]] [[package]]
name = "artix-gitea" name = "artix-gitea"
version = "0.1.2" version = "0.1.3"
dependencies = [ dependencies = [
"actix-web", "actix-web",
"awc", "awc",
@@ -420,7 +420,7 @@ dependencies = [
[[package]] [[package]]
name = "artix-pkglib" name = "artix-pkglib"
version = "0.1.2" version = "0.1.3"
dependencies = [ dependencies = [
"alpm", "alpm",
"alpm-utils", "alpm-utils",
@@ -430,7 +430,7 @@ dependencies = [
[[package]] [[package]]
name = "artixweb_packages" name = "artixweb_packages"
version = "0.1.2" version = "0.1.3"
dependencies = [ dependencies = [
"actix-files", "actix-files",
"actix-identity", "actix-identity",

2
crates/artix-gitea/Cargo.toml
View File

@@ -8,7 +8,7 @@ homepage = "https://packages.artixlinux.org"
keywords = ["artix", "packages", "gitea"] keywords = ["artix", "packages", "gitea"]
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
edition = "2021" edition = "2021"
version = "0.1.2" version = "0.1.3"
[lib] [lib]
name = "artix_gitea" name = "artix_gitea"

2
crates/artix-pkglib/Cargo.toml
View File

@@ -8,7 +8,7 @@ homepage = "https://packages.artixlinux.org"
keywords = ["artix", "packages"] keywords = ["artix", "packages"]
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
edition = "2021" edition = "2021"
version = "0.1.2" version = "0.1.3"
[lib] [lib]
name = "artix_pkglib" name = "artix_pkglib"

6
crates/artixweb-packages/Cargo.toml
View File

@@ -7,7 +7,7 @@ repository = "gitea.artixlinux.org/artix/artixweb_packages"
keywords = ["artix", "packages"] keywords = ["artix", "packages"]
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
edition = "2021" edition = "2021"
version = "0.1.2" version = "0.1.3"
[[bin]] [[bin]]
name = "artixweb_packages" name = "artixweb_packages"
@@ -15,8 +15,8 @@ test = false
bench = false bench = false
[dependencies] [dependencies]
artix-gitea = { path = "../artix-gitea", version = "=0.1.2" } artix-gitea = { path = "../artix-gitea", version = "=0.1.3" }
artix-pkglib = { path = "../artix-pkglib", version = "=0.1.2" } artix-pkglib = { path = "../artix-pkglib", version = "=0.1.3" }
actix-files = "0.6.0" actix-files = "0.6.0"
actix-identity = "0.4" actix-identity = "0.4"

3
crates/artixweb-packages/src/handlers/packages.rs
View File

@@ -457,7 +457,7 @@ pub(crate) async fn get_packages_details_inner(
.iter() .iter()
.map(std::string::ToString::to_string) .map(std::string::ToString::to_string)
.collect(), .collect(),
gitea_url: String::new(), gitea_url: format!("{}/packages/{}", SETTINGS.gitea_url, pkg.name().to_string()),
dependencies: get_depends_from_package( dependencies: get_depends_from_package(
&handle, &handle,
pkg.arch().unwrap_or("any"), pkg.arch().unwrap_or("any"),
@@ -517,7 +517,6 @@ pub(crate) async fn get_packages_details_inner(
web::block(move || get_package_metadata(&pkg_name_version, &pool)).await web::block(move || get_package_metadata(&pkg_name_version, &pool)).await
{ {
result.last_updated = metadata.last_update.timestamp(); result.last_updated = metadata.last_update.timestamp();
result.gitea_url = metadata.gitea_url;
result.flagged = metadata.flagged; result.flagged = metadata.flagged;
if let Some(flagged_on) = metadata.flag_on { if let Some(flagged_on) = metadata.flag_on {
result.flagged_on = flagged_on.timestamp_millis(); result.flagged_on = flagged_on.timestamp_millis();