nodebb-plugin-dbsearch 5.0.3 → 5.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (11) hide show
  1. package/.eslintrc +1 -137
  2. package/lib/dbsearch.js +530 -516
  3. package/lib/mongo.js +114 -115
  4. package/lib/postgres.js +111 -111
  5. package/lib/redis.js +52 -52
  6. package/package.json +5 -5
  7. package/plugin.json +2 -5
  8. package/public/.eslintrc +3 -0
  9. package/{lib → public}/admin.js +120 -124
  10. package/{public/templates → templates}/admin/plugins/dbsearch.tpl +0 -0
  11. package/upgrades/dbsearch_change_mongodb_schema.js +11 -32
package/{lib → public}/admin.js RENAMED
@@ -1,124 +1,120 @@
1
- 'use strict';
2
-
3
- /* globals $, window, app, define, socket, config, ajaxify, bootbox */
4
-
5
- define('admin/plugins/dbsearch', [], function () {
6
- var dbsearch = {};
7
- var intervalId = 0;
8
-
9
- $(window).on('action:ajaxify.end', function (ev, data) {
10
- if (data.url === 'admin/plugins/dbsearch' && ajaxify.data.working) {
11
- startProgress();
12
- } else {
13
- clearProgress();
14
- }
15
- });
16
-
17
- dbsearch.init = function () {
18
- $('#save').on('click', function () {
19
- $.post(config.relative_path + '/api/admin/plugins/dbsearch/save', {
20
- _csrf: $('#csrf_token').val(),
21
- topicLimit: $('#topicLimit').val(),
22
- postLimit: $('#postLimit').val(),
23
- excludeCategories: $('#exclude-categories').val(),
24
- }, function (data) {
25
- if (typeof data === 'string') {
26
- app.alertSuccess('Settings saved');
27
- }
28
- });
29
-
30
- return false;
31
- });
32
-
33
- $('#reindex').on('click', function () {
34
- bootbox.confirm('Are you sure you want to reindex all content? This might take a while depending on the amount of content. During the operation the forum might slow down.', function (confirm) {
35
- if (!confirm) {
36
- return;
37
- }
38
- socket.emit('admin.plugins.dbsearch.reindex', function (err) {
39
- if (err) {
40
- app.alertError(err.message);
41
- return clearProgress();
42
- }
43
- app.alertSuccess('Started indexing content! This might take a while. You can check the progress on this page.');
44
- startProgress();
45
- });
46
- });
47
-
48
- return false;
49
- });
50
-
51
- $('#clear-index').on('click', function () {
52
- bootbox.confirm('Are you sure you want to clear all indices? This might take a while depending on the amount of content. During the operation the forum might slow down.', function (confirm) {
53
- if (!confirm) {
54
- return;
55
- }
56
- socket.emit('admin.plugins.dbsearch.clearIndex', function (err) {
57
- if (err) {
58
- app.alertError(err.message);
59
- return clearProgress();
60
- }
61
- app.alertSuccess('Started clearing index! This might take a while. You can check the progress on this page.');
62
- startProgress();
63
- });
64
- });
65
- return false;
66
- });
67
-
68
- $('#changeLanguage').on('click', function () {
69
- var lang = $('#indexLanguage').val();
70
- app.alertSuccess('Changing index language to "' + lang + '".');
71
- socket.emit('admin.plugins.dbsearch.changeLanguage', lang, function (err) {
72
- if (err) {
73
- return app.alertError(err.message);
74
- }
75
- app.alertSuccess('Search index language changed!');
76
- });
77
- });
78
- };
79
-
80
- function startProgress() {
81
- clearProgress();
82
- checkProgress();
83
-
84
- intervalId = setInterval(checkProgress, 750);
85
- }
86
-
87
- function clearProgress() {
88
- if (intervalId) {
89
- clearInterval(intervalId);
90
- intervalId = 0;
91
- }
92
- }
93
-
94
- function checkProgress() {
95
- socket.emit('admin.plugins.dbsearch.checkProgress', function (err, progress) {
96
- if (err) {
97
- clearProgress();
98
- return app.alertError(err.message);
99
- }
100
-
101
- var working = parseInt(progress.working, 10);
102
- if (!working) {
103
- clearInterval(intervalId);
104
- $('#reindex').removeAttr('disabled');
105
- } else {
106
- $('#reindex').attr('disabled', true);
107
- }
108
-
109
- $('#work-in-progress').toggleClass('hidden', !working);
110
-
111
- if (progress.topicsPercent >= 100 && progress.postsPercent >= 100) {
112
- progress.topicsPercent = 100;
113
- progress.postsPercent = 100;
114
- }
115
-
116
- $('#topics-indexed').text(progress.topicsIndexed);
117
- $('#posts-indexed').text(progress.postsIndexed);
118
- $('.topic-progress').css('width', progress.topicsPercent + '%').text(progress.topicsPercent + '%');
119
- $('.post-progress').css('width', progress.postsPercent + '%').text(progress.postsPercent + '%');
120
- });
121
- }
122
-
123
- return dbsearch;
124
- });
1
+ 'use strict';
2
+
3
+ define('admin/plugins/dbsearch', ['alerts'], function (alerts) {
4
+ var dbsearch = {};
5
+ var intervalId = 0;
6
+
7
+ $(window).on('action:ajaxify.end', function (ev, data) {
8
+ if (data.url === 'admin/plugins/dbsearch' && ajaxify.data.working) {
9
+ startProgress();
10
+ } else {
11
+ clearProgress();
12
+ }
13
+ });
14
+
15
+ dbsearch.init = function () {
16
+ $('#save').on('click', function () {
17
+ $.post(config.relative_path + '/api/admin/plugins/dbsearch/save', {
18
+ _csrf: $('#csrf_token').val(),
19
+ topicLimit: $('#topicLimit').val(),
20
+ postLimit: $('#postLimit').val(),
21
+ excludeCategories: $('#exclude-categories').val(),
22
+ }, function (data) {
23
+ if (typeof data === 'string') {
24
+ alerts.success('Settings saved');
25
+ }
26
+ });
27
+
28
+ return false;
29
+ });
30
+
31
+ $('#reindex').on('click', function () {
32
+ bootbox.confirm('Are you sure you want to reindex all content? This might take a while depending on the amount of content. During the operation the forum might slow down.', function (confirm) {
33
+ if (!confirm) {
34
+ return;
35
+ }
36
+ socket.emit('admin.plugins.dbsearch.reindex', function (err) {
37
+ if (err) {
38
+ alerts.error(err);
39
+ return clearProgress();
40
+ }
41
+ alerts.success('Started indexing content! This might take a while. You can check the progress on this page.');
42
+ startProgress();
43
+ });
44
+ });
45
+
46
+ return false;
47
+ });
48
+
49
+ $('#clear-index').on('click', function () {
50
+ bootbox.confirm('Are you sure you want to clear all indices? This might take a while depending on the amount of content. During the operation the forum might slow down.', function (confirm) {
51
+ if (!confirm) {
52
+ return;
53
+ }
54
+ socket.emit('admin.plugins.dbsearch.clearIndex', function (err) {
55
+ if (err) {
56
+ alerts.error(err);
57
+ return clearProgress();
58
+ }
59
+ alerts.success('Started clearing index! This might take a while. You can check the progress on this page.');
60
+ startProgress();
61
+ });
62
+ });
63
+ return false;
64
+ });
65
+
66
+ $('#changeLanguage').on('click', function () {
67
+ var lang = $('#indexLanguage').val();
68
+ alerts.success('Changing index language to "' + lang + '".');
69
+ socket.emit('admin.plugins.dbsearch.changeLanguage', lang, function (err) {
70
+ if (err) {
71
+ return alerts.error(err);
72
+ }
73
+ alerts.success('Search index language changed!');
74
+ });
75
+ });
76
+ };
77
+
78
+ function startProgress() {
79
+ clearProgress();
80
+ intervalId = setInterval(checkProgress, 1000);
81
+ }
82
+
83
+ function clearProgress() {
84
+ if (intervalId) {
85
+ clearInterval(intervalId);
86
+ intervalId = 0;
87
+ }
88
+ }
89
+
90
+ function checkProgress() {
91
+ socket.emit('admin.plugins.dbsearch.checkProgress', function (err, progress) {
92
+ if (err) {
93
+ clearProgress();
94
+ return alerts.error(err);
95
+ }
96
+
97
+ var working = parseInt(progress.working, 10);
98
+ if (!working) {
99
+ clearInterval(intervalId);
100
+ $('#reindex').removeAttr('disabled');
101
+ } else {
102
+ $('#reindex').attr('disabled', true);
103
+ }
104
+
105
+ $('#work-in-progress').toggleClass('hidden', !working);
106
+
107
+ if (progress.topicsPercent >= 100 && progress.postsPercent >= 100) {
108
+ progress.topicsPercent = 100;
109
+ progress.postsPercent = 100;
110
+ }
111
+
112
+ $('#topics-indexed').text(progress.topicsIndexed);
113
+ $('#posts-indexed').text(progress.postsIndexed);
114
+ $('.topic-progress').css('width', progress.topicsPercent + '%').text(progress.topicsPercent + '%');
115
+ $('.post-progress').css('width', progress.postsPercent + '%').text(progress.postsPercent + '%');
116
+ });
117
+ }
118
+
119
+ return dbsearch;
120
+ });
package/upgrades/dbsearch_change_mongodb_schema.js CHANGED
@@ -1,49 +1,28 @@
1
1
  'use strict';
2
2
 
3
3
 
4
- const async = require.main.require('async');
5
4
  const winston = require.main.require('winston');
6
5
  const db = module.parent.require('./database');
7
6
 
8
7
  module.exports = {
9
8
  name: 'Changing dbsearch mongodb search schema to use _id',
10
9
  timestamp: Date.UTC(2018, 10, 26),
11
- method: function (callback) {
10
+ method: async function () {
12
11
  const nconf = require.main.require('nconf');
13
12
  const isMongo = nconf.get('database') === 'mongo';
14
13
  if (!isMongo) {
15
- return callback();
14
+ return;
16
15
  }
17
16
 
18
17
  const plugin = require('../lib/dbsearch');
19
- const client = db.client;
20
-
21
- async.series([
22
- function (next) {
23
- client.collection('searchtopic').removeMany({}, next);
24
- },
25
- function (next) {
26
- client.collection('searchpost').removeMany({}, next);
27
- },
28
- function (next) {
29
- client.collection('searchtopic').dropIndex({ id: 1 }, function (err) {
30
- if (err) {
31
- winston.error(err);
32
- }
33
- next();
34
- });
35
- },
36
- function (next) {
37
- client.collection('searchpost').dropIndex({ id: 1 }, function (err) {
38
- if (err) {
39
- winston.error(err);
40
- }
41
- next();
42
- });
43
- },
44
- async function () {
45
- await plugin.reindex();
46
- },
47
- ], callback);
18
+ await db.client.collection('searchtopic').deleteMany({});
19
+ await db.client.collection('searchpost').deleteMany({});
20
+ try {
21
+ await db.client.collection('searchtopic').dropIndex({ id: 1 });
22
+ await db.client.collection('searchpost').dropIndex({ id: 1 });
23
+ } catch (err) {
24
+ winston.error(err.stack);
25
+ }
26
+ await plugin.reindex();
48
27
  },
49
28
  };