Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion benches/search.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
use criterion::{criterion_group, criterion_main, Criterion};
use eframe::egui;
use multi_launcher::{actions::Action, gui::LauncherApp, plugin::PluginManager, settings::Settings};
use multi_launcher::{
actions::Action, gui::LauncherApp, plugin::PluginManager, settings::Settings,
};
use std::sync::Arc;

fn bench_search(c: &mut Criterion) {
Expand Down
11 changes: 5 additions & 6 deletions src/actions/calc.rs
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
use arboard::Clipboard;

pub fn copy_history_result(index: usize) -> anyhow::Result<()> {
if let Some(entry) = crate::plugins::calc_history::load_history(
crate::plugins::calc_history::CALC_HISTORY_FILE,
)
.unwrap_or_default()
.get(index)
.cloned()
if let Some(entry) =
crate::plugins::calc_history::load_history(crate::plugins::calc_history::CALC_HISTORY_FILE)
.unwrap_or_default()
.get(index)
.cloned()
{
let mut cb = Clipboard::new()?;
cb.set_text(entry.result)?;
Expand Down
15 changes: 6 additions & 9 deletions src/actions/clipboard.rs
Original file line number Diff line number Diff line change
@@ -1,19 +1,16 @@
use arboard::Clipboard;

pub fn clear_history() -> anyhow::Result<()> {
crate::plugins::clipboard::clear_history_file(
crate::plugins::clipboard::CLIPBOARD_FILE,
)?;
crate::plugins::clipboard::clear_history_file(crate::plugins::clipboard::CLIPBOARD_FILE)?;
Ok(())
}

pub fn copy_entry(i: usize) -> anyhow::Result<()> {
if let Some(entry) = crate::plugins::clipboard::load_history(
crate::plugins::clipboard::CLIPBOARD_FILE,
)
.unwrap_or_default()
.get(i)
.cloned()
if let Some(entry) =
crate::plugins::clipboard::load_history(crate::plugins::clipboard::CLIPBOARD_FILE)
.unwrap_or_default()
.get(i)
.cloned()
{
let mut cb = Clipboard::new()?;
cb.set_text(entry)?;
Expand Down
12 changes: 2 additions & 10 deletions src/actions/fav.rs
Original file line number Diff line number Diff line change
@@ -1,17 +1,9 @@
pub fn add(label: &str, action: &str, args: Option<&str>) -> anyhow::Result<()> {
crate::plugins::fav::set_fav(
crate::plugins::fav::FAV_FILE,
label,
action,
args,
)?;
crate::plugins::fav::set_fav(crate::plugins::fav::FAV_FILE, label, action, args)?;
Ok(())
}

pub fn remove(label: &str) -> anyhow::Result<()> {
crate::plugins::fav::remove_fav(
crate::plugins::fav::FAV_FILE,
label,
)?;
crate::plugins::fav::remove_fav(crate::plugins::fav::FAV_FILE, label)?;
Ok(())
}
10 changes: 2 additions & 8 deletions src/actions/folders.rs
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
pub fn add(path: &str) -> anyhow::Result<()> {
crate::plugins::folders::append_folder(
crate::plugins::folders::FOLDERS_FILE,
path,
)?;
crate::plugins::folders::append_folder(crate::plugins::folders::FOLDERS_FILE, path)?;
Ok(())
}

pub fn remove(path: &str) -> anyhow::Result<()> {
crate::plugins::folders::remove_folder(
crate::plugins::folders::FOLDERS_FILE,
path,
)?;
crate::plugins::folders::remove_folder(crate::plugins::folders::FOLDERS_FILE, path)?;
Ok(())
}
1 change: 0 additions & 1 deletion src/actions/history.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

pub fn clear() -> anyhow::Result<()> {
crate::history::clear_history()?;
Ok(())
Expand Down
22 changes: 11 additions & 11 deletions src/actions/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,19 @@ pub fn save_actions(path: &str, actions: &[Action]) -> anyhow::Result<()> {
Ok(())
}

pub mod clipboard;
pub mod timer;
pub mod stopwatch;
pub mod shell;
pub mod bookmarks;
pub mod calc;
pub mod clipboard;
pub mod exec;
pub mod fav;
pub mod folders;
pub mod history;
pub mod todo;
pub mod snippets;
pub mod tempfiles;
pub mod media;
pub mod system;
pub mod exec;
pub mod fav;
pub mod screenshot;
pub mod calc;
pub mod shell;
pub mod snippets;
pub mod stopwatch;
pub mod system;
pub mod tempfiles;
pub mod timer;
pub mod todo;
8 changes: 4 additions & 4 deletions src/actions/screenshot.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,10 @@ pub fn capture_raw(mode: Mode) -> anyhow::Result<image::RgbaImage> {

// Wait for the snipping tool to provide a new clipboard image
let mut cb = arboard::Clipboard::new()?;
let old = cb.get_image().ok().map(|img| {
(img.width, img.height, img.bytes.into_owned())
});
let old = cb
.get_image()
.ok()
.map(|img| (img.width, img.height, img.bytes.into_owned()));

let _ = Command::new("explorer").arg("ms-screenclip:").status();

Expand Down Expand Up @@ -101,4 +102,3 @@ pub fn capture(mode: Mode, clipboard: bool) -> anyhow::Result<PathBuf> {
}
Ok(path)
}

11 changes: 2 additions & 9 deletions src/actions/snippets.rs
Original file line number Diff line number Diff line change
@@ -1,16 +1,9 @@
pub fn remove(alias: &str) -> anyhow::Result<()> {
crate::plugins::snippets::remove_snippet(
crate::plugins::snippets::SNIPPETS_FILE,
alias,
)?;
crate::plugins::snippets::remove_snippet(crate::plugins::snippets::SNIPPETS_FILE, alias)?;
Ok(())
}

pub fn add(alias: &str, text: &str) -> anyhow::Result<()> {
crate::plugins::snippets::append_snippet(
crate::plugins::snippets::SNIPPETS_FILE,
alias,
text,
)?;
crate::plugins::snippets::append_snippet(crate::plugins::snippets::SNIPPETS_FILE, alias, text)?;
Ok(())
}
Loading