Skip to content

Commit 5393095

Browse files
committed
add applescript
1 parent 93315e5 commit 5393095

File tree

5 files changed

+125
-158
lines changed

5 files changed

+125
-158
lines changed

Cargo.lock

+36-95
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "MessAuto"
3-
version = "0.8.1"
3+
version = "0.8.2"
44
edition = "2021"
55
description = "Automatic extraction of Email and SMS verification code for Mac platform."
66

@@ -27,10 +27,10 @@ mail-parser = "0.9.1"
2727
slint = { git = "https://github.com/LeeeSe/slint.git", tag = "v1.5.2" }
2828
image = "0.25.0"
2929
i-slint-backend-winit = { git = "https://github.com/LeeeSe/slint.git", tag = "v1.5.2" }
30-
rdev = "0.5.3"
3130
mouse_position = "0.1.3"
3231
async-std = "1.12.0"
3332
arboard = "3.3.2"
33+
osakit = "0.2.3"
3434

3535

3636
[build-dependencies]

src/float_window.rs

+12-18
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,22 @@
1-
use core::time;
2-
use std::{fs::File, thread::{self, sleep}, time::Duration};
1+
use std::fs::File;
32

43
use arboard::Clipboard;
5-
use i_slint_backend_winit::winit::{
6-
dpi::{LogicalPosition, Position},
7-
platform::macos::WindowBuilderExtMacOS,
8-
};
4+
use i_slint_backend_winit::winit::platform::macos::WindowBuilderExtMacOS;
95
use log::{error, info};
6+
use mouse_position::mouse_position::Mouse;
7+
use rust_i18n::t;
108
use simplelog::{
119
ColorChoice, CombinedLogger, ConfigBuilder, LevelFilter, TermLogger, TerminalMode, WriteLogger,
1210
};
13-
use mouse_position::mouse_position::Mouse;
14-
use rust_i18n::t;
15-
use MessAuto::{enter_rdev, get_old_clipboard_contents, get_sys_locale, log_path, paste_rdev, read_config, recover_clipboard_contents, sleep_key};
11+
use MessAuto::{
12+
get_old_clipboard_contents, get_sys_locale, log_path, paste_script, read_config,
13+
recover_clipboard_contents, return_script,
14+
};
1615

1716
slint::include_modules!();
1817

1918
pub fn main(code: &str, from_app: &str) -> Result<(), slint::PlatformError> {
20-
let logger_config = ConfigBuilder::new()
21-
.build();
19+
let logger_config = ConfigBuilder::new().build();
2220

2321
CombinedLogger::init(vec![
2422
TermLogger::new(
@@ -30,7 +28,7 @@ pub fn main(code: &str, from_app: &str) -> Result<(), slint::PlatformError> {
3028
WriteLogger::new(
3129
LevelFilter::Info,
3230
logger_config.clone(),
33-
File::create(log_path()).unwrap(),
31+
File::open(log_path()).unwrap(),
3432
),
3533
])
3634
.unwrap();
@@ -93,17 +91,13 @@ pub fn main(code: &str, from_app: &str) -> Result<(), slint::PlatformError> {
9391
let old_clpb_contents = get_old_clipboard_contents();
9492

9593
clpb.set_text(captcha.as_str()).unwrap();
96-
97-
let paste_handle = thread::spawn(paste_rdev);
94+
paste_script().unwrap();
9895
info!("{}", t!("paste-verification-code"));
99-
paste_handle.join().unwrap();
10096
if config.auto_return {
101-
let enter_handle = thread::spawn(enter_rdev);
97+
return_script().unwrap();
10298
info!("{}", t!("press-enter"));
103-
enter_handle.join().unwrap();
10499
}
105100
if config.recover_clipboard {
106-
info!("what fuck?");
107101
recover_clipboard_contents(old_clpb_contents);
108102
}
109103
ui.hide().unwrap();

0 commit comments

Comments
 (0)