From 4d3c50c5fc767fd4a64b33041c01252fc88ecd1f Mon Sep 17 00:00:00 2001 From: JMARyA Date: Sun, 27 Apr 2025 20:42:37 +0200 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20rel=20update?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- migrations/0001_pkg_meta.sql | 2 +- src/pkg/package.rs | 8 ++++---- src/pkg/repo.rs | 9 +-------- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/migrations/0001_pkg_meta.sql b/migrations/0001_pkg_meta.sql index 6dd71c2..db799d2 100644 --- a/migrations/0001_pkg_meta.sql +++ b/migrations/0001_pkg_meta.sql @@ -3,7 +3,7 @@ CREATE TABLE IF NOT EXISTS package_meta ( name TEXT NOT NULL, arch TEXT NOT NULL, version TEXT NOT NULL, - rel INTEGER NOT NULL, + rel TEXT NOT NULL, download_count INTEGER NOT NULL DEFAULT 1, PRIMARY KEY (repo, name, arch, version, rel) ); diff --git a/src/pkg/package.rs b/src/pkg/package.rs index e6af2be..284ea15 100644 --- a/src/pkg/package.rs +++ b/src/pkg/package.rs @@ -19,7 +19,7 @@ pub struct Package { pub arch: Architecture, /// Name of the package pub name: String, - pub rel: i32, + pub rel: String, /// Version of the package pub version: Option, /// Compression used @@ -33,7 +33,7 @@ impl Package { arch: Architecture, pkg_name: &str, version: &str, - rel: i32, + rel: String, compression: Compression, ) -> Self { let pkg = Package { @@ -49,7 +49,7 @@ impl Package { pkg } - pub fn version(ver: &str) -> (String, i32) { + pub fn version(ver: &str) -> (String, String) { let mut splitted = ver.split('-').collect::>(); let rel = splitted.pop().unwrap(); let ver = splitted.join("-"); @@ -226,7 +226,7 @@ impl Package { repo: repo.to_string(), arch, name: pkg_name.to_string(), - rel: 1, + rel: 1.to_string(), version: None, compression, }; diff --git a/src/pkg/repo.rs b/src/pkg/repo.rs index e759231..999ad40 100644 --- a/src/pkg/repo.rs +++ b/src/pkg/repo.rs @@ -164,14 +164,7 @@ impl Repository { pub fn get_pkg(&self, pkg_name: &str) -> Option { // Find package let (name, version, rel, arch, compress) = Package::extract_pkg_name(pkg_name).unwrap(); - let pkg = Package::new( - &self.name, - arch, - &name, - &version, - rel.parse().unwrap(), - compress, - ); + let pkg = Package::new(&self.name, arch, &name, &version, rel, compress); // Return if exists if pkg.exists() { Some(pkg) } else { None }