Merge branch 'master' of gitee.com:yoimiya-kokomi/Miao-Yunzai into master
Signed-off-by: 绫仓优希 <sakurajuzijiang@163.com>
This commit is contained in:
commit
6d7587580f
|
@ -14,7 +14,7 @@ const _path = process.cwd()
|
||||||
let mac = ''
|
let mac = ''
|
||||||
|
|
||||||
export default class PuppeteerRenderer {
|
export default class PuppeteerRenderer {
|
||||||
constructor (config) {
|
constructor(config) {
|
||||||
this.browser = false
|
this.browser = false
|
||||||
this.lock = false
|
this.lock = false
|
||||||
this.shoting = []
|
this.shoting = []
|
||||||
|
@ -45,7 +45,7 @@ export default class PuppeteerRenderer {
|
||||||
this.createDir('./temp/html')
|
this.createDir('./temp/html')
|
||||||
}
|
}
|
||||||
|
|
||||||
createDir (dir) {
|
createDir(dir) {
|
||||||
if (!fs.existsSync(dir)) {
|
if (!fs.existsSync(dir)) {
|
||||||
let dirs = dir.split('/')
|
let dirs = dir.split('/')
|
||||||
for (let idx = 1; idx <= dirs.length; idx++) {
|
for (let idx = 1; idx <= dirs.length; idx++) {
|
||||||
|
@ -60,13 +60,9 @@ export default class PuppeteerRenderer {
|
||||||
/**
|
/**
|
||||||
* 初始化chromium
|
* 初始化chromium
|
||||||
*/
|
*/
|
||||||
async browserInit () {
|
async browserInit() {
|
||||||
if (this.browser) {
|
if (this.browser) return this.browser
|
||||||
return this.browser
|
if (this.lock) return false
|
||||||
}
|
|
||||||
if (this.lock) {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
this.lock = true
|
this.lock = true
|
||||||
|
|
||||||
logger.info('puppeteer Chromium 启动中...')
|
logger.info('puppeteer Chromium 启动中...')
|
||||||
|
@ -174,7 +170,7 @@ export default class PuppeteerRenderer {
|
||||||
* @param data.pageGotoParams 页面goto时的参数
|
* @param data.pageGotoParams 页面goto时的参数
|
||||||
* @return img/[]img 不做segment包裹
|
* @return img/[]img 不做segment包裹
|
||||||
*/
|
*/
|
||||||
async screenshot (name, data = {}) {
|
async screenshot(name, data = {}) {
|
||||||
if (!await this.browserInit()) {
|
if (!await this.browserInit()) {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
@ -287,7 +283,7 @@ export default class PuppeteerRenderer {
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 模板 */
|
/** 模板 */
|
||||||
dealTpl (name, data) {
|
dealTpl(name, data) {
|
||||||
let { tplFile, saveId = name } = data
|
let { tplFile, saveId = name } = data
|
||||||
let savePath = `./temp/html/${name}/${saveId}.html`
|
let savePath = `./temp/html/${name}/${saveId}.html`
|
||||||
|
|
||||||
|
@ -319,10 +315,8 @@ export default class PuppeteerRenderer {
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 监听配置文件 */
|
/** 监听配置文件 */
|
||||||
watch (tplFile) {
|
watch(tplFile) {
|
||||||
if (this.watcher[tplFile]) {
|
if (this.watcher[tplFile]) return
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
const watcher = chokidar.watch(tplFile)
|
const watcher = chokidar.watch(tplFile)
|
||||||
watcher.on('change', path => {
|
watcher.on('change', path => {
|
||||||
|
@ -334,7 +328,7 @@ export default class PuppeteerRenderer {
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 重启 */
|
/** 重启 */
|
||||||
restart () {
|
restart() {
|
||||||
/** 截图超过重启数时,自动关闭重启浏览器,避免生成速度越来越慢 */
|
/** 截图超过重启数时,自动关闭重启浏览器,避免生成速度越来越慢 */
|
||||||
if (this.renderNum % this.restartNum === 0) {
|
if (this.renderNum % this.restartNum === 0) {
|
||||||
if (this.shoting.length <= 0) {
|
if (this.shoting.length <= 0) {
|
||||||
|
|
Loading…
Reference in New Issue