fix(index.js,main.js): 修复由h2标题引起的offset out of bounds错误

Author: ZnPdCo

api/main.js

@@ -5,18 +5,6 @@ var client = new elasticsearch.Client({
 const express = require('express');
 const app     = express();
 
-function count(str) {
-  const regex = /<em>(.*?)<\/em>/g;
-  let len = 0;
-  let match;
-
-  while ((match = regex.exec(str)) !== null) {
-    len += match[1].length;
-  }
-
-  return len;
-}
-
 app.set('port', process.env.PORT || 8000);
 
 app.get('/status', function(req, res) {
@@ -113,16 +101,11 @@ app.get('/', function(req, res) {
     results = results.hits.hits;
     results = results.map((e) => {
       let highlight = [];
-	  if (!e.highlight || (!e.highlight.content && !e.highlight.h2)) {
-		highlight = [e._source.content.substring(0, 30)];
-	  } else if (e.highlight.content && e.highlight.h2) {
-		const contentCount = count(e.highlight.content[0]);
-		const h2Count = count(e.highlight.h2[0]);
-		
-		highlight = (contentCount >= h2Count) ? e.highlight.content : e.highlight.h2;
-	  } else {
-		highlight = e.highlight.content || e.highlight.h2;
-	  }
+      if (!e.highlight || !e.highlight.content) {
+        highlight = [e._source.content.substring(0, 50)];
+      } else {
+        highlight = e.highlight.content;
+      }
       return {
         url: e._source.url,
         title: e._source.title,

webhook/index.js

@@ -58,9 +58,9 @@ function getContent(filename, data) {
   let title = lines[0] && lines[0].match(h1reg) ?
     lines[0].replace('# ', '') : '';
   traversalArticle(data['nav'], (key, value) => {
-    if(value == filename) title = key;
+    if (value == filename) title = key;
   });
-  const h2 = lines.filter(e => e.match(h2reg)).map(e => `<h2>${e.replace(/^## /, '')}</h2>`);
+  const h2 = lines.filter(e => e.match(h2reg)).map(e => e.replace(/^## /, ''));
 
   others = others.map(e => e.replace(/^##+ /, ''));
 
@@ -76,7 +76,7 @@ function getContent(filename, data) {
 
   others.replace()
 
-  return [title, others, h2];
+  return [title, others, h2.join('\n')];
 }
 
 /**
@@ -161,12 +161,13 @@ handler.on('push', (event) => {
 });
 
 function init() {
-  exec(`bash build.sh`);
-  let modified = [];
-  const file = String(fs.readFileSync(`/home/ubuntu/OI-wiki/mkdocs.yml`));
-  const data = YAML.parse(file.replaceAll('!!python/name:', ''));
-  traversalArticle(data['nav'], (key, value) => modified.push(value));
-  updateContent(modified, []);
+  exec(`bash build.sh`, () => {
+    let modified = [];
+    const file = String(fs.readFileSync(`/home/ubuntu/OI-wiki/mkdocs.yml`));
+    const data = YAML.parse(file.replaceAll('!!python/name:', ''));
+    traversalArticle(data['nav'], (key, value) => modified.push(value));
+    updateContent(modified, []);
+  });
 }
 
 init();