Commit Graph

183 Commits

Author SHA1 Message Date
Edward Lee
0e889ae8fb Resolve bookmarks.js merge conflicts switching to batchSync (with trailing comma). 2009-08-31 18:04:40 -07:00
Edward Lee
5a3c53fd6a Merge weave to weave-partial-view w/ conflicts. 2009-08-31 18:03:35 -07:00
Edward Lee
678f177443 Detect dupe folders by title for now. Might need to update the hash during sync if titles are added. 2009-08-31 17:54:21 -07:00
Edward Lee
5e9d07e643 Use places utils to find an existing bookmark dupe for an incoming record. 2009-08-31 17:29:47 -07:00
Edward Lee
5468320159 Convert uses of recordLike/findLikeId to findDupe except Bookmarks is unimplemented. 2009-08-31 17:27:30 -07:00
Edward Lee
c70241b5ce Bug 512457 - Report errors before they get eaten up by runInBatchMode
Save the exception from inside runBatched and not have runInBatchMode return failure, so we can then expose the exception.
2009-08-31 16:28:00 -07:00
Edward Lee
4d055dc574 Bug 506297 - Livemarks with null site/feed uris cause sync to fail
It's possible for livemarks to not have a siteURI, so don't assume it to be there.

--HG--
extra : rebase_source : 870bb41c980834ef3e5f302739d20adfed6f7f8d
2009-08-26 14:22:11 -07:00
Edward Lee
dfe8e7e513 Don't include changes to special places Library "exclude from backup" items. 2009-08-25 16:15:05 -07:00
Edward Lee
ca002d3239 Create records with the correct parent/pred if it's still waiting for them to sync. 2009-08-24 16:17:59 -07:00
Edward Lee
c4393b5e3b Handle holes in bookmark folders and fix up bookmarks to be at an earlier position if a hole was detected. 2009-08-19 19:32:05 -07:00
Edward Lee
87f47c35a6 Attach followers for both created items and updated items (call from applyIncoming) when it's under the right parent. Share logic for attaching followers when creating a folder then fixing the reparented children and when creating/updating an item in the right parent. 2009-08-18 18:42:15 -07:00
Edward Lee
fae8b93210 Add the successor ids when adding/removing items as well as both old and new successors when moving. 2009-08-18 18:39:10 -07:00
Edward Lee
b264174b42 When updating the position of an item, move all of its followers with it. Share chain moving logic used for fixing followers on create and updating positions. 2009-08-18 18:36:31 -07:00
Edward Lee
0435aca087 For items that have the correct parent, see if there's an item following it and reposition the chain of items to after the correct parented item. A chain of followers starts at the item with the predecessor annotation and goes until the end of the folder, an item that is looking for a predecessor, or ends up at where we started (the predecessor). 2009-08-17 02:34:03 -07:00
Edward Lee
7a297f3b5f Simplify the debug output when creating bookmarks and include the parent and position. 2009-08-16 12:39:30 -07:00
Edward Lee
7c3bc745a0 Use the predecessorid to figure out where to put the item or save the predecessor as an annotation. 2009-08-16 12:39:15 -07:00
Edward Lee
96a4461af4 Set the predecessorid when creating records for upload. 2009-08-16 12:39:00 -07:00
Edward Lee
4cb51d9bde Remove the missing parent annotation after reparenting an orphan. 2009-08-15 14:43:10 -07:00
Edward Lee
306fc8507b Reparent orphans when creating the parent folder. 2009-08-15 01:07:40 -07:00
Edward Lee
7cc5c17773 Use a shared setGUID for new items and changing guids so that the item always ends up with the GUID (because conflicts shouldn't have been Weave generated). 2009-08-15 01:04:06 -07:00
Edward Lee
004fdf436d Store the parent GUID as an annotation if the item is missing a parent and share some parent lookup code. 2009-08-15 01:00:46 -07:00
Edward Lee
31270d064c Move _preprocess to before applyIncoming to share code for create/update/remove. 2009-08-15 01:00:32 -07:00
Edward Lee
cbba430108 Rename weaveId to just GUID and share a id<->guid function across store and tracker. 2009-08-15 00:59:49 -07:00
Edward Lee
fae7aaa071 Temporarily append everything and don't use sortindex for ordering within a folder. 2009-08-15 00:57:09 -07:00
Edward Lee
2335b057db Get rid of depth and sort on index instead. 2009-08-15 00:56:27 -07:00
Edward Lee
3ca750f464 Remove meta/mini records. Bye! 2009-08-13 18:50:54 -07:00
Edward Lee
39895d48b2 Put Annotations in Svc and expose a get/set Utils.anno call to use from bookmarks. 2009-08-13 17:59:26 -07:00
Edward Lee
983afb76a9 Remove unused bookmark annotations/constants. 2009-08-13 17:43:20 -07:00
Edward Lee
bc5f3d3be8 Bug 507296 - Sync bookmarks and history in batched mode. r=thunder
Wrap the original SyncEngine._sync function with a call to runInBatchMode, so SQL disk writes happen at the end of batch mode instead of on every change.
2009-07-30 11:52:26 -07:00
Edward Lee
68d361380a Bug 504230 - Use Engine's logging level for Store and Tracker
Use the log.logger.engine.* prefs to determine what the Store and Tracker should log with. This requires putting the same engine name on each Store/Tracker object, so there's some duplicate string values right now.
2009-07-14 18:34:03 -07:00
Edward Lee
5ad22f9709 Bug 479189 - weave does not sync tag smart folders properly
Create a new record type, BookmarkQuery, to handle place: uri smart bookmarks. Store what tag name the query wants and lookup the id for that tag on other machines on create/update.
2009-07-13 17:43:15 -07:00
Edward Lee
22570f2932 Bug 503938 - Tags with a single bookmark keep generating new tag ids
Share a tagging code for create/update that will tag a dummy uri temporarily while it untags the bookmark to make sure every tag has at least one child during this untag/tag process.
2009-07-13 13:40:49 -07:00
Edward Lee
6ddece8b22 Bug 502482 - error while syncing bookmarks from server
Set the item type for generic PlacesItems, but don't do anything when trying to create it.
2009-07-09 17:15:00 -07:00
Edward Lee
84c52a6411 merge weave. resolve addition of kSpecialIds to bookmarks.js near removal of Async.sugar. 2009-06-23 22:34:57 -07:00
Edward Lee
ad7d001bb3 Bug 498924 - Refactor bookmark special ids out of BookmarksStore
Lazily load places ids for a given weave id/place name pair into kSpecialIds and update all consumers. Expose a Svc.Bookmark in utils.
2009-06-17 09:28:15 -07:00
Edward Lee
3ef568c718 Cleanup/refactor followup to bug 481327.
Change _ignore to take itemId to find folderId and pull out addChanged/getItemGUID/upScore to addId.
2009-06-17 08:51:54 -07:00
Edward Lee
34400917b0 Bug 481327 - Script gets stuck during startup. r=Mardak 2009-06-17 08:51:54 -07:00
Mikhail Stepura (mishail)
fde4deb743 Bug 486042 - "Load this bookmark in the sidebar" status not synced. r=Mardak 2009-06-16 16:16:39 -07:00
Edward Lee
57adfb688b merge weave 2009-06-06 13:12:03 -07:00
Edward Lee
6bc0e717ec Clean up various engines to remove Async.sugar and random self/yields. 2009-06-05 15:34:40 -07:00
Wladimir Palant
753b7da199 Bug 495996 - Bookmark observer doesn't implement onBeforeItemRemoved method. r=Mardak 2009-06-02 21:25:55 +02:00
Edward Lee
e55cf3a52a Bug 488190 - Use record properties instead of cleartext properties
Switch pretty much all references to cleartext in modules/engines/ to just use the record. Also clean up some references to null cleartext to use deleted. The only reference to cleartext is to iterate over that hash in bookmarks.
2009-04-13 16:39:29 -05:00
Edward Lee
2c5fc6c54f Bug 488170 - Consistently set record cleartext URIs as text spec uris
Switch cleartext properties to Uri that always takes a text spec, so eventually URI refers to nsIURI. GeneratorURIs seems to have been broken either way.. makeURI of an already URI and storing of a URI into cleartext. This landed with changes to keys, so the server wipe also handles the local name changes.
2009-04-13 16:39:29 -05:00
Edward Lee
b7a138755c Bug 488142 - Make it easier to add simple deferred cleartext/payload values
Add a couple Utils helper to create a pair of simple [gs]etters that use a hash property instead. Apply this to various records: WBORecord, {Priv,Pub}Key, Crypto{Meta,Wrapper}, and every engine's type records. Migrate by making sure key data exists (name change).
2009-04-13 16:39:29 -05:00
Edward Lee
253a6ca0d8 Bug 488182 - Use an Iterator to grab both key and values from cleartext for processing bookmarks
Get rid of extra record.cleartext references within the for/each/switch -- even for unused keys like incomingSharedAnno.
2009-04-13 16:18:11 -05:00
Edward Lee
9a582a606e Bug 488165 - Correct set the record object type when processing records
Set _recordObj for Bookmarks/History engines and override PlacesItem.decrypt to switch itself to the right type after CryptoWrapper decrypts the payload.
2009-04-13 14:54:31 -05:00
Myk Melez
c699fdf732 switch from --utc to -u flag to enable UTC output for date command so it works on both Linux/Windows (which support --utc in addition to -u) and Mac OS X (which only supports -u) 2009-04-08 15:00:02 -07:00
Mikhail Stepura
e97e9389db Bug 486481 - Weird behavior when syncing the bookmark with tags
Add the remaining special top level folders and ignore them for certain behavior like getAllIDs and wipe. Have the tracker ignore changes to things in the tags folder.
2009-04-07 23:17:40 -05:00
Edward Lee
25b484a48a Bug 487363 - Share bookmark tracker ignore logic
Share the ignore logic that takes a parent folder and ignore if the engine says so or it's a livemark.
2009-04-07 22:56:04 -05:00
Edward Lee
09653caf66 Bug 487338 - Track special folder weave GUIDs <-> bookmark id mapping
Create a specialIds hash and use it to for getting weaveId/id, determine top level, if a folder is a root, getting all ids, wiping, and tracker ignoring.
2009-04-07 19:22:36 -05:00