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: prevent usize underflow when navigating empty entry list

Browse source 
Signed-off-by: NotAShelf <raf@notashelf.dev>
Change-Id: I0432dcc88b22226772f6bb6e05cc64d36a6a6964
This commit is contained in:
raf 2026-01-22 13:28:43 +03:00
commit 3165543580
Signed by: NotAShelf
GPG key ID: 29D95B64378DB4BF
1 changed files with 85 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/commands/list.rs
View file

@ -251,6 +251,9 @@ impl SqliteClipboardDb {
match (key.code, key.modifiers) { match (key.code, key.modifiers) {
(KeyCode::Char('q') | KeyCode::Esc, _) => break, (KeyCode::Char('q') | KeyCode::Esc, _) => break,
(KeyCode::Down | KeyCode::Char('j'), _) => { (KeyCode::Down | KeyCode::Char('j'), _) => {
if entries.is_empty() {
state.select(None);
} else {
let i = match state.selected() { let i = match state.selected() {
Some(i) => { Some(i) => {
if i >= entries.len() - 1 { if i >= entries.len() - 1 {
@ -262,8 +265,12 @@ impl SqliteClipboardDb {
None => 0, None => 0,
}; };
state.select(Some(i)); state.select(Some(i));
}
}, },
(KeyCode::Up | KeyCode::Char('k'), _) => { (KeyCode::Up | KeyCode::Char('k'), _) => {
if entries.is_empty() {
state.select(None);
} else {
let i = match state.selected() { let i = match state.selected() {
Some(i) => { Some(i) => {
if i == 0 { if i == 0 {
@ -275,10 +282,12 @@ impl SqliteClipboardDb {
None => 0, None => 0,
}; };
state.select(Some(i)); state.select(Some(i));
}
}, },
(KeyCode::Enter, _) => { (KeyCode::Enter, _) => {
if let Some(idx) = state.selected() if let Some(idx) = state.selected()
&& let Some((id, ..)) = entries.get(idx) { && let Some((id, ..)) = entries.get(idx)
{
match self.copy_entry(*id) { match self.copy_entry(*id) {
Ok((new_id, contents, mime)) => { Ok((new_id, contents, mime)) => {
if new_id != *id { if new_id != *id {
@ -291,15 +300,11 @@ impl SqliteClipboardDb {
let opts = Options::new(); let opts = Options::new();
let mime_type = match mime { let mime_type = match mime {
Some(ref m) if m == "text/plain" => MimeType::Text, Some(ref m) if m == "text/plain" => MimeType::Text,
Some(ref m) => { Some(ref m) => MimeType::Specific(m.clone().to_owned()),
MimeType::Specific(m.clone().to_owned())
},
None => MimeType::Text, None => MimeType::Text,
}; };
let copy_result = opts.copy( let copy_result = opts
Source::Bytes(contents.clone().into()), .copy(Source::Bytes(contents.clone().into()), mime_type);
mime_type,
);
match copy_result { match copy_result {
Ok(()) => { Ok(()) => {
let _ = Notification::new() let _ = Notification::new()
@ -308,14 +313,10 @@ impl SqliteClipboardDb {
.show(); .show();
}, },
Err(e) => { Err(e) => {
log::error!( log::error!("Failed to copy entry to clipboard: {e}");
"Failed to copy entry to clipboard: {e}"
);
let _ = Notification::new() let _ = Notification::new()
.summary("Stash") .summary("Stash")
.body(&format!( .body(&format!("Failed to copy to clipboard: {e}"))
"Failed to copy to clipboard: {e}"
))
.show(); .show();
}, },
} }
@ -332,7 +333,8 @@ impl SqliteClipboardDb {
}, },
(KeyCode::Char('D'), KeyModifiers::SHIFT) => { (KeyCode::Char('D'), KeyModifiers::SHIFT) => {
if let Some(idx) = state.selected() if let Some(idx) = state.selected()
&& let Some((id, ..)) = entries.get(idx) { && let Some((id, ..)) = entries.get(idx)
{
// Delete entry from DB // Delete entry from DB
self self
.conn .conn