mirror of
https://github.com/aljazceru/goose.git
synced 2026-02-23 15:34:27 +01:00
Add support for ascending/descending ordering of goose session list (#2087)
This commit is contained in:
committed by
GitHub
parent
ab5447057e
commit
08682507d9
@@ -73,6 +73,13 @@ enum SessionCommand {
|
||||
default_value = "text"
|
||||
)]
|
||||
format: String,
|
||||
|
||||
#[arg(
|
||||
long = "ascending",
|
||||
help = "Sort by date in ascending order (oldest first)",
|
||||
long_help = "Sort sessions by date in ascending order (oldest first). Default is descending order (newest first)."
|
||||
)]
|
||||
ascending: bool,
|
||||
},
|
||||
#[command(about = "Remove sessions")]
|
||||
Remove {
|
||||
@@ -393,8 +400,12 @@ pub async fn cli() -> Result<()> {
|
||||
builtins,
|
||||
}) => {
|
||||
return match command {
|
||||
Some(SessionCommand::List { verbose, format }) => {
|
||||
handle_session_list(verbose, format)?;
|
||||
Some(SessionCommand::List {
|
||||
verbose,
|
||||
format,
|
||||
ascending,
|
||||
}) => {
|
||||
handle_session_list(verbose, format, ascending)?;
|
||||
Ok(())
|
||||
}
|
||||
Some(SessionCommand::Remove { id, regex }) => {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
use anyhow::{Context, Result};
|
||||
use goose::session::info::{get_session_info, SessionInfo};
|
||||
use goose::session::info::{get_session_info, SessionInfo, SortOrder};
|
||||
use regex::Regex;
|
||||
use std::fs;
|
||||
|
||||
@@ -21,7 +21,7 @@ pub fn remove_session(session: &SessionInfo) -> Result<()> {
|
||||
}
|
||||
|
||||
pub fn handle_session_remove(id: String, regex_string: String) -> Result<()> {
|
||||
let sessions = match get_session_info() {
|
||||
let sessions = match get_session_info(SortOrder::Descending) {
|
||||
Ok(sessions) => sessions,
|
||||
Err(e) => {
|
||||
tracing::error!("Failed to remove sessions: {:?}", e);
|
||||
@@ -57,8 +57,14 @@ pub fn handle_session_remove(id: String, regex_string: String) -> Result<()> {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub fn handle_session_list(verbose: bool, format: String) -> Result<()> {
|
||||
let sessions = match get_session_info() {
|
||||
pub fn handle_session_list(verbose: bool, format: String, ascending: bool) -> Result<()> {
|
||||
let sort_order = if ascending {
|
||||
SortOrder::Ascending
|
||||
} else {
|
||||
SortOrder::Descending
|
||||
};
|
||||
|
||||
let sessions = match get_session_info(sort_order) {
|
||||
Ok(sessions) => sessions,
|
||||
Err(e) => {
|
||||
tracing::error!("Failed to list sessions: {:?}", e);
|
||||
|
||||
@@ -8,7 +8,7 @@ use axum::{
|
||||
};
|
||||
use goose::message::Message;
|
||||
use goose::session;
|
||||
use goose::session::info::{get_session_info, SessionInfo};
|
||||
use goose::session::info::{get_session_info, SessionInfo, SortOrder};
|
||||
use serde::Serialize;
|
||||
|
||||
#[derive(Serialize)]
|
||||
@@ -30,7 +30,8 @@ async fn list_sessions(
|
||||
) -> Result<Json<SessionListResponse>, StatusCode> {
|
||||
verify_secret_key(&headers, &state)?;
|
||||
|
||||
let sessions = get_session_info().map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
|
||||
let sessions =
|
||||
get_session_info(SortOrder::Descending).map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
|
||||
|
||||
Ok(Json(SessionListResponse { sessions }))
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
use anyhow::Result;
|
||||
use serde::Serialize;
|
||||
use std::cmp::Ordering;
|
||||
|
||||
use crate::session::{self, SessionMetadata};
|
||||
|
||||
@@ -11,7 +12,13 @@ pub struct SessionInfo {
|
||||
pub metadata: SessionMetadata,
|
||||
}
|
||||
|
||||
pub fn get_session_info() -> Result<Vec<SessionInfo>> {
|
||||
/// Sort order for listing sessions
|
||||
pub enum SortOrder {
|
||||
Ascending,
|
||||
Descending,
|
||||
}
|
||||
|
||||
pub fn get_session_info(sort_order: SortOrder) -> Result<Vec<SessionInfo>> {
|
||||
let sessions = match session::list_sessions() {
|
||||
Ok(sessions) => sessions,
|
||||
Err(e) => {
|
||||
@@ -19,7 +26,7 @@ pub fn get_session_info() -> Result<Vec<SessionInfo>> {
|
||||
return Err(anyhow::anyhow!("Failed to list sessions"));
|
||||
}
|
||||
};
|
||||
let session_infos = sessions
|
||||
let mut session_infos = sessions
|
||||
.into_iter()
|
||||
.map(|(id, path)| {
|
||||
// Get last modified time as string
|
||||
@@ -43,7 +50,25 @@ pub fn get_session_info() -> Result<Vec<SessionInfo>> {
|
||||
metadata,
|
||||
}
|
||||
})
|
||||
.collect();
|
||||
.collect::<Vec<SessionInfo>>();
|
||||
|
||||
// Sort sessions by modified date
|
||||
// Since all dates are in ISO format (YYYY-MM-DD HH:MM:SS UTC), we can just use string comparison
|
||||
// This works because the ISO format ensures lexicographical ordering matches chronological ordering
|
||||
session_infos.sort_by(|a, b| {
|
||||
if a.modified == "Unknown" && b.modified == "Unknown" {
|
||||
return Ordering::Equal;
|
||||
} else if a.modified == "Unknown" {
|
||||
return Ordering::Greater; // Unknown dates go last
|
||||
} else if b.modified == "Unknown" {
|
||||
return Ordering::Less;
|
||||
}
|
||||
|
||||
match sort_order {
|
||||
SortOrder::Ascending => a.modified.cmp(&b.modified),
|
||||
SortOrder::Descending => b.modified.cmp(&a.modified),
|
||||
}
|
||||
});
|
||||
|
||||
Ok(session_infos)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user