From e43b831802455ed232d585a1d69bd2cb3310ef46 Mon Sep 17 00:00:00 2001
From: vGimly <vgimly@gmail.com>
Date: Wed, 8 Aug 2018 17:19:48 +0300
Subject: [PATCH 1/3] *searchd* daemon can be run separatelly

---
 src/background/sphinx.js | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/background/sphinx.js b/src/background/sphinx.js
index 18182e2..cf791f6 100644
--- a/src/background/sphinx.js
+++ b/src/background/sphinx.js
@@ -156,7 +156,11 @@ module.exports = (callback, dataDirectory, onClose) => {
 			appConfig['dbPath'] = sphinxConfigDirectory
 		}
 
-		const { isInitDb } = writeSphinxConfig(sphinxConfigDirectory, appConfig.dbPath)
+		const sphinxPid=`${sphinxConfigDirectory}/searchd.pid`
+		const isSphinxExternal=fs.existsSync(sphinxPid)
+		logT('sphinx', "Pid: "+sphinxPid + (isSphinxExternal?" exists.":" no file."));
+
+		const { isInitDb } = isSphinxExternal ? {isInitDb: false} : writeSphinxConfig(sphinxConfigDirectory, appConfig.dbPath)
 
 		const config = `${sphinxConfigDirectory}/sphinx.conf`
 		const options = ['--config', config]
@@ -164,7 +168,10 @@ module.exports = (callback, dataDirectory, onClose) => {
 		{
 			options.push('--nodetach')
 		}
-		const sphinx = spawn(sphinxPath, options)
+
+		const sphinx = !isSphinxExternal ? spawn(sphinxPath, options) :
+			{isExternal: true, on: (d,f) => {}, stdout: {on : (d,f)=>{} }};
+
 		// remeber initizalizing of db
 		sphinx.start = start
 		sphinx.isInitDb = isInitDb
@@ -173,6 +180,8 @@ module.exports = (callback, dataDirectory, onClose) => {
 
 		const optimizeResolvers = {}
 
+		if (isSphinxExternal && callback) setTimeout(()=>{logT('sphinx', 'external sphinx signalled');callback()},500);
+
 		sphinx.stdout.on('data', (data) => {
 			logT('sphinx', `sphinx: ${data}`)
 
@@ -216,7 +225,8 @@ module.exports = (callback, dataDirectory, onClose) => {
 				sphinx.onClose = onFinish
 			if(replaceFinish)
 				sphinx.replaceOnClose = true // sometime we don't want to call default callback
-			exec(`"${sphinxPath}" --config "${config}" --stopwait`)
+			if (!sphinx.isExternal)
+				exec(`"${sphinxPath}" --config "${config}" --stopwait`)
 		}
 
 		sphinx.waitOptimized = (table) => new Promise((resolve) => {
@@ -227,6 +237,9 @@ module.exports = (callback, dataDirectory, onClose) => {
 		})
 
 		sphinx.fixDatabase = async () => {
+			if(sphinx.isExternal)
+				return
+
 			if(sphinx.fixing)
 				return
 			sphinx.fixing = true

From ccef7b595c3edf2ee7cd3c9b66ae941b47dad38d Mon Sep 17 00:00:00 2001
From: vGimly <vgimly@gmail.com>
Date: Wed, 8 Aug 2018 17:38:08 +0300
Subject: [PATCH 2/3] fix build on updated npm modules

---
 .babelrc                                    |  2 ++
 src/background/webpack.config.production.js | 10 +++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/.babelrc b/.babelrc
index 08a6e5d..4e12c86 100644
--- a/.babelrc
+++ b/.babelrc
@@ -13,6 +13,8 @@
     ["@babel/stage-0", { "decoratorsLegacy": true }]
   ],
   "plugins": [
+	["transform-class-properties"],
+	["transform-react-jsx", { "pragma": "h" }],
   	["transform-object-rest-spread", { "useBuiltIns": true }]
   ]
 }
diff --git a/src/background/webpack.config.production.js b/src/background/webpack.config.production.js
index eda27fc..db614a1 100644
--- a/src/background/webpack.config.production.js
+++ b/src/background/webpack.config.production.js
@@ -16,7 +16,15 @@ module.exports = {
 			{
 				test: /\.js$/,
 				exclude: /node_modules/,
-				use: ["babel-loader"]
+				use: {
+					loader: "babel-loader",
+					options: {
+						presets: ['@babel/react'],
+						plugins:[
+							["@babel/plugin-proposal-class-properties",{ "loose": true }],
+							"@babel/plugin-proposal-object-rest-spread"
+						]}
+				}
 			},
 			{
 				test: /\.css$/,

From 3c04ad148fff9a67b312190762162ef4f96473ea Mon Sep 17 00:00:00 2001
From: vGimly <vgimly@gmail.com>
Date: Wed, 8 Aug 2018 17:50:56 +0300
Subject: [PATCH 3/3] Revert "fix build on updated npm modules" just for me?
 his reverts commit e7f170c30635f37e9839e1930adff5f9cce684c0.

---
 .babelrc                                    |  2 --
 src/background/webpack.config.production.js | 10 +---------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/.babelrc b/.babelrc
index 4e12c86..08a6e5d 100644
--- a/.babelrc
+++ b/.babelrc
@@ -13,8 +13,6 @@
     ["@babel/stage-0", { "decoratorsLegacy": true }]
   ],
   "plugins": [
-	["transform-class-properties"],
-	["transform-react-jsx", { "pragma": "h" }],
   	["transform-object-rest-spread", { "useBuiltIns": true }]
   ]
 }
diff --git a/src/background/webpack.config.production.js b/src/background/webpack.config.production.js
index db614a1..eda27fc 100644
--- a/src/background/webpack.config.production.js
+++ b/src/background/webpack.config.production.js
@@ -16,15 +16,7 @@ module.exports = {
 			{
 				test: /\.js$/,
 				exclude: /node_modules/,
-				use: {
-					loader: "babel-loader",
-					options: {
-						presets: ['@babel/react'],
-						plugins:[
-							["@babel/plugin-proposal-class-properties",{ "loose": true }],
-							"@babel/plugin-proposal-object-rest-spread"
-						]}
-				}
+				use: ["babel-loader"]
 			},
 			{
 				test: /\.css$/,