CloudNebulaProject/ips
1
0
Fork 0
mirror of https://codeberg.org/Toasterson/ips.git synced 2026-04-10 13:20:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Reorder struct fields for consistency and align with Rust formatting standards.

Browse source
This commit is contained in:
Till Wegmueller 2025-12-22 20:11:08 +01:00
parent d2d1c297cc
commit a921c99eb6
No known key found for this signature in database
1 changed files with 29 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
libips/src/repository/catalog.rs
View file

@ -125,10 +125,6 @@ pub struct UpdateLogInfo {
/// Catalog attributes /// Catalog attributes
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
pub struct CatalogAttrs { pub struct CatalogAttrs {
/// Optional signature information
#[serde(rename = "_SIGNATURE", skip_serializing_if = "Option::is_none")]
pub signature: Option<HashMap<String, String>>,
/// Creation timestamp in ISO-8601 'basic format' date in UTC /// Creation timestamp in ISO-8601 'basic format' date in UTC
pub created: String, pub created: String,
@ -153,6 +149,10 @@ pub struct CatalogAttrs {
/// Catalog version /// Catalog version
pub version: u32, pub version: u32,
/// Optional signature information
#[serde(rename = "_SIGNATURE", skip_serializing_if = "Option::is_none")]
pub signature: Option<HashMap<String, String>>,
} }
impl CatalogAttrs { impl CatalogAttrs {
@ -206,13 +206,13 @@ pub struct PackageVersionEntry {
/// Catalog part (base, dependency, summary) /// Catalog part (base, dependency, summary)
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
pub struct CatalogPart { pub struct CatalogPart {
/// Optional signature information
#[serde(rename = "_SIGNATURE", skip_serializing_if = "Option::is_none")]
pub signature: Option<HashMap<String, String>>,
/// Packages by publisher and stem /// Packages by publisher and stem
#[serde(flatten)] #[serde(flatten)]
pub packages: HashMap<String, HashMap<String, Vec<PackageVersionEntry>>>, pub packages: HashMap<String, HashMap<String, Vec<PackageVersionEntry>>>,
/// Optional signature information
#[serde(rename = "_SIGNATURE", skip_serializing_if = "Option::is_none")]
pub signature: Option<HashMap<String, String>>,
} }
impl CatalogPart { impl CatalogPart {
@ -276,13 +276,11 @@ impl CatalogPart {
pub fn load<P: AsRef<Path>>(path: P) -> Result<Self> { pub fn load<P: AsRef<Path>>(path: P) -> Result<Self> {
let path_ref = path.as_ref(); let path_ref = path.as_ref();
let json = fs::File::open(path_ref)?; let json = fs::File::open(path_ref)?;
// Try to parse the JSON directly // Try to parse the JSON directly
match serde_json::from_reader(json) { match serde_json::from_reader(json) {
Ok(part) => Ok(part), Ok(part) => Ok(part),
Err(e) => { Err(e) => Err(CatalogError::JsonSerializationError(e)),
Err(CatalogError::JsonSerializationError(e))
}
} }
} }
} }
@ -322,12 +320,12 @@ pub struct PackageUpdateEntry {
/// Update log /// Update log
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
pub struct UpdateLog { pub struct UpdateLog {
/// Updates by publisher and stem
pub updates: HashMap<String, HashMap<String, Vec<PackageUpdateEntry>>>,
/// Optional signature information /// Optional signature information
#[serde(rename = "_SIGNATURE", skip_serializing_if = "Option::is_none")] #[serde(rename = "_SIGNATURE", skip_serializing_if = "Option::is_none")]
pub signature: Option<HashMap<String, String>>, pub signature: Option<HashMap<String, String>>,
/// Updates by publisher and stem
pub updates: HashMap<String, HashMap<String, Vec<PackageUpdateEntry>>>,
} }
impl UpdateLog { impl UpdateLog {
@ -387,7 +385,7 @@ impl UpdateLog {
pub struct CatalogManager { pub struct CatalogManager {
/// Path to the catalog directory /// Path to the catalog directory
catalog_dir: PathBuf, catalog_dir: PathBuf,
/// Publisher name /// Publisher name
publisher: String, publisher: String,
@ -596,27 +594,35 @@ mod tests {
#[test] #[test]
fn test_load_sample_catalog() { fn test_load_sample_catalog() {
// Path is relative to the crate root (libips) // Path is relative to the crate root (libips)
let path = PathBuf::from("../sample_data/sample-repo/publisher/openindiana.org/catalog/catalog.base.C"); let path = PathBuf::from(
"../sample_data/sample-repo/publisher/openindiana.org/catalog/catalog.base.C",
);
// Only run this test if the sample data exists // Only run this test if the sample data exists
if path.exists() { if path.exists() {
println!("Testing with sample catalog at {:?}", path); println!("Testing with sample catalog at {:?}", path);
match CatalogPart::load(&path) { match CatalogPart::load(&path) {
Ok(part) => { Ok(part) => {
println!("Successfully loaded catalog part"); println!("Successfully loaded catalog part");
// Verify we loaded the correct data structure // Verify we loaded the correct data structure
// The sample file has "openindiana.org" as a key // The sample file has "openindiana.org" as a key
assert!(part.packages.contains_key("openindiana.org"), "Catalog should contain openindiana.org publisher"); assert!(
part.packages.contains_key("openindiana.org"),
"Catalog should contain openindiana.org publisher"
);
let packages = part.packages.get("openindiana.org").unwrap(); let packages = part.packages.get("openindiana.org").unwrap();
println!("Found {} packages for openindiana.org", packages.len()); println!("Found {} packages for openindiana.org", packages.len());
assert!(packages.len() > 0, "Should have loaded packages"); assert!(packages.len() > 0, "Should have loaded packages");
}, }
Err(e) => panic!("Failed to load catalog part: {}", e), Err(e) => panic!("Failed to load catalog part: {}", e),
} }
} else { } else {
println!("Sample data not found at {:?}, skipping test. This is expected in some CI environments.", path); println!(
"Sample data not found at {:?}, skipping test. This is expected in some CI environments.",
path
);
} }
} }
} }