Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ignore num_no_build column of versions.csv #41

Merged
merged 1 commit into from
Oct 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions src/ignore.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
use serde::de::{Deserialize, Deserializer, Visitor};
use std::fmt;

#[derive(Default)]
pub(crate) struct IgnoredStr;

impl<'de> Deserialize<'de> for IgnoredStr {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
where
D: Deserializer<'de>,
{
deserializer.deserialize_str(IgnoredStr)
}
}

impl<'de> Visitor<'de> for IgnoredStr {
type Value = IgnoredStr;

fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
formatter.write_str("string")
}

fn visit_str<E>(self, _ignored: &str) -> Result<Self::Value, E> {
Ok(IgnoredStr)
}
}
1 change: 1 addition & 0 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ mod bool;
mod date;
mod datetime;
mod error;
mod ignore;
mod load;
mod set;

Expand Down
93 changes: 81 additions & 12 deletions src/versions.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
//! <b style="font-variant:small-caps">versions.csv</b>

use crate::crates::CrateId;
use crate::ignore::IgnoredStr;
use crate::users::UserId;
use chrono::{DateTime, Utc};
use semver::{BuildMetadata, Op, Version, VersionReq};
Expand All @@ -20,39 +21,107 @@ use std::str::FromStr;
pub struct VersionId(pub u32);

/// One row of **versions.csv**.
#[derive(Deserialize, Clone, Debug)]
#[serde(deny_unknown_fields)]
#[derive(Clone, Debug)]
#[non_exhaustive]
pub struct Row {
/// PRIMARY KEY
pub id: VersionId,
pub crate_id: CrateId,
#[serde(deserialize_with = "version")]
pub num: Version,
#[serde(deserialize_with = "crate::datetime::de")]
pub updated_at: DateTime<Utc>,
#[serde(deserialize_with = "crate::datetime::de")]
pub created_at: DateTime<Utc>,
pub downloads: u64,
#[serde(deserialize_with = "features_map")]
pub features: Map<String, Vec<String>>,
#[serde(deserialize_with = "crate::bool::de")]
pub yanked: bool,
pub license: String,
pub crate_size: Option<u64>,
pub published_by: Option<UserId>,
#[serde(deserialize_with = "checksum", default)]
pub checksum: Option<[u8; 32]>,
#[serde(default)]
pub links: Option<String>,
#[serde(default, deserialize_with = "rust_version")]
pub rust_version: Option<Version>,
#[serde(default, deserialize_with = "has_lib")]
pub has_lib: bool,
#[serde(default, deserialize_with = "bin_names")]
pub bin_names: Vec<String>,
}

impl<'de> Deserialize<'de> for Row {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
where
D: Deserializer<'de>,
{
#[derive(Deserialize)]
#[serde(deny_unknown_fields)]
struct Row {
id: VersionId,
crate_id: CrateId,
#[serde(deserialize_with = "version")]
num: Version,
#[serde(default)]
#[allow(dead_code)]
num_no_build: IgnoredStr,
#[serde(deserialize_with = "crate::datetime::de")]
updated_at: DateTime<Utc>,
#[serde(deserialize_with = "crate::datetime::de")]
created_at: DateTime<Utc>,
downloads: u64,
#[serde(deserialize_with = "features_map")]
features: Map<String, Vec<String>>,
#[serde(deserialize_with = "crate::bool::de")]
yanked: bool,
license: String,
crate_size: Option<u64>,
published_by: Option<UserId>,
#[serde(deserialize_with = "checksum", default)]
checksum: Option<[u8; 32]>,
#[serde(default)]
links: Option<String>,
#[serde(default, deserialize_with = "rust_version")]
rust_version: Option<Version>,
#[serde(default, deserialize_with = "has_lib")]
has_lib: bool,
#[serde(default, deserialize_with = "bin_names")]
bin_names: Vec<String>,
}

let Row {
id,
crate_id,
num,
num_no_build: _,
updated_at,
created_at,
downloads,
features,
yanked,
license,
crate_size,
published_by,
checksum,
links,
rust_version,
has_lib,
bin_names,
} = Row::deserialize(deserializer)?;
Ok(Self {
id,
crate_id,
num,
updated_at,
created_at,
downloads,
features,
yanked,
license,
crate_size,
published_by,
checksum,
links,
rust_version,
has_lib,
bin_names,
})
}
}

impl Ord for Row {
fn cmp(&self, other: &Self) -> Ordering {
VersionId::cmp(&self.id, &other.id)
Expand Down
Loading