NotAShelf/stash
1
0
Fork 0
mirror of https://github.com/NotAShelf/stash.git synced 2026-04-18 00:28:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

commands/list: allow printing in reversed order with --reverse

Browse source 
Signed-off-by: NotAShelf <raf@notashelf.dev>
Change-Id: I305cfdc68d877dc5d5083a76dccc62db6a6a6964
This commit is contained in:
raf 2026-02-27 14:53:25 +03:00
commit ffdc13e8f5
Signed by: NotAShelf
GPG key ID: 29D95B64378DB4BF
3 changed files with 83 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

76
src/db/mod.rs
View file

@ -89,6 +89,7 @@ pub trait ClipboardDb {
out: impl Write,
preview_width: u32,
include_expired: bool,
reverse: bool,
) -> Result<usize, StashError>;
fn decode_entry(
&self,
@ -362,17 +363,27 @@ impl SqliteClipboardDb {
}
impl SqliteClipboardDb {
pub fn list_json(&self, include_expired: bool) -> Result<String, StashError> {
pub fn list_json(
&self,
include_expired: bool,
reverse: bool,
) -> Result<String, StashError> {
let order = if reverse { "ASC" } else { "DESC" };
let query = if include_expired {
"SELECT id, contents, mime FROM clipboard ORDER BY \
COALESCE(last_accessed, 0) DESC, id DESC"
format!(
"SELECT id, contents, mime FROM clipboard ORDER BY \
COALESCE(last_accessed, 0) {order}, id {order}"
)
} else {
"SELECT id, contents, mime FROM clipboard WHERE (is_expired IS NULL OR \
is_expired = 0) ORDER BY COALESCE(last_accessed, 0) DESC, id DESC"
format!(
"SELECT id, contents, mime FROM clipboard WHERE (is_expired IS NULL \
OR is_expired = 0) ORDER BY COALESCE(last_accessed, 0) {order}, id \
{order}"
)
};
let mut stmt = self
.conn
.prepare(query)
.prepare(&query)
.map_err(|e| StashError::ListDecode(e.to_string().into()))?;
let mut rows = stmt
.query([])
@ -594,17 +605,24 @@ impl ClipboardDb for SqliteClipboardDb {
mut out: impl Write,
preview_width: u32,
include_expired: bool,
reverse: bool,
) -> Result<usize, StashError> {
let order = if reverse { "ASC" } else { "DESC" };
let query = if include_expired {
"SELECT id, contents, mime FROM clipboard ORDER BY \
COALESCE(last_accessed, 0) DESC, id DESC"
format!(
"SELECT id, contents, mime FROM clipboard ORDER BY \
COALESCE(last_accessed, 0) {order}, id {order}"
)
} else {
"SELECT id, contents, mime FROM clipboard WHERE (is_expired IS NULL OR \
is_expired = 0) ORDER BY COALESCE(last_accessed, 0) DESC, id DESC"
format!(
"SELECT id, contents, mime FROM clipboard WHERE (is_expired IS NULL \
OR is_expired = 0) ORDER BY COALESCE(last_accessed, 0) {order}, id \
{order}"
)
};
let mut stmt = self
.conn
.prepare(query)
.prepare(&query)
.map_err(|e| StashError::ListDecode(e.to_string().into()))?;
let mut rows = stmt
.query([])
@ -818,38 +836,48 @@ impl SqliteClipboardDb {
limit: usize,
preview_width: u32,
search: Option<&str>,
reverse: bool,
) -> Result<Vec<(i64, String, String)>, StashError> {
let search_pattern = search.map(|s| {
let escaped = s.replace('!', "!!").replace('%', "!%").replace('_', "!_");
format!("%{escaped}%")
});
let order = if reverse { "ASC" } else { "DESC" };
let query = match (include_expired, search_pattern.as_deref()) {
(true, None) => {
"SELECT id, contents, mime FROM clipboard ORDER BY \
COALESCE(last_accessed, 0) DESC, id DESC LIMIT ?1 OFFSET ?2"
format!(
"SELECT id, contents, mime FROM clipboard ORDER BY \
COALESCE(last_accessed, 0) {order}, id {order} LIMIT ?1 OFFSET ?2"
)
},
(true, Some(_)) => {
"SELECT id, contents, mime FROM clipboard WHERE (LOWER(CAST(contents \
AS TEXT)) LIKE LOWER(?3) ESCAPE '!') ORDER BY COALESCE(last_accessed, \
0) DESC, id DESC LIMIT ?1 OFFSET ?2"
format!(
"SELECT id, contents, mime FROM clipboard WHERE \
(LOWER(CAST(contents AS TEXT)) LIKE LOWER(?3) ESCAPE '!') ORDER BY \
COALESCE(last_accessed, 0) {order}, id {order} LIMIT ?1 OFFSET ?2"
)
},
(false, None) => {
"SELECT id, contents, mime FROM clipboard WHERE (is_expired IS NULL OR \
is_expired = 0) ORDER BY COALESCE(last_accessed, 0) DESC, id DESC \
LIMIT ?1 OFFSET ?2"
format!(
"SELECT id, contents, mime FROM clipboard WHERE (is_expired IS NULL \
OR is_expired = 0) ORDER BY COALESCE(last_accessed, 0) {order}, id \
{order} LIMIT ?1 OFFSET ?2"
)
},
(false, Some(_)) => {
"SELECT id, contents, mime FROM clipboard WHERE (is_expired IS NULL OR \
is_expired = 0) AND (LOWER(CAST(contents AS TEXT)) LIKE LOWER(?3) \
ESCAPE '!') ORDER BY COALESCE(last_accessed, 0) DESC, id DESC LIMIT \
?1 OFFSET ?2"
format!(
"SELECT id, contents, mime FROM clipboard WHERE (is_expired IS NULL \
OR is_expired = 0) AND (LOWER(CAST(contents AS TEXT)) LIKE \
LOWER(?3) ESCAPE '!') ORDER BY COALESCE(last_accessed, 0) {order}, \
id {order} LIMIT ?1 OFFSET ?2"
)
},
};
let mut stmt = self
.conn
.prepare(query)
.prepare(&query)
.map_err(|e| StashError::ListDecode(e.to_string().into()))?;
let mut rows = if let Some(pattern) = search_pattern.as_deref() {