Skip to content

Commit c571e25

Browse files
author
ozelot379
committed
Improve error handling
1 parent 23b1101 commit c571e25

3 files changed

Lines changed: 21 additions & 13 deletions

File tree

‎README.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,11 @@ NODE_ENV=development yarn debug:webapp
8282
NODE_ENV=development yarn debug:cli
8383
```
8484

85+
## Build
86+
```bash
87+
yarn build
88+
```
89+
8590
# How this work
8691
This project uses the follow main features or external libraries:
8792

‎package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,9 @@
5757
"ConvertJavaTextureToBedrock": "dist/cli.js"
5858
},
5959
"scripts": {
60+
"build": "webpack --config ./webpack.config.cli.js && webpack --config ./webpack.config.webapp.js",
6061
"debug:cli": "webpack --config ./webpack.config.cli.js && node ./dist/cli.js",
6162
"debug:webapp": "webpack-dev-server --config ./webpack.config.webapp.js",
62-
"prepublishOnly": "webpack --config ./webpack.config.cli.js && webpack --config ./webpack.config.webapp.js && gh-pages -d ./dist/webapp"
63+
"prepublishOnly": "yarn build && gh-pages -d ./dist/webapp"
6364
}
6465
}

‎src/webapp/js/index.js‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@ document.addEventListener("DOMContentLoaded", () => {
1919
main.addEventListener("dragover", startConvertDrop);
2020
main.addEventListener("drop", startConvertDrop);
2121

22-
const worker = new Worker();
23-
worker.addEventListener("message", afterConvert);
24-
worker.addEventListener("error", errorConvert);
22+
let worker = null;
2523

2624
const logs = document.createElement("ul");
2725
logs.classList.add("log");
@@ -52,7 +50,7 @@ document.addEventListener("DOMContentLoaded", () => {
5250
logs.innerHTML = "";
5351

5452
swal({
55-
title: "Conversion",
53+
title: "Conversion in progress",
5654
content: logs,
5755
buttons: {
5856
save: {
@@ -65,8 +63,13 @@ document.addEventListener("DOMContentLoaded", () => {
6563
});
6664
document.querySelector(".swal-button--loading").disabled = true;
6765

68-
_log("Start conversion");
69-
66+
if (worker !== null) {
67+
worker.terminate();
68+
worker = null;
69+
}
70+
worker = new Worker();
71+
worker.addEventListener("message", afterConvert);
72+
worker.addEventListener("error", errorConvert);
7073
worker.postMessage(input);
7174
}
7275

@@ -100,7 +103,7 @@ document.addEventListener("DOMContentLoaded", () => {
100103
* @returns {Promise<>}
101104
*/
102105
async function afterConvert(e) {
103-
const {log, err, output} = e.data;
106+
const {log, output} = e.data;
104107

105108
if (log) {
106109
_log(log);
@@ -117,8 +120,6 @@ document.addEventListener("DOMContentLoaded", () => {
117120
buttons: "Save"
118121
});
119122

120-
_log("Conversion finished");
121-
122123
if (await savePopup) {
123124
if (output instanceof File) {
124125
fileSaver(output);
@@ -130,18 +131,19 @@ document.addEventListener("DOMContentLoaded", () => {
130131
}
131132

132133
/**
133-
* @param {Error} err
134+
* @param {ErrorEvent} err
134135
*/
135136
function errorConvert(err) {
137+
// Allow select same file again
138+
selectInputFileButton.value = selectInputFolderButton.value = "";
139+
136140
_log(`ERROR: ${err.message}`);
137141

138142
swal({
139143
title: "Conversion was failed",
140144
content: logs,
141145
icon: "error"
142146
});
143-
144-
_log("Conversion failed");
145147
}
146148

147149
/**

0 commit comments

Comments
 (0)