makary/bookmarkfs
1
0
Fork 0
mirror of https://git.sr.ht/~cismonx/bookmarkfs synced 2025-06-07 19:58:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

backend_firefox: separator-aware

Browse source 
There's a special kind of bookmark in Firefox known as "separator",
which appears as vertical or horizontal bars in the browser.

BookmarkFS currently does not support managing separators, but
the backend should be aware of their existence, and must not break
when one appears.

A separator always has a NULL `title` and `fk` in `moz_bookmarks`,
so it doesn't break `bookmark_list()` and `bookmark_lookup()`,
but breaks `bookmark_check()` since it could be mistaken for a
bookmark or bookmark folder with NULL title.

Fix by checking the bookmark type in `bookmark_check_cb()`.
This commit is contained in:
CismonX 2025-02-27 23:22:09 +08:00
parent 348f13df02
commit cd648f9ef0
No known key found for this signature in database
GPG key ID: 3094873E29A482FB
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/backend_firefox.c
View file

@ -2089,9 +2089,11 @@ bookmark_do_list (
#define BOOKMARK_LIST_(col, join) \
"SELECT `b`.`id`, `b`.`position`, " col "FROM `moz_bookmarks` `b` " join \
"WHERE `b`.`parent` = ? AND `b`.`position` >= ? ORDER BY `b`.`position`"
#define BOOKMARK_LIST_NOJOIN_(col) BOOKMARK_LIST_(col ", `b`.`fk` ", )
// Type: 1 -> bookmark; 2 -> folder; 3 -> separator.
#define BOOKMARK_LIST_NOJOIN_(col) BOOKMARK_LIST_(col ", 1 - `b`.`type` ", )
#define BOOKMARK_LIST_EX_COLS_ \
"octet_length(`p`.`url`), `b`.`lastModified`, `p`.`last_visit_date`"
"ifnull(octet_length(`p`.`url`), -1), `b`.`lastModified`, " \
"`p`.`last_visit_date`"
#define BOOKMARK_LIST_EX_(col) \
BOOKMARK_LIST_(col ", " BOOKMARK_LIST_EX_COLS_ " ", \
"LEFT JOIN `moz_places` `p` ON `b`.`fk` = `p`.`id` ")
@ -2309,6 +2311,11 @@ bookmark_check_cb (
}
ctx->next = position + 1;
if (-2 == sqlite3_column_int64(stmt, 3)) {
// skip separator
return 0;
}
size_t name_len = sqlite3_column_bytes(stmt, 2);
char const *name = (char const *)sqlite3_column_text(stmt, 2);
if (unlikely(name == NULL)) {
@ -2400,15 +2407,6 @@ bookmark_list_cb (
}
entry.off = position + 1;
ssize_t len = -1;
if (SQLITE_INTEGER == sqlite3_column_type(stmt, 3)) {
len = sqlite3_column_int64(stmt, 3);
if (unlikely(len < 0)) {
goto fail;
}
}
entry.stat.value_len = len;
size_t name_len = sqlite3_column_bytes(stmt, 2);
char const *name = (char const *)sqlite3_column_text(stmt, 2);
if (unlikely(name == NULL)) {
@ -2449,6 +2447,7 @@ bookmark_list_cb (
set_name:
entry.name = name;
entry.stat.value_len = sqlite3_column_int64(stmt, 3);
if (ctx->with_stat) {
msecs_to_timespec(&entry.stat.mtime, sqlite3_column_int64(stmt, 4));
msecs_to_timespec(&entry.stat.atime, sqlite3_column_int64(stmt, 5));