external/ShinobiCE
1
0
Fork 0
mirror of https://gitlab.com/Shinobi-Systems/ShinobiCE.git synced 2025-03-09 15:40:15 +00:00
Code Issues Releases Wiki Activity

fix CE video bug

Browse source
This commit is contained in:
Moe 2019-03-24 18:36:35 -07:00
parent 7fe4d3c43b
commit ef40f3f231
1 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
libs/sql.js
View file

@ -1,4 +1,3 @@
moment = require('moment')
module.exports = function(s,config){ module.exports = function(s,config){
s.onBeforeDatabaseLoadExtensions.forEach(function(extender){ s.onBeforeDatabaseLoadExtensions.forEach(function(extender){
extender(config) extender(config)
@ -8,9 +7,7 @@ module.exports = function(s,config){
client: config.databaseType, client: config.databaseType,
connection: config.db, connection: config.db,
} }
var isSqlite = false
if(s.databaseOptions.client.indexOf('sqlite')>-1){ if(s.databaseOptions.client.indexOf('sqlite')>-1){
isSqlite = true
s.databaseOptions.client = 'sqlite3'; s.databaseOptions.client = 'sqlite3';
s.databaseOptions.useNullAsDefault = true; s.databaseOptions.useNullAsDefault = true;
try{ try{
@ -49,8 +46,12 @@ module.exports = function(s,config){
} }
return newQuery return newQuery
} }
s.getUnixDate = function(value){
newValue = new Date(value).valueOf()
return newValue
}
s.stringToSqlTime = function(value){ s.stringToSqlTime = function(value){
newValue = new Date(s.nameToTime(value)).valueOf() newValue = new Date(value.replace('T',' '))
return newValue return newValue
} }
s.sqlQuery = function(query,values,onMoveOn,hideLog){ s.sqlQuery = function(query,values,onMoveOn,hideLog){
@ -90,9 +91,6 @@ module.exports = function(s,config){
} }
}) })
} }
s.openDatabaseTable = function(tableName){
return s.databaseEngine(tableName)
}
s.connectDatabase = function(){ s.connectDatabase = function(){
s.databaseEngine = require('knex')(s.databaseOptions) s.databaseEngine = require('knex')(s.databaseOptions)
} }
@ -120,6 +118,13 @@ module.exports = function(s,config){
s.sqlQuery("CREATE TABLE IF NOT EXISTS `Schedules` (`ke` varchar(50) DEFAULT NULL,`name` text,`details` text,`start` varchar(10) DEFAULT NULL,`end` varchar(10) DEFAULT NULL,`enabled` int(1) NOT NULL DEFAULT '1')" + mySQLtail + ';',[],function(err){ s.sqlQuery("CREATE TABLE IF NOT EXISTS `Schedules` (`ke` varchar(50) DEFAULT NULL,`name` text,`details` text,`start` varchar(10) DEFAULT NULL,`end` varchar(10) DEFAULT NULL,`enabled` int(1) NOT NULL DEFAULT '1')" + mySQLtail + ';',[],function(err){
if(err)console.error(err) if(err)console.error(err)
},true) },true)
//add Timelapses and Timelapse Frames tables, will remove in future
s.sqlQuery("CREATE TABLE IF NOT EXISTS `Timelapses` (`ke` varchar(50) NOT NULL,`mid` varchar(50) NOT NULL,`details` longtext,`date` date NOT NULL,`time` timestamp NOT NULL,`end` timestamp NOT NULL,`size` int(11)NOT NULL)" + mySQLtail + ';',[],function(err){
if(err)console.error(err)
},true)
s.sqlQuery("CREATE TABLE IF NOT EXISTS `Timelapse Frames` (`ke` varchar(50) NOT NULL,`mid` varchar(50) NOT NULL,`details` longtext,`filename` varchar(50) NOT NULL,`time` timestamp NULL DEFAULT NULL,`size` int(11) NOT NULL)" + mySQLtail + ';',[],function(err){
if(err)console.error(err)
},true)
//add Cloud Videos table, will remove in future //add Cloud Videos table, will remove in future
s.sqlQuery('CREATE TABLE IF NOT EXISTS `Cloud Videos` (`mid` varchar(50) NOT NULL,`ke` varchar(50) DEFAULT NULL,`href` text NOT NULL,`size` float DEFAULT NULL,`time` timestamp NULL DEFAULT NULL,`end` timestamp NULL DEFAULT NULL,`status` int(1) DEFAULT \'0\',`details` text)' + mySQLtail + ';',[],function(err){ s.sqlQuery('CREATE TABLE IF NOT EXISTS `Cloud Videos` (`mid` varchar(50) NOT NULL,`ke` varchar(50) DEFAULT NULL,`href` text NOT NULL,`size` float DEFAULT NULL,`time` timestamp NULL DEFAULT NULL,`end` timestamp NULL DEFAULT NULL,`status` int(1) DEFAULT \'0\',`details` text)' + mySQLtail + ';',[],function(err){
if(err)console.error(err) if(err)console.error(err)