Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
Clash Verge
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
many-archive
Clash Verge
Commits
0cf3bba1
There was an error fetching the commit references. Please try again later.
Unverified
Commit
0cf3bba1
authored
1 year ago
by
GyDi
Committed by
GitHub
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
feat: more trace logs
parent
2c48ea35
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src-tauri/src/utils/help.rs
+9
-0
9 additions, 0 deletions
src-tauri/src/utils/help.rs
src-tauri/src/utils/resolve.rs
+19
-10
19 additions, 10 deletions
src-tauri/src/utils/resolve.rs
with
28 additions
and
10 deletions
src-tauri/src/utils/help.rs
+
9
−
0
View file @
0cf3bba1
...
...
@@ -119,6 +119,15 @@ macro_rules! log_err {
};
}
#[macro_export]
macro_rules!
trace_err
{
(
$result
:
expr
,
$err_str
:
expr
)
=>
{
if
let
Err
(
err
)
=
$result
{
log
::
trace!
(
target
:
"app"
,
"{}, err {}"
,
$err_str
,
err
);
}
}
}
/// wrap the anyhow error
/// transform the error to String
#[macro_export]
...
...
This diff is collapsed.
Click to expand it.
src-tauri/src/utils/resolve.rs
+
19
−
10
View file @
0cf3bba1
use
crate
::
log_err
;
use
crate
::{
config
::
Config
,
core
::
*
,
utils
::
init
,
utils
::
server
};
use
crate
::{
log_err
,
trace_err
};
use
anyhow
::
Result
;
use
tauri
::{
App
,
AppHandle
,
Manager
};
...
...
@@ -13,12 +13,17 @@ pub fn resolve_setup(app: &mut App) {
log_err!
(
init
::
init_resources
(
app
.package_info
()));
// 启动核心
log
::
trace!
(
"init config"
);
log_err!
(
Config
::
init_config
());
log
::
trace!
(
"launch core"
);
log_err!
(
CoreManager
::
global
()
.init
());
// setup a simple http server for singleton
log
::
trace!
(
"launch embed server"
);
server
::
embed_server
(
app
.app_handle
());
log
::
trace!
(
"init system tray"
);
log_err!
(
tray
::
Tray
::
update_systray
(
&
app
.app_handle
()));
let
silent_start
=
{
Config
::
verge
()
.data
()
.enable_silent_start
.clone
()
};
...
...
@@ -43,9 +48,9 @@ pub fn resolve_reset() {
/// create main window
pub
fn
create_window
(
app_handle
:
&
AppHandle
)
{
if
let
Some
(
window
)
=
app_handle
.get_window
(
"main"
)
{
let
_
=
window
.unminimize
();
let
_
=
window
.show
();
let
_
=
window
.set_focus
();
trace_err!
(
window
.unminimize
()
,
"set win unminimize"
)
;
trace_err!
(
window
.show
()
,
"set win visible"
)
;
trace_err!
(
window
.set_focus
()
,
"set win focus"
)
;
return
;
}
...
...
@@ -95,6 +100,7 @@ pub fn create_window(app_handle: &AppHandle) {
.build
()
{
Ok
(
win
)
=>
{
log
::
trace!
(
"try to calculate the monitor size"
);
let
center
=
(||
->
Result
<
bool
>
{
let
mut
center
=
false
;
let
monitor
=
win
.current_monitor
()
?
.ok_or
(
anyhow
::
anyhow!
(
""
))
?
;
...
...
@@ -112,9 +118,10 @@ pub fn create_window(app_handle: &AppHandle) {
})();
if
center
.unwrap_or
(
true
)
{
let
_
=
win
.center
(
);
trace_err!
(
win
.center
(),
"set win center"
);
}
log
::
trace!
(
"try to create window"
);
let
app_handle
=
app_handle
.clone
();
// 加点延迟避免界面闪一下
...
...
@@ -122,14 +129,16 @@ pub fn create_window(app_handle: &AppHandle) {
sleep
(
Duration
::
from_millis
(
888
))
.await
;
if
let
Some
(
window
)
=
app_handle
.get_window
(
"main"
)
{
let
_
=
set_shadow
(
&
window
,
true
);
let
_
=
window
.show
();
let
_
=
window
.unminimize
();
let
_
=
window
.set_focus
();
trace_err!
(
set_shadow
(
&
window
,
true
),
"set win shadow"
);
trace_err!
(
window
.show
(),
"set win visible"
);
trace_err!
(
window
.unminimize
(),
"set win unminimize"
);
trace_err!
(
window
.set_focus
(),
"set win focus"
);
}
else
{
log
::
error!
(
target
:
"app"
,
"failed to create window, get_window is None"
)
}
});
}
Err
(
err
)
=>
log
::
error!
(
target
:
"app"
,
"create window, {err}"
),
Err
(
err
)
=>
log
::
error!
(
target
:
"app"
,
"
failed to
create window, {err}"
),
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment