blob42/gosuki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix SyncTo from buffer to cache

Browse Source
This commit is contained in:
Chakib Ben Ziane 2018-10-28 16:58:52 +01:00
parent 6dc2deff2b
commit 0550d98ef5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
db.go
View File

@ -208,7 +208,6 @@ func (db *DB) isEmpty() (bool, error) {
func (src *DB) SyncTo(dst *DB) { func (src *DB) SyncTo(dst *DB) {
log.Debugf("syncing <%s> to <%s>", src.Name, dst.Name) log.Debugf("syncing <%s> to <%s>", src.Name, dst.Name)
var sqlite3Err sqlite3.Error var sqlite3Err sqlite3.Error
var dstTags string
var existingUrls []*SBookmark var existingUrls []*SBookmark
getSourceTable, err := src.Handle.Prepare(`SELECT * FROM bookmarks`) getSourceTable, err := src.Handle.Prepare(`SELECT * FROM bookmarks`)
@ -304,18 +303,19 @@ func (src *DB) SyncTo(dst *DB) {
// Traverse existing urls and try an update this time // Traverse existing urls and try an update this time
for _, scan := range existingUrls { for _, scan := range existingUrls {
var tags string
//log.Debugf("updating existing %s", scan.Url) //log.Debugf("updating existing %s", scan.Url)
row := getDstTags.QueryRow( row := getDstTags.QueryRow(
scan.Url, scan.Url,
) )
row.Scan(&dstTags) row.Scan(&tags)
//log.Debugf("src tags: %v", scan.tags) //log.Debugf("src tags: %v", scan.tags)
//log.Debugf("dst tags: %v", dstTags) //log.Debugf("dst tags: %v", dstTags)
srcTags := strings.Split(scan.tags, TagJoinSep) srcTags := strings.Split(scan.tags, TagJoinSep)
dstTags := strings.Split(dstTags, TagJoinSep) dstTags := strings.Split(tags, TagJoinSep)
tagMap := make(map[string]bool) tagMap := make(map[string]bool)
for _, v := range srcTags { for _, v := range srcTags {