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

fix(tests): fixed patching on tests

Browse Source
This commit is contained in:
Alexey Kasyanchuk 2018-04-04 10:33:24 +03:00
parent 0df20237bb
commit bcb8fa564d
2 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/background/background.js
View File

@ -233,6 +233,8 @@ const startSphinx = (callback) => {
sphinx = spawn(sphinxPath, options) sphinx = spawn(sphinxPath, options)
// remeber initizalizing of db // remeber initizalizing of db
sphinx.isInitDb = isInitDb sphinx.isInitDb = isInitDb
sphinx.directoryPath = appConfig.dbPath
sphinx.directoryPathDb = appConfig.dbPath + '/database'
const optimizeResolvers = {} const optimizeResolvers = {}

42
src/background/dbPatcher.js
View File

@ -4,6 +4,9 @@ import forBigTable from './forBigTable'
import { BrowserWindow } from "electron"; import { BrowserWindow } from "electron";
import url from 'url' import url from 'url'
import path from 'path' import path from 'path'
import fs from 'fs'
const currentVersion = 3
module.exports = (callback, mainWindow, sphinxApp) => { module.exports = (callback, mainWindow, sphinxApp) => {
const sphinx = mysql.createConnection({ const sphinx = mysql.createConnection({
@ -41,6 +44,13 @@ module.exports = (callback, mainWindow, sphinxApp) => {
}) })
}) })
const setVersion = async (version) => {
await query(`delete from version where id = 1`)
await query(`insert into version(id, version) values(1, ${version})`)
if(sphinxApp)
fs.writeFileSync(`${sphinxApp.directoryPath}/version.vrs`, version)
}
let patchWindow; let patchWindow;
const openPatchWindow = () => { const openPatchWindow = () => {
if(patchWindow) if(patchWindow)
@ -147,7 +157,8 @@ module.exports = (callback, mainWindow, sphinxApp) => {
await query(`DELETE FROM files WHERE id = ${file.id}`) await query(`DELETE FROM files WHERE id = ${file.id}`)
await insertValues('files', file) await insertValues('files', file)
}) })
await query(`UPDATE version SET version = 2 WHERE id = 1`)
await setVersion(2)
} }
case 2: case 2:
{ {
@ -165,7 +176,7 @@ module.exports = (callback, mainWindow, sphinxApp) => {
query(`OPTIMIZE INDEX files`) query(`OPTIMIZE INDEX files`)
await sphinxApp.waitOptimized('files') await sphinxApp.waitOptimized('files')
await query(`UPDATE version SET version = 3 WHERE id = 1`) await setVersion(3)
} }
} }
console.log('db patch done') console.log('db patch done')
@ -189,11 +200,11 @@ module.exports = (callback, mainWindow, sphinxApp) => {
// init of db, we can set version to last // init of db, we can set version to last
if(sphinxApp && sphinxApp.isInitDb) if(sphinxApp && sphinxApp.isInitDb)
{ {
console.log('new db, set version to last') console.log('new db, set version to last version', currentVersion)
await query('insert into version(id, version) values(1, 3)') await setVersion(currentVersion)
} }
sphinx.query('select * from version', (err, version) => { sphinx.query('select * from version', async (err, version) => {
if(err) if(err)
{ {
console.log('error on version get on db patch') console.log('error on version get on db patch')
@ -202,14 +213,25 @@ module.exports = (callback, mainWindow, sphinxApp) => {
if(!version || !version[0] || !version[0].version) if(!version || !version[0] || !version[0].version)
{ {
sphinx.query('insert into version(id, version) values(1, 1)', (err) => { if(sphinxApp && fs.existsSync(`${sphinxApp.directoryPath}/version.vrs`))
if(err)
{ {
console.log('cant set first version') const ver = parseInt(fs.readFileSync(`${sphinxApp.directoryPath}/version.vrs`))
return if(ver > 0)
{
console.log('readed version from version.vrs', ver)
patch(ver)
} }
else
{
console.log('error: bad version in version.vrs')
}
}
else
{
console.log('version not founded, set db version to 1')
await setVersion(1)
patch(1) patch(1)
}) }
} }
else else
{ {