Search results picker + create/update index update

models/entries.js

@@ -156,7 +156,7 @@ module.exports = {
 						// Cache to disk
 
 						if(options.cache) {
-							let cacheData = BSON.serialize(pageData, false, false, false);
+							let cacheData = BSON.serialize(_.pick(pageData, ['html', 'meta', 'tree', 'parent']), false, false, false);
 							return fs.writeFileAsync(cpath, cacheData).catch((err) => {
 								winston.error('Unable to write to cache! Performance may be affected.');
 								return true;
@@ -177,34 +177,6 @@ module.exports = {
 
 	},
 
-	/**
-	 * Fetches a text version of a Markdown-formatted document
-	 *
-	 * @param      {String}  entryPath  The entry path
-	 * @return     {String}  Text-only version
-	 */
-	fetchIndexableVersion(entryPath) {
-
-		let self = this;
-
-		return self.fetchOriginal(entryPath, {
-			parseMarkdown: false,
-			parseMeta: true,
-			parseTree: false,
-			includeMarkdown: true,
-			includeParentInfo: true,
-			cache: false
-		}).then((pageData) => {
-			return {
-				entryPath,
-				meta: pageData.meta,
-				parent: pageData.parent || {},
-				text: mark.removeMarkdown(pageData.markdown)
-			};
-		});
-
-	},
-
 	/**
 	 * Parse raw url path and make it safe
 	 *
@@ -314,13 +286,48 @@ module.exports = {
 		return fs.statAsync(fpath).then((st) => {
 			if(st.isFile()) {
 				return self.makePersistent(entryPath, contents).then(() => {
-					return self.fetchOriginal(entryPath, {});
+					return self.updateCache(entryPath);
 				});
 			} else {
 				return Promise.reject(new Error('Entry does not exist!'));
 			}
 		}).catch((err) => {
-			return Promise.reject(new Error('Entry does not exist!'));
+			winston.error(err);
+			return Promise.reject(new Error('Failed to save document.'));
+		});
+
+	},
+
+	/**
+	 * Update local cache and search index
+	 *
+	 * @param      {String}   entryPath  The entry path
+	 * @return     {Promise}  Promise of the operation
+	 */
+	updateCache(entryPath) {
+
+		let self = this;
+
+		return self.fetchOriginal(entryPath, {
+			parseMarkdown: true,
+			parseMeta: true,
+			parseTree: true,
+			includeMarkdown: true,
+			includeParentInfo: true,
+			cache: true
+		}).then((pageData) => {
+			return {
+				entryPath,
+				meta: pageData.meta,
+				parent: pageData.parent || {},
+				text: mark.removeMarkdown(pageData.markdown)
+			};
+		}).then((content) => {
+			ws.emit('searchAdd', {
+				auth: WSInternalKey,
+				content
+			});
+			return true;
 		});
 
 	},
@@ -339,7 +346,7 @@ module.exports = {
 		return self.exists(entryPath).then((docExists) => {
 			if(!docExists) {
 				return self.makePersistent(entryPath, contents).then(() => {
-					return self.fetchOriginal(entryPath, {});
+					return self.updateCache(entryPath);
 				});
 			} else {
 				return Promise.reject(new Error('Entry already exists!'));

models/git.js

@@ -195,7 +195,9 @@ module.exports = {
 			commitMsg = (isTracked) ? 'Updated ' + gitFilePath : 'Added ' + gitFilePath;
 			return self._git.add(gitFilePath);
 		}).then(() => {
-			return self._git.commit(commitMsg);
+			return self._git.commit(commitMsg).catch((err) => {
+			  if(_.includes(err.stdout, 'nothing to commit')) { return true; }
+			});
 		});
 
 	}

models/search.js

@@ -100,42 +100,62 @@ module.exports = {
 
 		let self = this;
 
-		return self._si.addAsync({
-			entryPath: content.entryPath,
-			title: content.meta.title,
-			subtitle: content.meta.subtitle || '',
-			parent: content.parent.title || '',
-			content: content.text || ''
-		}, {
-			fieldOptions: [{
-				fieldName: 'entryPath',
-				searchable: true,
-				weight: 2
-			},
-			{
-				fieldName: 'title',
-				nGramLength: [1, 2],
-				searchable: true,
-				weight: 3
-			},
-			{
-				fieldName: 'subtitle',
-				searchable: true,
-				weight: 1,
-				store: false
-			},
-			{
-				fieldName: 'subtitle',
-				searchable: false,
-			},
-			{
-				fieldName: 'content',
-				searchable: true,
-				weight: 0,
-				store: false
-			}]
+		return self._si.searchAsync({
+			query: {
+				AND: [{ 'entryPath': [content.entryPath] }]
+			}
+		}).then((results) => {
+
+			if(results.totalHits > 0) {
+				let delIds = _.map(results.hits, 'id');
+				return self._si.delAsync(delIds);
+			} else {
+				return true;
+			}
+
 		}).then(() => {
-			winston.info('Entry ' + content.entryPath + ' added to index.');
+
+			return self._si.addAsync({
+				entryPath: content.entryPath,
+				title: content.meta.title,
+				subtitle: content.meta.subtitle || '',
+				parent: content.parent.title || '',
+				content: content.text || ''
+			}, {
+				fieldOptions: [{
+					fieldName: 'entryPath',
+					searchable: true,
+					weight: 2
+				},
+				{
+					fieldName: 'title',
+					nGramLength: [1, 2],
+					searchable: true,
+					weight: 3
+				},
+				{
+					fieldName: 'subtitle',
+					searchable: true,
+					weight: 1,
+					store: false
+				},
+				{
+					fieldName: 'parent',
+					searchable: false,
+				},
+				{
+					fieldName: 'content',
+					searchable: true,
+					weight: 0,
+					store: false
+				}]
+			}).then(() => {
+				winston.info('Entry ' + content.entryPath + ' added/updated to index.');
+				return true;
+			}).catch((err) => {
+				winston.error(err);
+			});
+
 		}).catch((err) => {
 			winston.error(err);
 		});