From 204e20aa18996a5dcce8861ed78755524daa3042 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=B4=8D=E1=B4=8F=E1=B4=8F=C9=B4D4=CA=80=E1=B4=8B?= Date: Sat, 12 Jun 2021 14:54:26 +0800 Subject: [PATCH] fix: firefox can not find url in bookmarks Close #84 --- core/data/parse.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/data/parse.go b/core/data/parse.go index 86d08b9..332ea1d 100644 --- a/core/data/parse.go +++ b/core/data/parse.go @@ -57,7 +57,7 @@ var ( queryChromiumCookie = `SELECT name, encrypted_value, host_key, path, creation_utc, expires_utc, is_secure, is_httponly, has_expires, is_persistent FROM cookies` queryFirefoxHistory = `SELECT id, url, last_visit_date, title, visit_count FROM moz_places` queryFirefoxDownload = `SELECT place_id, GROUP_CONCAT(content), url, dateAdded FROM (SELECT * FROM moz_annos INNER JOIN moz_places ON moz_annos.place_id=moz_places.id) t GROUP BY place_id` - queryFirefoxBookMarks = `SELECT id, fk, type, dateAdded, title FROM moz_bookmarks` + queryFirefoxBookMarks = `SELECT id, url, type, dateAdded, title FROM (SELECT * FROM moz_bookmarks INNER JOIN moz_places ON moz_bookmarks.fk=moz_places.id)` queryFirefoxCookie = `SELECT name, value, host, path, creationTime, expiry, isSecure, isHttpOnly FROM moz_cookies` queryMetaData = `SELECT item1, item2 FROM metaData WHERE id = 'password'` queryNssPrivate = `SELECT a11, a102 from nssPrivate` @@ -146,10 +146,10 @@ func (b *bookmarks) FirefoxParse() error { } for bookmarkRows.Next() { var ( - id, fk, bType, dateAdded int64 - title string + id, bType, dateAdded int64 + title, url string ) - err = bookmarkRows.Scan(&id, &fk, &bType, &dateAdded, &title) + err = bookmarkRows.Scan(&id, &url, &bType, &dateAdded, &title) if err != nil { log.Warn(err) }