projects/booket: booket.js comparison

comparison booket.js @ 19:4a4d9527c06f

Add merge options Allow to merge loaded or imported bookmarks with the existing ones

author	Guido Berhoerster <guido+booket@berhoerster.name>
date	Thu, 02 Oct 2014 09:08:22 +0200
parents	3642bb668af1
children	b19db583b5f8

comparison

equal deleted inserted replaced

-:3642bb668af1
+:4a4d9527c06f
 this._filterTags, this._searchTerm);
 }
 };
 BookmarkModel.prototype.parseLoadedBookmarks = function (data) {
+var wasEmpty = !this._bookmarks.size;
 var parsedData;
 var bookmarks = [];
+var bookmark;
+var oldBookmark;
 try {
 parsedData = JSON.parse(data);
 } catch (e) {
 this.notify('load-file-error', e.message);
 }
 // create a temporary list of valid bookmarks
 parsedData.bookmarks.forEach(function (bookmark) {
 if (isString(bookmark.url) && bookmark.url !== '') {
-bookmarks.push(new Bookmark(bookmark.url, bookmark.title,
+bookmark = new Bookmark(bookmark.url, bookmark.title,
-bookmark.favicon, bookmark.tags, bookmark.ctime,
+bookmark.favicon, bookmark.tags, bookmark.ctime, bookmark.mtime)
-bookmark.mtime));
+oldBookmark = this.get(bookmark.url);
+if (oldBookmark === undefined ||
+oldBookmark.mtime < bookmark.mtime) {
+bookmarks.push(bookmark);
+}
 }
 }, this);
 // add each bookmark to the model ordered by the last modification time
 this.add(bookmarks.sort(function (bookmark1, bookmark2) {
 return bookmark1.ctime - bookmark2.ctime;
 }));
-this.unsavedChanges = false;
+if (wasEmpty) {
+// if there were no bookmarks before there cannot be any unsaved changes
+this.unsavedChanges = false;
+}
 };
 BookmarkModel.prototype.parseImportedBookmarks = function (data) {
+var wasEmpty = (this._bookmarks.size > 0);
 var bookmarkDoc;
 var bookmarkElements;
 var i;
 var url;
 var title;
 var favicon;
 var tags;
 var ctime;
 var mtime;
 var bookmarks = [];
+var bookmark;
+var oldBookmark;
 bookmarkDoc = document.implementation.createHTMLDocument();
 bookmarkDoc.open();
 bookmarkDoc.write(data);
 bookmarkDoc.close();
 parseInt(bookmarkElements[i].getAttribute('add_date'), 10)) ?
 ctime * 1000 : undefined;
 mtime = !isNaN(mtime =
 parseInt(bookmarkElements[i].getAttribute('last_modified'),
 10)) ?  mtime * 1000 : undefined;
-bookmarks.push(new Bookmark(url, title, favicon, tags, ctime, mtime));
+bookmark = new Bookmark(url, title, favicon, tags, ctime, mtime);
+oldBookmark = this.get(bookmark.url);
+if (oldBookmark === undefined ||
+oldBookmark.mtime < bookmark.mtime) {
+bookmarks.push(bookmark);
+}
 }
 }
 // add each bookmark to the model ordered by the last modification time
 this.add(bookmarks.sort(function (bookmark1, bookmark2) {
 return bookmark1.ctime - bookmark2.ctime;
 }));
+if (!wasEmpty) {
-this.unsavedChanges = false;
+// if there were no bookmarks before there cannot be any unsaved changes
-};
+this.unsavedChanges = false;
+}
-BookmarkModel.prototype.loadFile = function (bookmarkFile) {
+};
-// delete all existing bookmarks first
-this.delete(this._bookmarks.keys());
+BookmarkModel.prototype.loadFile = function (bookmarkFile, merge) {
-this.unsavedChanges = false;
+if (!merge) {
+// delete all existing bookmarks first
+this.delete(this._bookmarks.keys());
+this.unsavedChanges = false;
+}
 this.loadFileReader = new FileReader();
 this.loadFileReader.addEventListener('error', this);
 this.loadFileReader.addEventListener('load', this);
 this.loadFileReader.readAsText(bookmarkFile);
 };
-BookmarkModel.prototype.importFile = function (bookmarkFile) {
+BookmarkModel.prototype.importFile = function (bookmarkFile, merge) {
-// delete all existing bookmarks first
+if (!merge) {
-this.delete(this._bookmarks.keys());
+// delete all existing bookmarks first
-this.unsavedChanges = false;
+this.delete(this._bookmarks.keys());
+this.unsavedChanges = false;
+}
 this.importFileReader = new FileReader();
 this.importFileReader.addEventListener('error', this);
 this.importFileReader.addEventListener('load', this);
 this.importFileReader.readAsText(bookmarkFile);
 this.notify('save-file');
 } else if (e.target.id === 'load-form') {
 e.preventDefault();
 e.target.blur();
-this.notify('load-file', e.target.file.files[0]);
+this.notify('load-file', e.target.file.files[0],
+e.target.merge.checked);
 e.target.reset();
 } else if (e.target.id === 'import-form') {
 e.preventDefault();
 e.target.blur();
-this.notify('import-file', e.target.file.files[0]);
+this.notify('import-file', e.target.file.files[0],
+e.target.merge.checked);
 e.target.reset();
 } else if (e.target.id === 'export-form') {
 e.preventDefault();
 e.target.blur();
 hashData.set('tags', newFilterTags.values().join(','));
 hashData.set('search', newSearchTerm);
 history.pushState(null, null, serializeHash(url, hashData));
 };
-BooketController.prototype.onLoadFile = function (bookmarkFile) {
+BooketController.prototype.onLoadFile = function (bookmarkFile, merge) {
 if (this.bookmarkModel.unsavedChanges) {
 if (!this.actionsView.confirmLoadFile()) {
 return;
 }
 this.bookmarkModel.unsavedChanges = false;
 }
-this.bookmarkModel.loadFile(bookmarkFile);
+this.bookmarkModel.loadFile(bookmarkFile, merge);
 };
-BooketController.prototype.onImportFile = function (bookmarkFile) {
+BooketController.prototype.onImportFile = function (bookmarkFile, merge) {
 if (this.bookmarkModel.unsavedChanges) {
 if (!this.actionsView.confirmLoadFile()) {
 return;
 }
 this.bookmarkModel.unsavedChanges = false;
 }
-this.bookmarkModel.importFile(bookmarkFile);
+this.bookmarkModel.importFile(bookmarkFile, merge);
 };
 BooketController.prototype.onEditBookmark = function (bookmarkUrl) {
 this.bookmarkView.displayBookmarkEditor(
 this.bookmarkModel.get(bookmarkUrl));