mirror of
https://git.alemi.dev/memo-cli.git
synced 2024-11-22 06:34:48 +01:00
show memos with expiration date first
This commit is contained in:
parent
0feb69e7f4
commit
f44d4db3cb
1 changed files with 30 additions and 8 deletions
|
@ -53,10 +53,18 @@ pub fn open_sqlite_storage(path: &str) -> Result<SQLiteStorage, Error> {
|
|||
|
||||
impl MemoStorage for SQLiteStorage {
|
||||
fn all(&self) -> Result<Vec<Memo>, Error> {
|
||||
let mut statement = self.conn.prepare("SELECT * FROM memo ORDER BY due, id")?;
|
||||
let mut rows = statement.query([])?;
|
||||
let mut results = Vec::new();
|
||||
|
||||
/*
|
||||
* SQLite considers NULL as smallest value, so we will always get events with no due date
|
||||
* first. To circumvent this, we first query all memos with a due date, and then all
|
||||
* others. This is kinda jank but will do for now.
|
||||
*/
|
||||
|
||||
{
|
||||
let mut statement = self.conn.prepare("SELECT * FROM memo WHERE due IS NOT NULL ORDER BY due, id")?;
|
||||
let mut rows = statement.query([])?;
|
||||
|
||||
while let Some(row) = rows.next()? {
|
||||
results.push(Memo {
|
||||
id: row.get(0)?,
|
||||
|
@ -64,6 +72,20 @@ impl MemoStorage for SQLiteStorage {
|
|||
due: row.get(2)?,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
let mut statement = self.conn.prepare("SELECT * FROM memo WHERE due IS NULL ORDER BY due, id")?;
|
||||
let mut rows = statement.query([])?;
|
||||
|
||||
while let Some(row) = rows.next()? {
|
||||
results.push(Memo {
|
||||
id: row.get(0)?,
|
||||
body: row.get(1)?,
|
||||
due: row.get(2)?,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
return Ok(results);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue