root/clash-verge-rev
1
0
Fork 0
mirror of https://github.com/clash-verge-rev/clash-verge-rev.git synced 2026-01-29 08:45:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: duplicate checked tray menu when profile name are same (#2660)

Browse Source
This commit is contained in:
Tunglies
2025-02-08 09:36:04 +08:00
committed by GitHub
parent bb0b6c3f77
commit 37e5c22a5a
4 changed files with 39 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src-tauri/src/config/profiles.rs
View File

@@ -465,48 +465,21 @@ impl IProfiles {
}
}
/// 获取current指向的profile名称
pub fn current_profile_name(&self) -> Option<String> {
match (self.current.as_ref(), self.items.as_ref()) {
(Some(current), Some(items)) => {
if let Some(item) = items.iter().find(|e| e.uid.as_ref() == Some(current)) {
return item.name.clone();
}
None
}
_ => None,
}
}
/// 判断profile是否是current指向的
pub fn is_current_profile(&self, profile_name: &str) -> bool {
match self.current_profile_name() {
Some(current_profile_name) => current_profile_name == profile_name,
None => false,
}
pub fn is_current_profile_index(&self, index: String) -> bool {
self.current == Some(index)
}
/// 根据profile名称获取uid
pub fn get_profile_uid(&self, profile_name: &str) -> Option<String> {
/// 获取所有的profiles(uid，名称)
pub fn all_profile_uid_and_name(&self) -> Option<Vec<(String, String)>> {
match self.items.as_ref() {
Some(items) => {
for item in items.iter() {
if item.name.as_ref() == Some(&profile_name.to_string()) {
return item.uid.clone();
}
Some(items) => Some(items.iter().filter_map(|e| {
if let (Some(uid), Some(name)) = (e.uid.clone(), e.name.clone()) {
Some((uid, name))
} else {
None
}
None
}
None => None,
}
}
/// 获取所有的profiles称
pub fn all_profile_names(&self) -> Option<Vec<String>> {
log::info!(target: "app", "{:?}", self.get_items());
match self.items.as_ref() {
Some(items) => Some(items.iter().filter_map(|e| e.name.clone()).collect()),
}).collect()),
None => None,
}
}