partialy implement Query, also add date
This commit is contained in:
parent
cfc2ff5886
commit
cb2b8339a6
|
@ -0,0 +1,89 @@
|
||||||
|
use serde::de::Error;
|
||||||
|
use serde::Serialize;
|
||||||
|
use serde::{Deserialize, Deserializer, Serializer};
|
||||||
|
|
||||||
|
#[derive(Clone, Debug, Eq, PartialEq, Hash, Ord, PartialOrd)]
|
||||||
|
pub struct Date {
|
||||||
|
pub year: u16,
|
||||||
|
pub month: u8,
|
||||||
|
pub day: u8,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Date {
|
||||||
|
#[cfg(test)]
|
||||||
|
pub fn new(year: u16, month: u8, day: u8) -> Self {
|
||||||
|
Date { year, month, day }
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn from_str(input: &str) -> Option<Self> {
|
||||||
|
let mut parts = input.splitn(3, "-");
|
||||||
|
|
||||||
|
let year = parts.next()?.parse::<u16>().ok()?;
|
||||||
|
let month = parts.next()?.parse::<u8>().ok()?;
|
||||||
|
let day = parts.next()?.parse::<u8>().ok()?;
|
||||||
|
|
||||||
|
if month > 12 {
|
||||||
|
return None;
|
||||||
|
}
|
||||||
|
|
||||||
|
if day > 31 {
|
||||||
|
return None;
|
||||||
|
}
|
||||||
|
|
||||||
|
Some(Date { year, month, day })
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Serialize for Date {
|
||||||
|
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
|
||||||
|
where
|
||||||
|
S: Serializer,
|
||||||
|
{
|
||||||
|
serializer.serialize_str(&format!(
|
||||||
|
"{:04}-{:02}-{:02}",
|
||||||
|
self.year, self.month, self.day
|
||||||
|
))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<'de> Deserialize<'de> for Date {
|
||||||
|
fn deserialize<D>(deserializer: D) -> Result<Date, D::Error>
|
||||||
|
where
|
||||||
|
D: Deserializer<'de>,
|
||||||
|
{
|
||||||
|
let data = String::deserialize(deserializer)?;
|
||||||
|
|
||||||
|
match Date::from_str(&data) {
|
||||||
|
Some(date) => Ok(date),
|
||||||
|
None => Err(D::Error::custom(
|
||||||
|
"Expected a String in this format: YYYY-MM-DD.",
|
||||||
|
)),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod test {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn order() {
|
||||||
|
// Other Test not needed, since the Ord is derived.
|
||||||
|
assert!(Date::new(2019, 10, 10) > Date::new(2018, 10, 10));
|
||||||
|
assert!(Date::new(2018, 11, 10) > Date::new(2018, 10, 10));
|
||||||
|
assert!(Date::new(2018, 10, 11) > Date::new(2018, 10, 10));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn from_str() {
|
||||||
|
assert_eq!(Some(Date::new(2019, 10, 10)), Date::from_str("2019-10-10"));
|
||||||
|
assert_eq!(Some(Date::new(2019, 1, 1)), Date::from_str("2019-1-1"));
|
||||||
|
assert_eq!(None, Date::from_str("2019-1-1-444"));
|
||||||
|
assert_eq!(
|
||||||
|
Some(Date::new(2019, 1, 1)),
|
||||||
|
Date::from_str("2019-0000000000001-00000001")
|
||||||
|
);
|
||||||
|
assert_eq!(None, Date::from_str("400-400-400"));
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -8,6 +8,9 @@ use std::io;
|
||||||
mod sha256;
|
mod sha256;
|
||||||
pub use sha256::Sha256;
|
pub use sha256::Sha256;
|
||||||
|
|
||||||
|
mod date;
|
||||||
|
pub use date::Date;
|
||||||
|
|
||||||
mod texture_format;
|
mod texture_format;
|
||||||
pub use texture_format::TextureFormat;
|
pub use texture_format::TextureFormat;
|
||||||
|
|
||||||
|
@ -17,7 +20,8 @@ pub struct Texture {
|
||||||
pub name: String,
|
pub name: String,
|
||||||
pub tags: Vec<String>,
|
pub tags: Vec<String>,
|
||||||
pub format: TextureFormat,
|
pub format: TextureFormat,
|
||||||
pub resolution: (usize, usize),
|
pub added_on: Date,
|
||||||
|
pub resolution: (u64, u64),
|
||||||
pub texture_hash: Sha256,
|
pub texture_hash: Sha256,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,13 +1,7 @@
|
||||||
// TODO: remove on implementation
|
|
||||||
#![allow(unused_imports)]
|
|
||||||
#![allow(unused_variables)]
|
|
||||||
#![allow(dead_code)]
|
|
||||||
|
|
||||||
|
|
||||||
use crate::model::*;
|
use crate::model::*;
|
||||||
|
|
||||||
pub struct Query {
|
pub struct Query {
|
||||||
filters: Vec<QueryFilterModifier>,
|
filters: Vec<QueryFilter>,
|
||||||
}
|
}
|
||||||
|
|
||||||
pub type QueryParserResult = Result<Query, QuerySyntaxError>;
|
pub type QueryParserResult = Result<Query, QuerySyntaxError>;
|
||||||
|
@ -17,6 +11,18 @@ pub enum QuerySyntaxError {
|
||||||
|
|
||||||
impl Query {
|
impl Query {
|
||||||
pub fn parse(input: &[String]) -> QueryParserResult {
|
pub fn parse(input: &[String]) -> QueryParserResult {
|
||||||
|
let mut result = Query { filters: vec![] };
|
||||||
|
|
||||||
|
for fltr in input {
|
||||||
|
let qryfltr = Self::parse_single(fltr)?;
|
||||||
|
|
||||||
|
result.filters.push(qryfltr);
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(result)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn parse_single(input: &str) -> Result<QueryFilter, QuerySyntaxError> {
|
||||||
unimplemented!()
|
unimplemented!()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -25,14 +31,60 @@ pub fn search(input: &[Texture], query: &Query) -> Vec<Texture> {
|
||||||
unimplemented!()
|
unimplemented!()
|
||||||
}
|
}
|
||||||
|
|
||||||
enum QueryFilterModifier {
|
enum QueryFilter {
|
||||||
None(QueryFilter),
|
Not(Box<QueryFilter>),
|
||||||
Not(QueryFilter),
|
Tag(String),
|
||||||
|
SpecialInName(String),
|
||||||
|
SpecialBeforeDate(Date),
|
||||||
|
SpecialAfterDate(Date),
|
||||||
|
SpecialMinResolution(u64),
|
||||||
}
|
}
|
||||||
|
|
||||||
enum QueryFilter {
|
enum Score {
|
||||||
TagName(String),
|
RequiredMatch(bool),
|
||||||
InName(String),
|
Match(bool),
|
||||||
MinResolution(usize),
|
}
|
||||||
BeforeDate { year: u16, month: u16, day: u16 },
|
|
||||||
|
use std::ops::Not;
|
||||||
|
impl Not for Score {
|
||||||
|
type Output = Score;
|
||||||
|
|
||||||
|
fn not(self) -> Score {
|
||||||
|
match self {
|
||||||
|
Score::RequiredMatch(b) => Score::RequiredMatch(!b),
|
||||||
|
Score::Match(b) => Score::Match(!b),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl QueryFilter {
|
||||||
|
pub fn score(&self, texture: &Texture) -> Score {
|
||||||
|
use QueryFilter::*;
|
||||||
|
match self {
|
||||||
|
Not(inner) => inner.score(texture).not(),
|
||||||
|
|
||||||
|
Tag(tag) => Score::Match(
|
||||||
|
texture
|
||||||
|
.tags
|
||||||
|
.iter()
|
||||||
|
.find(|tt| tt.to_lowercase() == tag.to_lowercase())
|
||||||
|
.is_some(),
|
||||||
|
),
|
||||||
|
|
||||||
|
SpecialInName(name) => Score::RequiredMatch(
|
||||||
|
//
|
||||||
|
texture.name.contains(name),
|
||||||
|
),
|
||||||
|
|
||||||
|
SpecialBeforeDate(date) => Score::RequiredMatch(texture.added_on <= *date),
|
||||||
|
|
||||||
|
SpecialAfterDate(date) => Score::RequiredMatch(texture.added_on > *date),
|
||||||
|
|
||||||
|
SpecialMinResolution(required) => {
|
||||||
|
let smaller_resolution = u64::min(texture.resolution.0, texture.resolution.1);
|
||||||
|
|
||||||
|
Score::RequiredMatch(smaller_resolution >= *required)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -228,6 +228,7 @@ mod test {
|
||||||
name: "texture.png".to_string(),
|
name: "texture.png".to_string(),
|
||||||
tags: vec!["Wood".to_string(), "Hair".to_string()],
|
tags: vec!["Wood".to_string(), "Hair".to_string()],
|
||||||
format: TextureFormat::PNG,
|
format: TextureFormat::PNG,
|
||||||
|
added_on: Date::new(2019, 10, 12),
|
||||||
resolution: (512, 512),
|
resolution: (512, 512),
|
||||||
texture_hash: Sha256(HASH_BYTES),
|
texture_hash: Sha256(HASH_BYTES),
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue