16mm
/
mcopy
1
0
Fork 0
Code Issues 14 Pull Requests Projects 2 Releases 13 Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
sixteenmillimeter 2019-12-17 14:54:08 -05:00
parent 09da9500b5 de7015022f
commit 00ccf4cb8f
19 changed files with 2007 additions and 11148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/lib/sequencer/index.js
View File

@ -1,6 +1,7 @@
'use strict';
Object.defineProperty(exports, "__esModule", { value: true });
const Log = require("log");
const electron_1 = require("electron");
/** @module lib/sequencer **/
let seq;
class Sequencer {
@ -127,6 +128,7 @@ class Sequencer {
async start(arg) {
let startTime = +new Date();
let ms;
this.psbId = electron_1.powerSaveBlocker.start('prevent-display-sleep');
if (arg && arg.arr) {
this.arr = arg.arr; //overwrite sequence
}
@ -180,6 +182,8 @@ class Sequencer {
if (this.cmd.proj.filmout.state.enabled === true) {
await this.cmd.proj.filmout.display.close();
}
electron_1.powerSaveBlocker.stop(this.psbId);
this.psbId = null;
ms = (+new Date()) - startTime;
//end sequence
this.log.info(`Ended sequence`);
@ -199,6 +203,9 @@ class Sequencer {
this.cmd.proj.filmout.display.close();
}
this.running = false;
if (this.psbId) {
electron_1.powerSaveBlocker.stop(this.psbId);
}
//clear?
}
/**

2
app/lib/sequencer/index.js.map
View File

File diff suppressed because one or more lines are too long

2701
app/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

38
app/package.json
View File

@ -1,6 +1,6 @@
{
"name": "mcopy-app",
"version": "1.4.18",
"version": "1.4.19",
"description": "GUI for the mcopy small gauge film optical printer platform",
"main": "main.js",
"scripts": {
@ -28,19 +28,19 @@
},
"homepage": "https://github.com/sixteenmillimeter/mcopy#readme",
"devDependencies": {
"@types/jquery": "^3.3.29",
"@types/jquery": "^3.3.31",
"chai": "^4.2.0",
"electron": "^5.0.3",
"electron-installer-common": "^0.7.2",
"electron": "^7.1.5",
"electron-installer-common": "^0.8.0",
"electron-installer-dmg": "^3.0.0",
"electron-packager": "^13.1.1",
"electron-rebuild": "^1.8.5",
"electron-wix-msi": "^2.1.1",
"electron-packager": "^14.1.1",
"electron-rebuild": "^1.8.8",
"electron-wix-msi": "^2.2.0",
"gulp": "^4.0.2",
"gulp-concat": "^2.6.1",
"gulp-less": "^4.0.1",
"mocha": "^6.1.4",
"typescript": "^3.5.2"
"mocha": "^6.2.2",
"typescript": "^3.7.3"
},
"dependencies": {
"animated-gif-detector": "^1.2.0",
@ -51,34 +51,34 @@
"delay": "file:lib/delay",
"devices": "file:lib/devices",
"display": "file:lib/display",
"electron-updater": "^4.0.6",
"electron-updater": "^4.2.0",
"exec": "file:lib/exec",
"exit": "file:lib/exit",
"ffmpeg": "file:lib/ffmpeg",
"ffmpeg-static": "^2.5.0",
"ffmpeg-static": "^2.7.0",
"ffprobe": "file:lib/ffprobe",
"filmout": "file:lib/filmout",
"fs-extra": "^8.0.1",
"humanize-duration": "^3.18.0",
"fs-extra": "^8.1.0",
"humanize-duration": "^3.21.0",
"intval": "file:lib/intval",
"light": "file:lib/light",
"log": "file:lib/log",
"moment": "^2.24.0",
"mscript": "file:lib/mscript",
"node-notifier": "^5.4.0",
"node-notifier": "^6.0.0",
"proj": "file:lib/proj",
"request": "^2.88.0",
"sequencer": "file:lib/sequencer",
"serialport": "^7.1.5",
"serialport": "^8.0.5",
"server": "file:lib/server",
"settings": "file:lib/settings",
"sharp": "^0.22.1",
"sharp": "^0.23.4",
"spawn": "file:lib/spawn",
"system": "file:lib/system",
"uuid": "^3.3.2",
"winston": "^2.4.4"
"uuid": "^3.3.3",
"winston": "^3.2.1"
},
"optionalDependencies": {
"electron-installer-debian": "^2.0.0"
"electron-installer-debian": "^2.0.1"
}
}

7
cli/lib/sequencer/index.js
View File

@ -1,6 +1,7 @@
'use strict';
Object.defineProperty(exports, "__esModule", { value: true });
const Log = require("log");
const electron_1 = require("electron");
/** @module lib/sequencer **/
let seq;
class Sequencer {
@ -127,6 +128,7 @@ class Sequencer {
async start(arg) {
let startTime = +new Date();
let ms;
this.psbId = electron_1.powerSaveBlocker.start('prevent-display-sleep');
if (arg && arg.arr) {
this.arr = arg.arr; //overwrite sequence
}
@ -180,6 +182,8 @@ class Sequencer {
if (this.cmd.proj.filmout.state.enabled === true) {
await this.cmd.proj.filmout.display.close();
}
electron_1.powerSaveBlocker.stop(this.psbId);
this.psbId = null;
ms = (+new Date()) - startTime;
//end sequence
this.log.info(`Ended sequence`);
@ -199,6 +203,9 @@ class Sequencer {
this.cmd.proj.filmout.display.close();
}
this.running = false;
if (this.psbId) {
electron_1.powerSaveBlocker.stop(this.psbId);
}
//clear?
}
/**

2
cli/lib/sequencer/index.js.map
View File

File diff suppressed because one or more lines are too long

2819
cli/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

16
cli/package.json
View File

@ -1,6 +1,6 @@
{
"name": "mcopy-cli",
"version": "1.4.18",
"version": "1.4.19",
"description": "CLI for controlling the mcopy optical printer platform",
"main": "index.js",
"scripts": {
@ -20,7 +20,7 @@
"arduino": "file:lib/arduino",
"cam": "file:lib/cam",
"cmd": "file:lib/cmd",
"commander": "^2.19.0",
"commander": "^4.0.1",
"delay": "file:../app/lib/delay",
"device": "file:lib/device",
"devices": "file:lib/devices",
@ -28,8 +28,8 @@
"display": "file:lib/display",
"exec": "file:lib/exec",
"exit": "file:lib/exit",
"fs-extra": "^7.0.1",
"humanize-duration": "^3.17.0",
"fs-extra": "^8.1.0",
"humanize-duration": "^3.21.0",
"intval": "file:lib/intval",
"light": "file:lib/light",
"log": "file:lib/log",
@ -38,14 +38,14 @@
"proj": "file:lib/proj",
"request": "^2.88.0",
"sequencer": "file:lib/sequencer",
"serialport": "^7.0.2",
"serialport": "^8.0.5",
"settings": "file:lib/settings",
"spawn": "file:lib/spawn",
"systeminformation": "^4.1.1",
"uuid": "^3.3.2",
"systeminformation": "^4.16.0",
"uuid": "^3.3.3",
"winston": "^3.2.1"
},
"devDependencies": {
"pkg": "^4.3.7"
"pkg": "^4.4.2"
}
}

2
data/cfg.json
View File

@ -1,5 +1,5 @@
{
"version": "1.4.18",
"version": "1.4.19",
"ext_port": 1111,
"profiles": {
"mcopy": {

7
lib/sequencer/index.js
View File

@ -1,6 +1,7 @@
'use strict';
Object.defineProperty(exports, "__esModule", { value: true });
const Log = require("log");
const electron_1 = require("electron");
/** @module lib/sequencer **/
let seq;
class Sequencer {
@ -127,6 +128,7 @@ class Sequencer {
async start(arg) {
let startTime = +new Date();
let ms;
this.psbId = electron_1.powerSaveBlocker.start('prevent-display-sleep');
if (arg && arg.arr) {
this.arr = arg.arr; //overwrite sequence
}
@ -180,6 +182,8 @@ class Sequencer {
if (this.cmd.proj.filmout.state.enabled === true) {
await this.cmd.proj.filmout.display.close();
}
electron_1.powerSaveBlocker.stop(this.psbId);
this.psbId = null;
ms = (+new Date()) - startTime;
//end sequence
this.log.info(`Ended sequence`);
@ -199,6 +203,9 @@ class Sequencer {
this.cmd.proj.filmout.display.close();
}
this.running = false;
if (this.psbId) {
electron_1.powerSaveBlocker.stop(this.psbId);
}
//clear?
}
/**

2
lib/sequencer/index.js.map
View File

File diff suppressed because one or more lines are too long

7
native/.babelrc
View File

@ -1,7 +0,0 @@
{
"presets": [
"env",
"stage-0",
"react"
]
}

2
native/.gitignore vendored
View File

@ -1,2 +0,0 @@
node_modules
bin

70
native/index.js
View File

@ -1,70 +0,0 @@
import React, { Component } from 'react';
import fs from 'fs-extra';
import {
render,
Window,
App,
TextInput,
Dialog,
Menu,
Box,
} from 'proton-native';
import { Provider } from 'react-redux';
class Mcopy extends Component {
state = { text: '' };
save() {
const filename = Dialog('Save');
if (filename) {
fs.writeFileSync(filename, this.state.text);
}
}
open() {
const filename = Dialog('Open');
if (filename) {
let data = fs.readFileSync(filename);
this.setState({ text: data });
}
}
shouldComponentUpdate(nextProps, nextState) {
if (typeof nextState.text === 'string') return false;
// nextState is set from input
else return true; // nextState is set from file
}
render() {
return (
<App onShouldQuit={() => console.log('Quitting')}>
<Menu label="File">
<Menu.Item type="Item" onClick={() => this.open()}>
Open
</Menu.Item>
<Menu.Item type="Item" onClick={() => this.save()}>
Save
</Menu.Item>
<Menu.Item type="Quit" />
</Menu>
<Window
onClose={() => console.log('Closing')}
title="mcopy-native"
size={{ w: 800, h: 600 }}
>
<Box>
<TextInput
onChange={text => this.setState({ text })}
multiline={true}
>
{this.state.text}
</TextInput>
</Box>
</Window>
</App>
);
}
}
render(<Mcopy />);

7043
native/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

51
native/package.json
View File

@ -1,51 +0,0 @@
{
"name": "mcopy-native",
"version": "0.0.1",
"description": "Small guage film optical printer platform written in proton-native",
"main": "index.js",
"scripts": {
"start": "node_modules/.bin/babel-node index.js",
"build": "node_modules/.bin/babel index.js -d bin/",
"pack": "electron-builder --dir",
"dist": "electron-builder"
},
"repository": {
"type": "git",
"url": "git+https://github.com/sixteenmillimeter/mcopy.git"
},
"author": "",
"license": "MIT",
"bugs": {
"url": "https://github.com/sixteenmillimeter/mcopy/issues"
},
"homepage": "https://github.com/sixteenmillimeter/mcopy#readme",
"dependencies": {
"fs-extra": "^7.0.1",
"humanize-duration": "^3.17.0",
"moment": "^2.24.0",
"proton-native": "^1.1.11",
"react": "^16.8.3",
"react-redux": "^6.0.1",
"redux": "^4.0.1",
"redux-thunk": "^2.3.0",
"serialport": "^7.1.4",
"uuid": "^3.3.2",
"winston": "^3.2.1"
},
"devDependencies": {
"@types/fs-extra": "^5.0.5",
"@types/proton-native": "^1.1.5",
"@types/react": "^16.8.6",
"@types/react-redux": "^7.0.1",
"@types/redux-thunk": "^2.1.0",
"@types/serialport": "^7.0.1",
"@types/uuid": "^3.4.4",
"babel-cli": "^6.26.0",
"babel-preset-env": "^1.7.0",
"babel-preset-react": "^6.24.1",
"babel-preset-stage-0": "^6.24.1",
"electron-builder": "^20.38.5",
"react-native-typescript-transformer": "^1.2.11",
"typescript": "^3.3.3333"
}
}

352
package-lock.json generated
View File

@ -1,13 +1,13 @@
{
"name": "mcopy",
"version": "1.4.18",
"version": "1.4.19",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
"@babel/parser": {
"version": "7.4.5",
"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.4.5.tgz",
"integrity": "sha512-9mUqkL1FF5T7f0WDFfAoDdiMVPWsdD1gZYzSnaXsxUCUqzuch/8of9G3VUSNiZmMBoRxT3neyVsqeiL/ZPcjew==",
"version": "7.7.5",
"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.5.tgz",
"integrity": "sha512-KNlOe9+/nk4i29g0VXgl8PEXIRms5xKLJeuZ6UptN0fHv+jDiriG+y94X6qAgWTR0h3KaoM1wK5G5h7MHFRSig==",
"dev": true
},
"@types/caseless": {
@ -25,61 +25,65 @@
"electron": "*"
}
},
"@types/form-data": {
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/@types/form-data/-/form-data-2.2.1.tgz",
"integrity": "sha512-JAMFhOaHIciYVh8fb5/83nmuO/AHwmto+Hq7a9y8FzLDcC1KCU344XDOMEmahnrTFlHjgh4L0WJFczNIX2GxnQ==",
"dev": true,
"requires": {
"@types/node": "*"
}
},
"@types/fs-extra": {
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-7.0.0.tgz",
"integrity": "sha512-ndoMMbGyuToTy4qB6Lex/inR98nPiNHacsgMPvy+zqMLgSxbt8VtWpDArpGp69h1fEDQHn1KB+9DWD++wgbwYA==",
"version": "8.0.1",
"resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-8.0.1.tgz",
"integrity": "sha512-J00cVDALmi/hJOYsunyT52Hva5TnJeKP5yd1r+mH/ZU0mbYZflR0Z5kw5kITtKTRYMhm1JMClOFYdHnQszEvqw==",
"dev": true,
"requires": {
"@types/node": "*"
}
},
"@types/node": {
"version": "12.0.8",
"resolved": "https://registry.npmjs.org/@types/node/-/node-12.0.8.tgz",
"integrity": "sha512-b8bbUOTwzIY3V5vDTY1fIJ+ePKDUBqt2hC2woVGotdQQhG/2Sh62HOKHrT7ab+VerXAcPyAiTEipPu/FsreUtg==",
"version": "12.12.18",
"resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.18.tgz",
"integrity": "sha512-DBkZuIMFuAfjJHiunyRc+aNvmXYNwV1IPMgGKGlwCp6zh6MKrVtmvjSWK/axWcD25KJffkXgkfvFra8ndenXAw==",
"dev": true
},
"@types/request": {
"version": "2.48.1",
"resolved": "https://registry.npmjs.org/@types/request/-/request-2.48.1.tgz",
"integrity": "sha512-ZgEZ1TiD+KGA9LiAAPPJL68Id2UWfeSO62ijSXZjFJArVV+2pKcsVHmrcu+1oiE3q6eDGiFiSolRc4JHoerBBg==",
"version": "2.48.3",
"resolved": "https://registry.npmjs.org/@types/request/-/request-2.48.3.tgz",
"integrity": "sha512-3Wo2jNYwqgXcIz/rrq18AdOZUQB8cQ34CXZo+LUwPJNpvRAL86+Kc2wwI8mqpz9Cr1V+enIox5v+WZhy/p3h8w==",
"dev": true,
"requires": {
"@types/caseless": "*",
"@types/form-data": "*",
"@types/node": "*",
"@types/tough-cookie": "*"
"@types/tough-cookie": "*",
"form-data": "^2.5.0"
},
"dependencies": {
"form-data": {
"version": "2.5.1",
"resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz",
"integrity": "sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==",
"dev": true,
"requires": {
"asynckit": "^0.4.0",
"combined-stream": "^1.0.6",
"mime-types": "^2.1.12"
}
}
}
},
"@types/sharp": {
"version": "0.22.2",
"resolved": "https://registry.npmjs.org/@types/sharp/-/sharp-0.22.2.tgz",
"integrity": "sha512-oH49f42h3nf/qys0weYsaTGiMv67wPB769ynCoPfBAVwjjxFF3QtIPEe3MfhwyNjQAhQhTEfnmMKvVZfcFkhIw==",
"version": "0.23.1",
"resolved": "https://registry.npmjs.org/@types/sharp/-/sharp-0.23.1.tgz",
"integrity": "sha512-iBRM9RjRF9pkIkukk6imlxfaKMRuiRND8L0yYKl5PJu5uLvxuNzp5f0x8aoTG5VX85M8O//BwbttzFVZL1j/FQ==",
"dev": true,
"requires": {
"@types/node": "*"
}
},
"@types/tough-cookie": {
"version": "2.3.5",
"resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.5.tgz",
"integrity": "sha512-SCcK7mvGi3+ZNz833RRjFIxrn4gI1PPR3NtuIS+6vMkvmsGjosqTJwRt5bAEFLRz+wtJMWv8+uOnZf2hi2QXTg==",
"version": "2.3.6",
"resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.6.tgz",
"integrity": "sha512-wHNBMnkoEBiRAd3s8KTKwIuO9biFtTf0LehITzBhSco+HQI0xkXZbLOD55SW3Aqw3oUkHstkm5SPv58yaAdFPQ==",
"dev": true
},
"@types/uuid": {
"version": "3.4.4",
"resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-3.4.4.tgz",
"integrity": "sha512-tPIgT0GUmdJQNSHxp0X2jnpQfBSTfGxUMc/2CXBU2mnyTFVYVa2ojpoQ74w0U2yn2vw3jnC640+77lkFFpdVDw==",
"version": "3.4.6",
"resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-3.4.6.tgz",
"integrity": "sha512-cCdlC/1kGEZdEglzOieLDYBxHsvEOIg7kp/2FYyVR9Pxakq+Qf/inL3RKQ+PA8gOlI/NnL+fXmQH12nwcGzsHw==",
"dev": true,
"requires": {
"@types/node": "*"
@ -104,6 +108,14 @@
"dev": true,
"requires": {
"array-back": "^3.0.1"
},
"dependencies": {
"array-back": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/array-back/-/array-back-3.1.0.tgz",
"integrity": "sha512-TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q==",
"dev": true
}
}
},
"ansi-regex": {
@ -125,9 +137,9 @@
}
},
"array-back": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/array-back/-/array-back-3.1.0.tgz",
"integrity": "sha512-TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q==",
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/array-back/-/array-back-4.0.1.tgz",
"integrity": "sha512-Z/JnaVEXv+A9xabHzN43FiiiWEE7gPCRXMrVmRm00tWbjZRul1iHm7ECzlyNq1p4a4ATXz+G9FJ3GqGOkOV3fg==",
"dev": true
},
"array-find-index": {
@ -185,9 +197,9 @@
}
},
"bluebird": {
"version": "3.5.5",
"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz",
"integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==",
"version": "3.7.2",
"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
"integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
"dev": true
},
"brace-expansion": {
@ -207,25 +219,14 @@
"dev": true
},
"cache-point": {
"version": "0.4.1",
"resolved": "https://registry.npmjs.org/cache-point/-/cache-point-0.4.1.tgz",
"integrity": "sha512-4TgWfe9SF+bUy5cCql8gWHqKNrviufNwSYxLjf2utB0pY4+bdcuFwMmY1hDB+67Gz/L1vmhFNhePAjJTFBtV+Q==",
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/cache-point/-/cache-point-1.0.0.tgz",
"integrity": "sha512-ZqrZp9Hi5Uq7vfSGmNP2bUT/9DzZC2Y/GXjHB8rUJN1a+KLmbV05+vxHipNsg8+CSVgjcVVzLV8VZms6w8ZeRw==",
"dev": true,
"requires": {
"array-back": "^2.0.0",
"array-back": "^4.0.0",
"fs-then-native": "^2.0.0",
"mkdirp2": "^1.0.3"
},
"dependencies": {
"array-back": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/array-back/-/array-back-2.0.0.tgz",
"integrity": "sha512-eJv4pLLufP3g5kcZry0j6WXpIbzYw9GUB4mVJZno9wfwiBxbizTnHCw3VJb07cBihbFX48Y7oSrW9y+gt4glyw==",
"dev": true,
"requires": {
"typical": "^2.6.1"
}
}
"mkdirp2": "^1.0.4"
}
},
"cam": {
@ -254,12 +255,12 @@
"dev": true
},
"catharsis": {
"version": "0.8.10",
"resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.8.10.tgz",
"integrity": "sha512-l2OUaz/3PU3MZylspVFJvwHCVfWyvcduPq4lv3AzZ2pJzZCo7kNKFNyatwujD7XgvGkNAE/Jhhbh2uARNwNkfw==",
"version": "0.8.11",
"resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.8.11.tgz",
"integrity": "sha512-a+xUyMV7hD1BrDQA/3iPV7oc+6W26BgVJO05PGEoatMyIuPScQKsde6i3YorWX1qs+AZjnJ18NqdKoCtKiNh1g==",
"dev": true,
"requires": {
"lodash": "^4.17.11"
"lodash": "^4.17.14"
}
},
"cmd": {
@ -302,6 +303,12 @@
"typical": "^4.0.0"
},
"dependencies": {
"array-back": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/array-back/-/array-back-3.1.0.tgz",
"integrity": "sha512-TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q==",
"dev": true
},
"typical": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/typical/-/typical-4.0.0.tgz",
@ -358,16 +365,16 @@
}
},
"commander": {
"version": "2.20.0",
"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz",
"integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==",
"version": "2.20.3",
"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
"dev": true,
"optional": true
},
"common-sequence": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/common-sequence/-/common-sequence-1.0.2.tgz",
"integrity": "sha1-MOB/P49vf5s97oVPILLTnu4Ibeg=",
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/common-sequence/-/common-sequence-2.0.0.tgz",
"integrity": "sha512-f0QqPLpRTgMQn/pQIynf+SdE73Lw5Q1jn4hjirHLgH/NJ71TiHjXusV16BmOyuK5rRQ1W2f++II+TFZbQOh4hA==",
"dev": true
},
"concat-map": {
@ -498,29 +505,29 @@
"version": "file:lib/display"
},
"dmd": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/dmd/-/dmd-4.0.0.tgz",
"integrity": "sha512-J+4CgbQiMuJHiU9dvTVN8iOOZGeR3bef1wBqz6eVvvX17jkpkKVd8TeeutA/FJAeFbLQfXnyQ3o4qY7W+c5cxQ==",
"version": "4.0.6",
"resolved": "https://registry.npmjs.org/dmd/-/dmd-4.0.6.tgz",
"integrity": "sha512-7ZYAnFQ6jGm4SICArwqNPylJ83PaOdPTAkds3Z/s1ueFqSc5ilJ2F0b7uP+35W1PUbemH++gn5/VlC3KwEgiHQ==",
"dev": true,
"requires": {
"array-back": "^3.1.0",
"cache-point": "^0.4.1",
"common-sequence": "^1.0.2",
"file-set": "^2.0.0",
"handlebars": "^4.1.2",
"marked": "^0.6.2",
"array-back": "^4.0.1",
"cache-point": "^1.0.0",
"common-sequence": "^2.0.0",
"file-set": "^3.0.0",
"handlebars": "^4.5.3",
"marked": "^0.7.0",
"object-get": "^2.1.0",
"reduce-flatten": "^2.0.0",
"reduce-flatten": "^3.0.0",
"reduce-unique": "^2.0.1",
"reduce-without": "^1.0.1",
"test-value": "^3.0.0",
"walk-back": "^3.0.1"
"walk-back": "^4.0.0"
},
"dependencies": {
"reduce-flatten": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/reduce-flatten/-/reduce-flatten-2.0.0.tgz",
"integrity": "sha512-EJ4UNY/U1t2P/2k6oqotuX2Cc3T6nxJwsM0N0asT7dhrtH1ltUxDn4NalSYmPE2rCkVpcf/X6R0wDwcFpzhd4w==",
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/reduce-flatten/-/reduce-flatten-3.0.0.tgz",
"integrity": "sha512-eczl8wAYBxJ6Egl6I1ECIF+8z6sHu+KE7BzaEDZTpPXKXfy9SUDQlVYwkRcNTjJLC3Iakxbhss50KuT/R6SYfg==",
"dev": true
}
}
@ -661,24 +668,13 @@
}
},
"file-set": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/file-set/-/file-set-2.0.1.tgz",
"integrity": "sha512-XgOUUpgR6FbbfYcniLw0qm1Am7PnNYIAkd+eXxRt42LiYhjaso0WiuQ+VmrNdtwotyM+cLCfZ56AZrySP3QnKA==",
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/file-set/-/file-set-3.0.0.tgz",
"integrity": "sha512-B/SdeSIeRv7VlOgIjtH3dkxMI+tEy5m+OeCXfAUsirBoVoY+bGtsmvmmTFPm/G23TBY4RiTtjpcgePCfwXRjqA==",
"dev": true,
"requires": {
"array-back": "^2.0.0",
"glob": "^7.1.3"
},
"dependencies": {
"array-back": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/array-back/-/array-back-2.0.0.tgz",
"integrity": "sha512-eJv4pLLufP3g5kcZry0j6WXpIbzYw9GUB4mVJZno9wfwiBxbizTnHCw3VJb07cBihbFX48Y7oSrW9y+gt4glyw==",
"dev": true,
"requires": {
"typical": "^2.6.1"
}
}
"array-back": "^4.0.0",
"glob": "^7.1.5"
}
},
"filmout": {
@ -691,6 +687,14 @@
"dev": true,
"requires": {
"array-back": "^3.0.1"
},
"dependencies": {
"array-back": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/array-back/-/array-back-3.1.0.tgz",
"integrity": "sha512-TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q==",
"dev": true
}
}
},
"find-up": {
@ -770,9 +774,9 @@
}
},
"glob": {
"version": "7.1.4",
"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
"integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
"version": "7.1.6",
"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
"integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
"dev": true,
"requires": {
"fs.realpath": "^1.0.0",
@ -790,9 +794,9 @@
"dev": true
},
"handlebars": {
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.1.2.tgz",
"integrity": "sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw==",
"version": "4.5.3",
"resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.5.3.tgz",
"integrity": "sha512-3yPecJoJHK/4c6aZhSvxOyG4vJKDshV36VHp0iVCDVh7o9w2vwi3NSnL2MMPj3YdduqaBcu7cGbggJQM0br9xA==",
"dev": true,
"requires": {
"neo-async": "^2.6.0",
@ -929,22 +933,22 @@
"dev": true
},
"jsdoc": {
"version": "3.6.2",
"resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.2.tgz",
"integrity": "sha512-S2vzg99C5+gb7FWlrK4TVdyzVPGGkdvpDkCEJH1JABi2PKzPeLu5/zZffcJUifgWUJqXWl41Hoc+MmuM2GukIg==",
"version": "3.6.3",
"resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.3.tgz",
"integrity": "sha512-Yf1ZKA3r9nvtMWHO1kEuMZTlHOF8uoQ0vyo5eH7SQy5YeIiHM+B0DgKnn+X6y6KDYZcF7G2SPkKF+JORCXWE/A==",
"dev": true,
"requires": {
"@babel/parser": "^7.4.4",
"bluebird": "^3.5.4",
"catharsis": "^0.8.10",
"catharsis": "^0.8.11",
"escape-string-regexp": "^2.0.0",
"js2xmlparser": "^4.0.0",
"klaw": "^3.0.0",
"markdown-it": "^8.4.2",
"markdown-it-anchor": "^5.0.2",
"marked": "^0.6.2",
"marked": "^0.7.0",
"mkdirp": "^0.5.1",
"requizzle": "^0.2.2",
"requizzle": "^0.2.3",
"strip-json-comments": "^3.0.1",
"taffydb": "2.6.2",
"underscore": "~1.9.1"
@ -959,60 +963,78 @@
}
},
"jsdoc-api": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/jsdoc-api/-/jsdoc-api-5.0.1.tgz",
"integrity": "sha512-bntcT/3No4dPJZs9KX0AN3vrX/7P6PwDXVKANCXYpa0WJsbud41yAunoMxGFS4APHwmDoWl8E0ZuowLCOiOOFw==",
"version": "5.0.4",
"resolved": "https://registry.npmjs.org/jsdoc-api/-/jsdoc-api-5.0.4.tgz",
"integrity": "sha512-1KMwLnfo0FyhF06TQKzqIm8BiY1yoMIGICxRdJHUjzskaHMzHMmpLlmNFgzoa4pAC8t1CDPK5jWuQTvv1pBsEQ==",
"dev": true,
"requires": {
"array-back": "^3.1.0",
"cache-point": "^0.4.1",
"array-back": "^4.0.0",
"cache-point": "^1.0.0",
"collect-all": "^1.0.3",
"file-set": "^2.0.1",
"fs-then-native": "^2.0.0",
"jsdoc": "^3.6.1",
"jsdoc": "^3.6.3",
"object-to-spawn-args": "^1.1.1",
"temp-path": "^1.0.0",
"walk-back": "^3.0.1"
},
"dependencies": {
"file-set": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/file-set/-/file-set-2.0.1.tgz",
"integrity": "sha512-XgOUUpgR6FbbfYcniLw0qm1Am7PnNYIAkd+eXxRt42LiYhjaso0WiuQ+VmrNdtwotyM+cLCfZ56AZrySP3QnKA==",
"dev": true,
"requires": {
"array-back": "^2.0.0",
"glob": "^7.1.3"
},
"dependencies": {
"array-back": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/array-back/-/array-back-2.0.0.tgz",
"integrity": "sha512-eJv4pLLufP3g5kcZry0j6WXpIbzYw9GUB4mVJZno9wfwiBxbizTnHCw3VJb07cBihbFX48Y7oSrW9y+gt4glyw==",
"dev": true,
"requires": {
"typical": "^2.6.1"
}
}
}
},
"walk-back": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/walk-back/-/walk-back-3.0.1.tgz",
"integrity": "sha512-umiNB2qLO731Sxbp6cfZ9pwURJzTnftxE4Gc7hq8n/ehkuXC//s9F65IEIJA2ZytQZ1ZOsm/Fju4IWx0bivkUQ==",
"dev": true
}
}
},
"jsdoc-parse": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/jsdoc-parse/-/jsdoc-parse-3.0.1.tgz",
"integrity": "sha512-btZLp4wYl90vcAfgk4hoGQbO17iBVrhh3LJRMKZNtZgniO3F8H2CjxXld0owBIB1XxN+j3bAcWZnZKMnSj3iMA==",
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/jsdoc-parse/-/jsdoc-parse-4.0.1.tgz",
"integrity": "sha512-qIObw8yqYZjrP2qxWROB5eLQFLTUX2jRGLhW9hjo2CC2fQVlskidCIzjCoctwsDvauBp2a/lR31jkSleczSo8Q==",
"dev": true,
"requires": {
"array-back": "^2.0.0",
"array-back": "^4.0.0",
"lodash.omit": "^4.5.0",
"lodash.pick": "^4.4.0",
"reduce-extract": "^1.0.0",
"sort-array": "^2.0.0",
"test-value": "^3.0.0"
},
"dependencies": {
"array-back": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/array-back/-/array-back-2.0.0.tgz",
"integrity": "sha512-eJv4pLLufP3g5kcZry0j6WXpIbzYw9GUB4mVJZno9wfwiBxbizTnHCw3VJb07cBihbFX48Y7oSrW9y+gt4glyw==",
"dev": true,
"requires": {
"typical": "^2.6.1"
}
}
}
},
"jsdoc-to-markdown": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/jsdoc-to-markdown/-/jsdoc-to-markdown-5.0.0.tgz",
"integrity": "sha512-3gKEnbay7dSdyvtMDDkUf4r7pmBVgs3aqeT0Cg/ngTILPpJUzf8iKgASIo5psF007L45OIJtIuRX5VL/YUXKaA==",
"version": "5.0.3",
"resolved": "https://registry.npmjs.org/jsdoc-to-markdown/-/jsdoc-to-markdown-5.0.3.tgz",
"integrity": "sha512-tQv5tBV0fTYidRQtE60lJKxE98mmuLcYuITFDKQiDPE9hGccpeEGUNFcVkInq1vigyuPnZmt79bQ8wv2GKjY0Q==",
"dev": true,
"requires": {
"array-back": "^3.1.0",
"array-back": "^4.0.1",
"command-line-tool": "^0.8.0",
"config-master": "^3.1.0",
"dmd": "^4.0.0",
"jsdoc-api": "^5.0.1",
"jsdoc-parse": "^3.0.1",
"walk-back": "^3.0.1"
"dmd": "^4.0.5",
"jsdoc-api": "^5.0.4",
"jsdoc-parse": "^4.0.1",
"walk-back": "^4.0.0"
}
},
"json-schema": {
@ -1067,9 +1089,9 @@
"version": "file:lib/light"
},
"linkify-it": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.1.0.tgz",
"integrity": "sha512-4REs8/062kV2DSHxNfq5183zrqXMl7WP0WzABH9IeJI+NLm429FgE1PDecltYfnOoFDFlZGh2T8PfZn0r+GTRg==",
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.2.0.tgz",
"integrity": "sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw==",
"dev": true,
"requires": {
"uc.micro": "^1.0.1"
@ -1089,9 +1111,9 @@
}
},
"lodash": {
"version": "4.17.11",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
"integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
"version": "4.17.15",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
"integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
"dev": true
},
"lodash.camelcase": {
@ -1151,15 +1173,15 @@
}
},
"markdown-it-anchor": {
"version": "5.2.4",
"resolved": "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-5.2.4.tgz",
"integrity": "sha512-n8zCGjxA3T+Mx1pG8HEgbJbkB8JFUuRkeTZQuIM8iPY6oQ8sWOPRZJDFC9a/pNg2QkHEjjGkhBEl/RSyzaDZ3A==",
"version": "5.2.5",
"resolved": "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-5.2.5.tgz",
"integrity": "sha512-xLIjLQmtym3QpoY9llBgApknl7pxAcN3WDRc2d3rwpl+/YvDZHPmKscGs+L6E05xf2KrCXPBvosWt7MZukwSpQ==",
"dev": true
},
"marked": {
"version": "0.6.2",
"resolved": "https://registry.npmjs.org/marked/-/marked-0.6.2.tgz",
"integrity": "sha512-LqxwVH3P/rqKX4EKGz7+c2G9r98WeM/SW34ybhgNGhUQNKtf1GmmSkJ6cDGJ/t6tiyae49qRkpyTw2B9HOrgUA==",
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/marked/-/marked-0.7.0.tgz",
"integrity": "sha512-c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg==",
"dev": true
},
"mdurl": {
@ -1644,12 +1666,12 @@
}
},
"requizzle": {
"version": "0.2.2",
"resolved": "https://registry.npmjs.org/requizzle/-/requizzle-0.2.2.tgz",
"integrity": "sha512-oJ6y7JcUJkblRGhMByGNcszeLgU0qDxNKFCiUZR1XyzHyVsev+Mxb1tyygxLd1ORsKee1SA5BInFdUwY64GE/A==",
"version": "0.2.3",
"resolved": "https://registry.npmjs.org/requizzle/-/requizzle-0.2.3.tgz",
"integrity": "sha512-YanoyJjykPxGHii0fZP0uUPEXpvqfBDxWV7s6GKAiiOsiqhX6vHNyW3Qzdmqp/iq/ExbhaGbVrjB4ruEVSM4GQ==",
"dev": true,
"requires": {
"lodash": "^4.17.11"
"lodash": "^4.17.14"
}
},
"resolve": {
@ -1895,9 +1917,9 @@
"version": "file:lib/system"
},
"table-layout": {
"version": "0.4.4",
"resolved": "https://registry.npmjs.org/table-layout/-/table-layout-0.4.4.tgz",
"integrity": "sha512-uNaR3SRMJwfdp9OUr36eyEi6LLsbcTqTO/hfTsNviKsNeyMBPICJCC7QXRF3+07bAP6FRwA8rczJPBqXDc0CkQ==",
"version": "0.4.5",
"resolved": "https://registry.npmjs.org/table-layout/-/table-layout-0.4.5.tgz",
"integrity": "sha512-zTvf0mcggrGeTe/2jJ6ECkJHAQPIYEwDoqsiqBjI24mvRmQbInK5jq33fyypaCBxX08hMkfmdOqj6haT33EqWw==",
"dev": true,
"requires": {
"array-back": "^2.0.0",
@ -2013,9 +2035,9 @@
"dev": true
},
"typescript": {
"version": "3.5.2",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.5.2.tgz",
"integrity": "sha512-7KxJovlYhTX5RaRbUdkAXN1KUZ8PwWlTzQdHV6xNqvuFOs7+WBo10TQUqT19Q/Jz2hk5v9TQDIhyLhhJY4p5AA==",
"version": "3.7.3",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.7.3.tgz",
"integrity": "sha512-Mcr/Qk7hXqFBXMN7p7Lusj1ktCBydylfQM/FZCk5glCNQJrCUKPkMHdo9R0MTFWsC/4kPFvDS0fDPvukfCkFsw==",
"dev": true
},
"typical": {
@ -2031,13 +2053,13 @@
"dev": true
},
"uglify-js": {
"version": "3.6.0",
"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.0.tgz",
"integrity": "sha512-W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg==",
"version": "3.7.2",
"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.7.2.tgz",
"integrity": "sha512-uhRwZcANNWVLrxLfNFEdltoPNhECUR3lc+UdJoG9CBpMcSnKyWA94tc3eAujB1GcMY5Uwq8ZMp4qWpxWYDQmaA==",
"dev": true,
"optional": true,
"requires": {
"commander": "~2.20.0",
"commander": "~2.20.3",
"source-map": "~0.6.1"
}
},
@ -2096,9 +2118,9 @@
}
},
"walk-back": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/walk-back/-/walk-back-3.0.1.tgz",
"integrity": "sha512-umiNB2qLO731Sxbp6cfZ9pwURJzTnftxE4Gc7hq8n/ehkuXC//s9F65IEIJA2ZytQZ1ZOsm/Fju4IWx0bivkUQ==",
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/walk-back/-/walk-back-4.0.0.tgz",
"integrity": "sha512-kudCA8PXVQfrqv2mFTG72vDBRi8BKWxGgFLwPpzHcpZnSwZk93WMwUDVcLHWNsnm+Y0AC4Vb6MUNRgaHfyV2DQ==",
"dev": true
},
"wordwrap": {

16
package.json
View File

@ -1,6 +1,6 @@
{
"name": "mcopy",
"version": "1.4.18",
"version": "1.4.19",
"description": "Small gauge film optical printer platform",
"main": "build.js",
"directories": {
@ -26,13 +26,13 @@
"homepage": "https://github.com/sixteenmillimeter/mcopy#readme",
"devDependencies": {
"@types/electron": "^1.6.10",
"@types/fs-extra": "^7.0.0",
"@types/node": "^12.0.8",
"@types/request": "^2.48.1",
"@types/sharp": "^0.22.2",
"@types/uuid": "^3.4.4",
"jsdoc-to-markdown": "^5.0.0",
"typescript": "^3.5.2"
"@types/fs-extra": "^8.0.1",
"@types/node": "^12.12.18",
"@types/request": "^2.48.3",
"@types/sharp": "^0.23.1",
"@types/uuid": "^3.4.6",
"jsdoc-to-markdown": "^5.0.3",
"typescript": "^3.7.3"
},
"dependencies": {
"arduino": "file:lib/arduino",

11
src/sequencer/index.ts
View File

@ -2,6 +2,8 @@
import uuid from 'uuid/v4';
import Log = require('log');
import { powerSaveBlocker } from 'electron'
/** @module lib/sequencer **/
@ -25,6 +27,7 @@ class Sequencer {
private log : any;
private id : string = 'sequence';
private alerted : boolean = false;
private psbId : any;
/**
* @constructor
@ -145,6 +148,8 @@ class Sequencer {
let startTime : number = +new Date();
let ms : number;
this.psbId = powerSaveBlocker.start('prevent-display-sleep');
if (arg && arg.arr) {
this.arr = arg.arr; //overwrite sequence
} else {
@ -209,6 +214,9 @@ class Sequencer {
await this.cmd.proj.filmout.display.close();
}
powerSaveBlocker.stop(this.psbId)
this.psbId = null
ms = ( +new Date() ) - startTime;
//end sequence
this.log.info(`Ended sequence`);
@ -230,6 +238,9 @@ class Sequencer {
this.cmd.proj.filmout.display.close();
}
this.running = false;
if (this.psbId) {
powerSaveBlocker.stop(this.psbId);
}
//clear?
}