evan/rats-search
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(windows): fix starting under some path'es

Browse Source
This commit is contained in:
Alexey Kasyanchuk
2018-09-23 00:56:45 +03:00
parent 1f421b9d55
commit ed67c4a95c
3 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/background/sphinx.js
View File

@ -12,6 +12,7 @@ const findFiles = require('./findFiles')
const _ = require('lodash')
const isRunning = require('is-running')
const portCheck = require('./portCheck')
const detectOnebyteEncoding = require('detect-onebyte-encoding')
const findGoodPort = async (port, host) => {
while (!(await portCheck(port, host))) {
@ -150,8 +151,18 @@ const writeSphinxConfig = async (path, dbPath) => {
isInitDb = true
}
// fix db path under windows platform (one-byte path)
if(/^win/.test(process.platform))
config = iconv.encode(config, 'win1251')
{
let encoding = detectOnebyteEncoding(dbPath)
let encoding2 = detectOnebyteEncoding(path)
if(encoding != encoding2)
{
encoding = detectOnebyteEncoding(config)
}
config = iconv.encode(config, encoding)
logT('sphinx', 'config encoded to', encoding)
}
fs.writeFileSync(`${path}/sphinx.conf`, config)
logT('sphinx', `writed sphinx config to ${path}`)