1
- use core:: time;
2
- use std:: { fs:: File , thread:: { self , sleep} , time:: Duration } ;
1
+ use std:: fs:: File ;
3
2
4
3
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 ;
9
5
use log:: { error, info} ;
6
+ use mouse_position:: mouse_position:: Mouse ;
7
+ use rust_i18n:: t;
10
8
use simplelog:: {
11
9
ColorChoice , CombinedLogger , ConfigBuilder , LevelFilter , TermLogger , TerminalMode , WriteLogger ,
12
10
} ;
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
+ } ;
16
15
17
16
slint:: include_modules!( ) ;
18
17
19
18
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 ( ) ;
22
20
23
21
CombinedLogger :: init ( vec ! [
24
22
TermLogger :: new(
@@ -30,7 +28,7 @@ pub fn main(code: &str, from_app: &str) -> Result<(), slint::PlatformError> {
30
28
WriteLogger :: new(
31
29
LevelFilter :: Info ,
32
30
logger_config. clone( ) ,
33
- File :: create ( log_path( ) ) . unwrap( ) ,
31
+ File :: open ( log_path( ) ) . unwrap( ) ,
34
32
) ,
35
33
] )
36
34
. unwrap ( ) ;
@@ -93,17 +91,13 @@ pub fn main(code: &str, from_app: &str) -> Result<(), slint::PlatformError> {
93
91
let old_clpb_contents = get_old_clipboard_contents ( ) ;
94
92
95
93
clpb. set_text ( captcha. as_str ( ) ) . unwrap ( ) ;
96
-
97
- let paste_handle = thread:: spawn ( paste_rdev) ;
94
+ paste_script ( ) . unwrap ( ) ;
98
95
info ! ( "{}" , t!( "paste-verification-code" ) ) ;
99
- paste_handle. join ( ) . unwrap ( ) ;
100
96
if config. auto_return {
101
- let enter_handle = thread :: spawn ( enter_rdev ) ;
97
+ return_script ( ) . unwrap ( ) ;
102
98
info ! ( "{}" , t!( "press-enter" ) ) ;
103
- enter_handle. join ( ) . unwrap ( ) ;
104
99
}
105
100
if config. recover_clipboard {
106
- info ! ( "what fuck?" ) ;
107
101
recover_clipboard_contents ( old_clpb_contents) ;
108
102
}
109
103
ui. hide ( ) . unwrap ( ) ;
0 commit comments