MoreThanText/morethantext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved calculation into action.
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 1s
Details

Browse Source
This commit is contained in:
Jeff Baskin
2026-02-08 12:26:19 -05:00
parent aa7d5ae1f6
commit 3f16284682
8 changed files with 352 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

214
src/message/wrapper.rs
View File

@@ -408,219 +408,6 @@ mod operands {
}
/*
#[derive(Clone, Debug)]
pub enum CalcValue {
Calculate(Calculation),
Existing(FieldType),
FType(FieldType),
None,
Value(Field),
}
impl CalcValue {
pub fn get(&self, existing: &Field) -> Field {
match self {
Self::Calculate(calc) => calc.calculate(existing),
Self::Existing(_) => existing.clone(),
Self::FType(ftype) => ftype.get_default(),
Self::None => Field::None,
Self::Value(field) => field.clone(),
}
}
fn get_type(&self) -> FieldType {
match self {
Self::Calculate(calc) => calc.get_type(),
Self::Existing(ftype) => ftype.clone(),
Self::FType(ftype) => ftype.clone(),
Self::None => FieldType::None,
Self::Value(field) => field.into(),
}
}
}
impl From<Calculation> for CalcValue {
fn from(value: Calculation) -> Self {
Self::Calculate(value)
}
}
impl From<Field> for CalcValue {
fn from(value: Field) -> Self {
Self::Value(value)
}
}
impl From<&Field> for CalcValue {
fn from(value: &Field) -> Self {
Self::from(value.clone())
}
}
impl From<FieldType> for CalcValue {
fn from(value: FieldType) -> Self {
Self::FType(value)
}
}
impl From<bool> for CalcValue {
fn from(value: bool) -> Self {
let output: Field = value.into();
Self::from(output).into()
}
}
impl From<DateTime<Utc>> for CalcValue {
fn from(value: DateTime<Utc>) -> Self {
let output: Field = value.into();
Self::from(output).into()
}
}
impl From<Duration> for CalcValue {
fn from(value: Duration) -> Self {
let output: Field = value.into();
Self::from(output).into()
}
}
impl From<i128> for CalcValue {
fn from(value: i128) -> Self {
let output: Field = value.into();
Self::from(output).into()
}
}
impl From<&str> for CalcValue {
fn from(value: &str) -> Self {
let output: Field = value.into();
Self::from(output).into()
}
}
impl From<String> for CalcValue {
fn from(value: String) -> Self {
let output: Field = value.into();
Self::from(output).into()
}
}
impl From<Uuid> for CalcValue {
fn from(value: Uuid) -> Self {
let output: Field = value.into();
Self::from(output).into()
}
}
#[cfg(test)]
mod calcvalues {
use super::*;
#[test]
fn from_uuid() {
let value = Uuid::new_v4();
let expected: Field = value.into();
let result: CalcValue = value.into();
match result.clone() {
CalcValue::Value(data) => assert_eq!(data, expected),
_ => unreachable!("got {:?}, should have gotten a field", result),
}
assert_eq!(result.get(&Field::None), expected);
}
#[test]
fn from_str() {
let value = "something";
let expected: Field = value.into();
let result: CalcValue = value.into();
match result.clone() {
CalcValue::Value(data) => assert_eq!(data, expected),
_ => unreachable!("got {:?}, should have gotten a field", result),
}
assert_eq!(result.get(&Field::None), expected);
}
#[test]
fn from_string() {
let value = "data".to_string();
let expected: Field = value.clone().into();
let result: CalcValue = value.into();
match result.clone() {
CalcValue::Value(data) => assert_eq!(data, expected),
_ => unreachable!("got {:?}, should have gotten a field", result),
}
assert_eq!(result.get(&Field::None), expected);
}
#[test]
fn from_boolean() {
let value = true;
let expected: Field = value.clone().into();
let result: CalcValue = value.into();
match result.clone() {
CalcValue::Value(data) => assert_eq!(data, expected),
_ => unreachable!("got {:?}, should have gotten a field", result),
}
assert_eq!(result.get(&Field::None), expected);
}
#[test]
fn from_datetime() {
let value = Utc::now();
let expected: Field = value.clone().into();
let result: CalcValue = value.into();
match result.clone() {
CalcValue::Value(data) => assert_eq!(data, expected),
_ => unreachable!("got {:?}, should have gotten a field", result),
}
assert_eq!(result.get(&Field::None), expected);
}
#[test]
fn from_duration() {
let value = Duration::from_secs(5);
let expected: Field = value.clone().into();
let result: CalcValue = value.into();
match result.clone() {
CalcValue::Value(data) => assert_eq!(data, expected),
_ => unreachable!("got {:?}, should have gotten a field", result),
}
assert_eq!(result.get(&Field::None), expected);
}
#[test]
fn from_integer() {
let value: i128 = 5;
let expected: Field = value.clone().into();
let result: CalcValue = value.into();
match result.clone() {
CalcValue::Value(data) => assert_eq!(data, expected),
_ => unreachable!("got {:?}, should have gotten a field", result),
}
assert_eq!(result.get(&Field::None), expected);
}
#[test]
fn from_calculation() {
let duration = Duration::from_secs(300);
let start = Utc::now() + duration;
let mut calc = Calculation::new(Operand::Add);
calc.add_value(FieldType::DateTime).unwrap();
calc.add_value(duration.clone()).unwrap();
let result: CalcValue = calc.into();
let data = match result.get(&Field::None) {
Field::DateTime(data) => data,
_ => unreachable!(),
};
let stop = Utc::now() + duration;
assert!(
data > start && data < stop,
"should be about 5 minutes ahead"
);
}
}
*/
#[derive(Clone, Debug)]
pub struct Calculation {
operation: Operand,
@@ -960,6 +747,7 @@ mod calculations {
}
}
}
*/
#[allow(dead_code)]
#[derive(Clone, Debug)]