Add bookmarks internal page
This commit is contained in:
@@ -0,0 +1,64 @@
|
||||
use std::time::SystemTime;
|
||||
|
||||
use ely_domain::{BookmarkEntry, BookmarkId, UrlText};
|
||||
|
||||
use crate::CoreError;
|
||||
|
||||
use super::BrowserCore;
|
||||
|
||||
impl BrowserCore {
|
||||
pub fn bookmark_active_tab(&mut self) -> Result<BookmarkId, CoreError> {
|
||||
let active_tab = self.active_tab()?.clone();
|
||||
if let Some(bookmark) = self.bookmarks.iter().find(|bookmark| {
|
||||
bookmark.profile_id() == active_tab.profile_id()
|
||||
&& bookmark.space_id() == active_tab.space_id()
|
||||
&& bookmark.url() == active_tab.url()
|
||||
}) {
|
||||
return Ok(bookmark.id().clone());
|
||||
}
|
||||
|
||||
let collection_name = self.active_space()?.name().to_string();
|
||||
let bookmark = BookmarkEntry::new(
|
||||
active_tab.profile_id().clone(),
|
||||
active_tab.space_id().clone(),
|
||||
collection_name,
|
||||
active_tab.title(),
|
||||
active_tab.url().clone(),
|
||||
SystemTime::now(),
|
||||
)?;
|
||||
let bookmark_id = bookmark.id().clone();
|
||||
self.bookmarks.push(bookmark);
|
||||
Ok(bookmark_id)
|
||||
}
|
||||
|
||||
pub(super) fn find_bookmark_match(&self, query: &str) -> Option<UrlText> {
|
||||
let normalized_query = query.trim().to_lowercase();
|
||||
if normalized_query.is_empty() {
|
||||
return None;
|
||||
}
|
||||
|
||||
self.bookmarks
|
||||
.iter()
|
||||
.rev()
|
||||
.filter(|bookmark| bookmark.profile_id() == &self.active_profile_id)
|
||||
.find(|bookmark| bookmark_matches_query(bookmark, &normalized_query))
|
||||
.map(|bookmark| bookmark.url().clone())
|
||||
}
|
||||
|
||||
pub(super) fn visible_bookmarks(&self) -> Vec<BookmarkEntry> {
|
||||
self.bookmarks
|
||||
.iter()
|
||||
.filter(|bookmark| bookmark.profile_id() == &self.active_profile_id)
|
||||
.cloned()
|
||||
.collect()
|
||||
}
|
||||
}
|
||||
|
||||
fn bookmark_matches_query(bookmark: &BookmarkEntry, normalized_query: &str) -> bool {
|
||||
bookmark.title().to_lowercase().contains(normalized_query)
|
||||
|| bookmark.url().as_str().to_lowercase().contains(normalized_query)
|
||||
|| bookmark.display_url().to_lowercase().contains(normalized_query)
|
||||
|| bookmark.collection_name().to_lowercase().contains(normalized_query)
|
||||
|| bookmark.tags().iter().any(|tag| tag.to_lowercase().contains(normalized_query))
|
||||
|| bookmark.note().is_some_and(|note| note.to_lowercase().contains(normalized_query))
|
||||
}
|
||||
@@ -3,8 +3,8 @@ use ely_domain::{CommandIntent, CommandScope, ProfileId, ProfileKind, SpaceId};
|
||||
use crate::{
|
||||
CoreError,
|
||||
navigation::{
|
||||
about_url, downloads_url, history_url, move_tab_space_name, new_profile_name,
|
||||
new_space_name, search_url, settings_page_url, settings_url, space_icon,
|
||||
about_url, bookmarks_url, downloads_url, history_url, move_tab_space_name,
|
||||
new_profile_name, new_space_name, search_url, settings_page_url, settings_url, space_icon,
|
||||
switch_profile_name, sync_status_url,
|
||||
},
|
||||
};
|
||||
@@ -51,6 +51,12 @@ impl BrowserCore {
|
||||
self.command_query.clear();
|
||||
}
|
||||
}
|
||||
CommandIntent::ScopedSearch { scope: CommandScope::Bookmarks, query } => {
|
||||
if let Some(url) = self.find_bookmark_match(query) {
|
||||
self.open_tab(url);
|
||||
self.command_query.clear();
|
||||
}
|
||||
}
|
||||
CommandIntent::ScopedSearch { scope: CommandScope::Settings, query } => {
|
||||
if let Some(url) = settings_page_url(query)? {
|
||||
self.open_tab(url);
|
||||
@@ -102,6 +108,10 @@ impl BrowserCore {
|
||||
self.open_tab(downloads_url()?);
|
||||
Ok(true)
|
||||
}
|
||||
"bookmarks" | "open-bookmarks" | "open bookmarks" => {
|
||||
self.open_tab(bookmarks_url()?);
|
||||
Ok(true)
|
||||
}
|
||||
"history" | "open-history" | "open history" => {
|
||||
self.open_tab(history_url()?);
|
||||
Ok(true)
|
||||
@@ -126,6 +136,10 @@ impl BrowserCore {
|
||||
self.toggle_active_tab_favorite()?;
|
||||
Ok(true)
|
||||
}
|
||||
"bookmark" | "add-bookmark" | "add bookmark" => {
|
||||
self.bookmark_active_tab()?;
|
||||
Ok(true)
|
||||
}
|
||||
"pin" | "pin-tab" | "toggle-pin" => {
|
||||
self.toggle_active_tab_pinned()?;
|
||||
Ok(true)
|
||||
|
||||
@@ -15,6 +15,11 @@ impl BrowserCore {
|
||||
self.tabs.len(),
|
||||
SyncObjectState::LocalOnly,
|
||||
),
|
||||
SyncObjectStatus::new(
|
||||
SyncObjectKind::Bookmarks,
|
||||
self.bookmarks.len(),
|
||||
SyncObjectState::LocalOnly,
|
||||
),
|
||||
SyncObjectStatus::new(
|
||||
SyncObjectKind::Profiles,
|
||||
self.profiles.len(),
|
||||
|
||||
Reference in New Issue
Block a user