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

Refactored session id.
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 3s
Details

Browse Source
This commit is contained in:
Jeff Baskin
2026-02-19 08:59:48 -05:00
parent 36b414d0c4
commit 8ce7bb642e
5 changed files with 50 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/lib.rs
View File

@@ -39,40 +39,31 @@ impl MoreThanText {
Self { queue: queue }
}
fn recursive_session_request(
&mut self,
rx: Receiver<Message>,
action: MsgAction,
msg: Message,
) -> Uuid {
let reply = msg.response(action);
self.queue.send(reply);
let result = rx.recv().unwrap();
match result.get_action() {
MsgAction::Records(data) => {
fn new_session() -> UserAction {
Addition::new(Session::doc_names()[0].clone()).into()
}
fn recursive_message_request<UA>(&mut self, action: UA) -> Uuid
where
UA: Into<UserAction>,
{
match self.records(action) {
Ok(data) => {
if data.len() == 0 {
self.recursive_session_request(
rx,
Addition::new(Session::doc_names()[0].clone()).into(),
msg,
)
self.recursive_message_request(MoreThanText::new_session())
} else {
let rec = data.iter().last().unwrap();
let field = rec.get(Name::english("id")).unwrap();
match field {
Field::Uuid(result) => result,
_ => unreachable!("should only receive uuid"),
match rec.get(Name::english("id")).unwrap() {
Field::Uuid(id) => id,
_ => unreachable!("should always return uuid"),
}
}
}
_ => unreachable!("session queries should always return"),
Err(_) => self.recursive_message_request(MoreThanText::new_session()),
}
}
pub fn validate_session(&mut self, session: Option<String>) -> Uuid {
let (tx, rx) = channel();
let sender_id = self.queue.add_sender(tx);
let new_session: MsgAction = Addition::new(Session::doc_names()[0].clone()).into();
let action = match session {
Some(data) => match Uuid::try_from(data.as_str()) {
Ok(id) => {
@@ -84,24 +75,11 @@ impl MoreThanText {
query.add(Name::english("id"), calc);
query.into()
}
Err(_) => new_session,
Err(_) => MoreThanText::new_session(),
},
None => new_session,
None => MoreThanText::new_session(),
};
let doc_name = Name::english("session");
let msg = Message::new(action.clone());
let msg_id = msg.get_message_id();
let path = Path::new(
Include::Just(msg_id.clone()),
Include::Just(doc_name.clone().into()),
Include::Just(Action::Records),
);
let reg_msg = Register::new(sender_id.clone(), RegMsg::AddRoute(path));
self.queue.send(msg.forward(NameType::None, reg_msg));
rx.recv().unwrap(); // Wait for completion.
let output = self.recursive_session_request(rx, action, msg);
self.queue.remove_sender(&sender_id);
output
self.recursive_message_request(action)
}
pub fn records<UA>(&mut self, request: UA) -> Result<Records, MTTError>