更新Miao-Yunzai同时更新miao-plugin
This commit is contained in:
parent
b4f9b54dbd
commit
8325c63a62
|
@ -11,7 +11,7 @@ const { exec, execSync } = require('child_process')
|
||||||
let uping = false
|
let uping = false
|
||||||
|
|
||||||
export class update extends plugin {
|
export class update extends plugin {
|
||||||
constructor() {
|
constructor () {
|
||||||
super({
|
super({
|
||||||
name: '更新',
|
name: '更新',
|
||||||
dsc: '#更新 #强制更新',
|
dsc: '#更新 #强制更新',
|
||||||
|
@ -37,18 +37,25 @@ export class update extends plugin {
|
||||||
this.typeName = 'Miao-Yunzai'
|
this.typeName = 'Miao-Yunzai'
|
||||||
}
|
}
|
||||||
|
|
||||||
async update() {
|
async update () {
|
||||||
if (!this.e.isMaster) return false
|
if (!this.e.isMaster) return false
|
||||||
if (uping) return this.reply('已有命令更新中..请勿重复操作')
|
if (uping) return this.reply('已有命令更新中..请勿重复操作')
|
||||||
|
|
||||||
if (/详细|详情|面板|面版/.test(this.e.msg)) return false
|
if (/详细|详情|面板|面版/.test(this.e.msg)) return false
|
||||||
|
|
||||||
/** 获取插件 */
|
/** 获取插件 */
|
||||||
const plugin = this.getPlugin()
|
let plugin = this.getPlugin()
|
||||||
if (plugin === false) return false
|
if (plugin === false) return false
|
||||||
|
|
||||||
/** 执行更新 */
|
/** 执行更新 */
|
||||||
|
if (plugin === '') {
|
||||||
|
await this.runUpdate('')
|
||||||
|
await common.sleep(1000)
|
||||||
|
plugin = this.getPlugin('miao-plugin')
|
||||||
await this.runUpdate(plugin)
|
await this.runUpdate(plugin)
|
||||||
|
} else {
|
||||||
|
await this.runUpdate(plugin)
|
||||||
|
}
|
||||||
|
|
||||||
/** 是否需要重启 */
|
/** 是否需要重启 */
|
||||||
if (this.isUp) {
|
if (this.isUp) {
|
||||||
|
@ -57,7 +64,7 @@ export class update extends plugin {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
getPlugin(plugin = '') {
|
getPlugin (plugin = '') {
|
||||||
if (!plugin) {
|
if (!plugin) {
|
||||||
plugin = this.e.msg.replace(/#(强制)?更新(日志)?/, '')
|
plugin = this.e.msg.replace(/#(强制)?更新(日志)?/, '')
|
||||||
if (!plugin) return ''
|
if (!plugin) return ''
|
||||||
|
@ -69,7 +76,7 @@ export class update extends plugin {
|
||||||
return plugin
|
return plugin
|
||||||
}
|
}
|
||||||
|
|
||||||
async execSync(cmd) {
|
async execSync (cmd) {
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
exec(cmd, { windowsHide: true }, (error, stdout, stderr) => {
|
exec(cmd, { windowsHide: true }, (error, stdout, stderr) => {
|
||||||
resolve({ error, stdout, stderr })
|
resolve({ error, stdout, stderr })
|
||||||
|
@ -77,7 +84,7 @@ export class update extends plugin {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
async runUpdate(plugin = '') {
|
async runUpdate (plugin = '') {
|
||||||
this.isNowUp = false
|
this.isNowUp = false
|
||||||
|
|
||||||
let cm = 'git pull --no-rebase'
|
let cm = 'git pull --no-rebase'
|
||||||
|
@ -118,7 +125,7 @@ export class update extends plugin {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
async getcommitId(plugin = '') {
|
async getcommitId (plugin = '') {
|
||||||
let cm = 'git rev-parse --short HEAD'
|
let cm = 'git rev-parse --short HEAD'
|
||||||
if (plugin) cm = `cd "plugins/${plugin}" && ${cm}`
|
if (plugin) cm = `cd "plugins/${plugin}" && ${cm}`
|
||||||
|
|
||||||
|
@ -126,7 +133,7 @@ export class update extends plugin {
|
||||||
return lodash.trim(commitId)
|
return lodash.trim(commitId)
|
||||||
}
|
}
|
||||||
|
|
||||||
async getTime(plugin = '') {
|
async getTime (plugin = '') {
|
||||||
let cm = 'git log -1 --pretty=%cd --date=format:"%F %T"'
|
let cm = 'git log -1 --pretty=%cd --date=format:"%F %T"'
|
||||||
if (plugin) cm = `cd "plugins/${plugin}" && ${cm}`
|
if (plugin) cm = `cd "plugins/${plugin}" && ${cm}`
|
||||||
|
|
||||||
|
@ -142,7 +149,7 @@ export class update extends plugin {
|
||||||
return time
|
return time
|
||||||
}
|
}
|
||||||
|
|
||||||
async gitErr(err, stdout) {
|
async gitErr (err, stdout) {
|
||||||
const msg = '更新失败!'
|
const msg = '更新失败!'
|
||||||
const errMsg = err.toString()
|
const errMsg = err.toString()
|
||||||
stdout = stdout.toString()
|
stdout = stdout.toString()
|
||||||
|
@ -168,7 +175,7 @@ export class update extends plugin {
|
||||||
return this.reply([errMsg, stdout])
|
return this.reply([errMsg, stdout])
|
||||||
}
|
}
|
||||||
|
|
||||||
async updateAll() {
|
async updateAll () {
|
||||||
const dirs = fs.readdirSync('./plugins/')
|
const dirs = fs.readdirSync('./plugins/')
|
||||||
|
|
||||||
await this.runUpdate()
|
await this.runUpdate()
|
||||||
|
@ -186,11 +193,11 @@ export class update extends plugin {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
restart() {
|
restart () {
|
||||||
new Restart(this.e).restart()
|
new Restart(this.e).restart()
|
||||||
}
|
}
|
||||||
|
|
||||||
async getLog(plugin = '') {
|
async getLog (plugin = '') {
|
||||||
let cm = 'git log -100 --pretty="%h||[%cd] %s" --date=format:"%F %T"'
|
let cm = 'git log -100 --pretty="%h||[%cd] %s" --date=format:"%F %T"'
|
||||||
if (plugin) cm = `cd "plugins/${plugin}" && ${cm}`
|
if (plugin) cm = `cd "plugins/${plugin}" && ${cm}`
|
||||||
|
|
||||||
|
@ -232,7 +239,7 @@ export class update extends plugin {
|
||||||
return common.makeForwardMsg(this.e, [log, end], `${plugin || 'Miao-Yunzai'} 更新日志,共${line}条`)
|
return common.makeForwardMsg(this.e, [log, end], `${plugin || 'Miao-Yunzai'} 更新日志,共${line}条`)
|
||||||
}
|
}
|
||||||
|
|
||||||
async updateLog() {
|
async updateLog () {
|
||||||
const plugin = this.getPlugin()
|
const plugin = this.getPlugin()
|
||||||
if (plugin === false) return false
|
if (plugin === false) return false
|
||||||
return this.reply(await this.getLog(plugin))
|
return this.reply(await this.getLog(plugin))
|
||||||
|
|
Loading…
Reference in New Issue