Skip to content

Commit 6bbbd2a

Browse files
committed
this should be a beta
1 parent 3491256 commit 6bbbd2a

File tree

2 files changed

+13
-19
lines changed

2 files changed

+13
-19
lines changed

package.json

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "aminosee",
3-
"version": "1.31.9",
3+
"version": "1.32.0",
44
"owner": "Thomas Bieder Atkinson",
55
"author": "Tom Atkinson <tom@funk.co.nz>",
66
"website": "http://aminosee.funk.nz",
@@ -81,12 +81,12 @@
8181
"node-fetch": "^2.6.1",
8282
"open": "^6.4.0",
8383
"parallax-js": "^3.1.0",
84-
"phoenix": "^1.5.4",
84+
"phoenix": "^1.5.6",
8585
"preferences": "^1.0.2",
8686
"terminal-kit": "^1.43.0",
8787
"three": "^0.118.3",
8888
"vows": "^0.8.3",
89-
"xterm": "^4.8.1"
89+
"xterm": "^4.9.0"
9090
},
9191
"devDependencies": {
9292
"@gmod/indexedfasta": "^1.0.13",
@@ -99,14 +99,14 @@
9999
"carlo": "^0.9.46",
100100
"cross-spawn": "^6.0.5",
101101
"cucumber": "^5.1.0",
102-
"cypress": "^5.1.0",
102+
"cypress": "^5.4.0",
103103
"dat.gui": "^0.7.7",
104104
"ecstatic": "^4.1.4",
105-
"eslint": "^7.8.1",
105+
"eslint": "^7.11.0",
106106
"eslint-config-rallycoding": "^3.2.0",
107107
"event-stream": "^4.0.1",
108108
"get-cursor-position": "^1.0.5",
109-
"humanize-duration": "^3.23.1",
109+
"humanize-duration": "^3.24.0",
110110
"husky": "^3.1.0",
111111
"keypress": "^0.2.1",
112112
"lazyness": "^1.2.0",
@@ -127,7 +127,7 @@
127127
"sliced": "^1.0.1",
128128
"spdy": "^4.0.2",
129129
"stream-file": "^0.2.4",
130-
"systeminformation": "^4.27.3",
130+
"systeminformation": "^4.27.9",
131131
"tcp-port-used": "^1.0.1",
132132
"through": "^2.3.8",
133133
"uniq": "^1.0.1",
@@ -153,8 +153,7 @@
153153
"macos",
154154
"win"
155155
],
156-
"scripts": [
157-
],
156+
"scripts": [],
158157
"assets": [
159158
"node_modules/terminal-kit/lib/Palette.js",
160159
"node_modules/terminal-kit/lib/image.js",

src/aminosee-cli.js

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1697,9 +1697,9 @@ function pushCli(cs) {
16971697
return false
16981698
}
16991699
if (!this.checkFileExtension( this.dnafile )) {
1700-
let msg = `${ batchProgress() } wrong file extension: ${cfile}. Must be one of ${ extensions }`
1701-
output(msg)
1702-
if ( remain > 0 && !renderLock) {
1700+
let msg = ` ${ batchProgress() } wrong file extension: ${cfile}. Must be one of ${ extensions }`
1701+
output( maxWidth( tx-2, msg) )
1702+
if ( remain >= 1 && !renderLock) {
17031703
this.preRenderReset(msg)
17041704
} else {
17051705
error("Bargle!")
@@ -1777,10 +1777,7 @@ function pushCli(cs) {
17771777
if ( verbose ) {
17781778
mode(`terminal image`)
17791779
termDrawImage(this.filePNG, msg, () => {
1780-
setTimeout( () => {
1781-
mode( `image printed to term. rendering: ${renderLock}`)
1782-
1783-
}, raceDelay)
1780+
out(status)
17841781
})
17851782
}
17861783
if ( !this.force ) {
@@ -1808,8 +1805,6 @@ function pushCli(cs) {
18081805

18091806

18101807

1811-
1812-
18131808
if ( renderLock === false) {
18141809
mode(`Lock OK proceeding to render ${ this.justNameOfPNG } in ${ raceDelay } ms... ${ this.busy() }`)
18151810
log( status )
@@ -4774,7 +4769,7 @@ function pushCli(cs) {
47744769

47754770
}
47764771
function batchProgress() {
4777-
return `[${ 1 + batchSize - remain} / ${batchSize} : ${cliInstance.usersPeptide} ${renderLock ? nicePercent( cliInstance.percentComplete ) + ' busy ' + streamLineNr : 'idle'} ${ highlightFilename (this.focus)} ${cfile} ${ brute ? 'brute force': ''}]`
4772+
return `[${ 1 + batchSize - remain} / ${batchSize} : ${cliInstance.usersPeptide} ${renderLock ? nicePercent( cliInstance.percentComplete ) + '_busy_' + streamLineNr : '_'} ${ highlightFilename (this.focus)} ${cfile} ${ brute ? 'brute force': ''}]`
47784773
}
47794774
function wTitle(txt) {
47804775
terminateIfUndef(txt)

0 commit comments

Comments
 (0)