[Marble-devel] Review Request 112872: Bookmark synchronization with ownCloud

[Utku Aydın]

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
http://git.reviewboard.kde.org/r/112872/
-----------------------------------------------------------

(Updated Oct. 30, 2013, 9:05 p.m.)


Status
------

This change has been marked as submitted.


Review request for Marble.


Repository: marble


Description
-------

"cloudsync-bookmarks" branch on GitHub: https://github.com/utkuaydin/marble/commits/cloudsync-bookmarks

Adds bookmark synchronization with ownCloud.
- Does a three way merge. http://en.wikipedia.org/wiki/Merge_(revision_control)#Three-way_merge
- Synchronization starts automatically when Marble is started, when local bookmarks are modified and every hour.
- Conflict resolution is included.

What's missing? (Must be included before merging to master):
- Conflict dialog which happens when there is no common ancestor.
- Initial synchronization with a newly installed of instance ownCloud and Marble app.
- Unit test for diff and merge.

I have to leave home for school on Sept. 22nd so unfortunately I might not be around for implementing those soon. Apologies.


Diffs
-----

  src/ControlView.h 0f3274e 
  src/ControlView.cpp 237ae12 
  src/QtMainWindow.h 80ae250 
  src/QtMainWindow.cpp 4f70250 
  src/lib/CMakeLists.txt 4f2eee1 
  src/lib/MarbleCloudSyncSettingsWidget.ui 8c8bc9a 
  src/lib/QtMarbleConfigDialog.h 97e972e 
  src/lib/QtMarbleConfigDialog.cpp 1cb7e3b 
  src/lib/cloudsync/BookmarkSyncManager.h PRE-CREATION 
  src/lib/cloudsync/BookmarkSyncManager.cpp PRE-CREATION 
  src/lib/cloudsync/CloudSyncManager.h e6e850b 
  src/lib/cloudsync/CloudSyncManager.cpp 6c90b0d 
  src/lib/cloudsync/ConflictDialog.h PRE-CREATION 
  src/lib/cloudsync/ConflictDialog.cpp PRE-CREATION 
  src/lib/cloudsync/MergeItem.h PRE-CREATION 
  src/lib/cloudsync/MergeItem.cpp PRE-CREATION 
  src/lib/cloudsync/OwncloudSyncBackend.h e8560cd 
  src/lib/cloudsync/OwncloudSyncBackend.cpp c7b291b 
  src/lib/cloudsync/RouteSyncManager.cpp 5399210 
  src/marble_part.h a53602e 
  src/marble_part.cpp b032a8b 
  src/plugins/declarative/CloudSync.h 3de04e4 
  src/plugins/declarative/CloudSync.cpp ccd0e25 
  src/plugins/declarative/MarbleDeclarativePlugin.cpp 959063b 

Diff: http://git.reviewboard.kde.org/r/112872/diff/


Testing
-------

I manually tested synchronizing with ownCloud application. I intentionally created conflicts by...
- Renaming the same placemark on both cloud and local
- Deleting one from cloud and renaming the same bookmark locally


Thanks,

Utku Aydın

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/marble-devel/attachments/20131030/747b0b83/attachment-0001.html>