Skip to content

Commit 2e8323d

Browse files
author
ozelot379
committed
Improve error handling
1 parent c571e25 commit 2e8323d

2 files changed

Lines changed: 14 additions & 93 deletions

File tree

‎src/webapp/js/index.js‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ document.addEventListener("DOMContentLoaded", () => {
6363
});
6464
document.querySelector(".swal-button--loading").disabled = true;
6565

66+
_log("Start conversion");
67+
6668
if (worker !== null) {
6769
worker.terminate();
6870
worker = null;
@@ -120,6 +122,8 @@ document.addEventListener("DOMContentLoaded", () => {
120122
buttons: "Save"
121123
});
122124

125+
_log("Conversion finished");
126+
123127
if (await savePopup) {
124128
if (output instanceof File) {
125129
fileSaver(output);
@@ -137,13 +141,13 @@ document.addEventListener("DOMContentLoaded", () => {
137141
// Allow select same file again
138142
selectInputFileButton.value = selectInputFolderButton.value = "";
139143

140-
_log(`ERROR: ${err.message}`);
141-
142144
swal({
143145
title: "Conversion was failed",
144146
content: logs,
145147
icon: "error"
146148
});
149+
150+
_log(`ERROR: ${err.message}`);
147151
}
148152

149153
/**

‎yarn.lock‎

Lines changed: 8 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -989,11 +989,6 @@
989989
resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
990990
integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
991991

992-
abbrev@1:
993-
version "1.1.1"
994-
resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
995-
integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
996-
997992
accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7:
998993
version "1.3.7"
999994
resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
@@ -2189,7 +2184,7 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.1:
21892184
dependencies:
21902185
ms "2.0.0"
21912186

2192-
debug@^3.0.0, debug@^3.1.1, debug@^3.2.5, debug@^3.2.6:
2187+
debug@^3.0.0, debug@^3.1.1, debug@^3.2.5:
21932188
version "3.2.6"
21942189
resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
21952190
integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
@@ -2320,7 +2315,7 @@ detect-file@^1.0.0:
23202315
resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
23212316
integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=
23222317

2323-
detect-libc@^1.0.2, detect-libc@^1.0.3:
2318+
detect-libc@^1.0.3:
23242319
version "1.0.3"
23252320
resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
23262321
integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
@@ -3452,7 +3447,7 @@ humanize-url@^1.0.0:
34523447
normalize-url "^1.0.0"
34533448
strip-url-auth "^1.0.0"
34543449

3455-
iconv-lite@0.4.24, iconv-lite@^0.4.4:
3450+
iconv-lite@0.4.24:
34563451
version "0.4.24"
34573452
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
34583453
integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
@@ -3476,13 +3471,6 @@ iferr@^0.1.5:
34763471
resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
34773472
integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
34783473

3479-
ignore-walk@^3.0.1:
3480-
version "3.0.3"
3481-
resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37"
3482-
integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==
3483-
dependencies:
3484-
minimatch "^3.0.4"
3485-
34863474
image-size@^0.5.0, image-size@~0.5.0:
34873475
version "0.5.5"
34883476
resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"
@@ -4493,15 +4481,6 @@ napi-build-utils@^1.0.1:
44934481
resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.1.tgz#1381a0f92c39d66bf19852e7873432fc2123e508"
44944482
integrity sha512-boQj1WFgQH3v4clhu3mTNfP+vOBxorDlE8EKiMjUlLG3C4qAESnn9AxIOkFgTR2c9LtzNjPrjS60cT27ZKBhaA==
44954483

4496-
needle@^2.2.1:
4497-
version "2.4.0"
4498-
resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.0.tgz#6833e74975c444642590e15a750288c5f939b57c"
4499-
integrity sha512-4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg==
4500-
dependencies:
4501-
debug "^3.2.6"
4502-
iconv-lite "^0.4.4"
4503-
sax "^1.2.4"
4504-
45054484
negotiator@0.6.2:
45064485
version "0.6.2"
45074486
resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
@@ -4565,22 +4544,6 @@ node-libs-browser@^2.2.1:
45654544
util "^0.11.0"
45664545
vm-browserify "^1.0.1"
45674546

4568-
node-pre-gyp@*:
4569-
version "0.14.0"
4570-
resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83"
4571-
integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA==
4572-
dependencies:
4573-
detect-libc "^1.0.2"
4574-
mkdirp "^0.5.1"
4575-
needle "^2.2.1"
4576-
nopt "^4.0.1"
4577-
npm-packlist "^1.1.6"
4578-
npmlog "^4.0.2"
4579-
rc "^1.2.7"
4580-
rimraf "^2.6.1"
4581-
semver "^5.3.0"
4582-
tar "^4.4.2"
4583-
45844547
node-releases@^1.1.42:
45854548
version "1.1.42"
45864549
resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.42.tgz#a999f6a62f8746981f6da90627a8d2fc090bbad7"
@@ -4593,14 +4556,6 @@ noop-logger@^0.1.1:
45934556
resolved "https://registry.yarnpkg.com/noop-logger/-/noop-logger-0.1.1.tgz#94a2b1633c4f1317553007d8966fd0e841b6a4c2"
45944557
integrity sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI=
45954558

4596-
nopt@^4.0.1:
4597-
version "4.0.1"
4598-
resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
4599-
integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=
4600-
dependencies:
4601-
abbrev "1"
4602-
osenv "^0.1.4"
4603-
46044559
normalize-path@^2.1.1:
46054560
version "2.1.1"
46064561
resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
@@ -4628,34 +4583,14 @@ normalize-url@^3.0.0:
46284583
resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559"
46294584
integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==
46304585

4631-
npm-bundled@^1.0.1:
4632-
version "1.1.1"
4633-
resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b"
4634-
integrity sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==
4635-
dependencies:
4636-
npm-normalize-package-bin "^1.0.1"
4637-
4638-
npm-normalize-package-bin@^1.0.1:
4639-
version "1.0.1"
4640-
resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
4641-
integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==
4642-
4643-
npm-packlist@^1.1.6:
4644-
version "1.4.7"
4645-
resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.7.tgz#9e954365a06b80b18111ea900945af4f88ed4848"
4646-
integrity sha512-vAj7dIkp5NhieaGZxBJB8fF4R0078rqsmhJcAfXZ6O7JJhjhPK96n5Ry1oZcfLXgfun0GWTZPOxaEyqv8GBykQ==
4647-
dependencies:
4648-
ignore-walk "^3.0.1"
4649-
npm-bundled "^1.0.1"
4650-
46514586
npm-run-path@^2.0.0:
46524587
version "2.0.2"
46534588
resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
46544589
integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
46554590
dependencies:
46564591
path-key "^2.0.0"
46574592

4658-
npmlog@^4.0.1, npmlog@^4.0.2, npmlog@^4.1.2:
4593+
npmlog@^4.0.1, npmlog@^4.1.2:
46594594
version "4.1.2"
46604595
resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
46614596
integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
@@ -4809,11 +4744,6 @@ os-browserify@^0.3.0:
48094744
resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
48104745
integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=
48114746

4812-
os-homedir@^1.0.0:
4813-
version "1.0.2"
4814-
resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
4815-
integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
4816-
48174747
os-locale@^3.0.0, os-locale@^3.1.0:
48184748
version "3.1.0"
48194749
resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a"
@@ -4823,19 +4753,6 @@ os-locale@^3.0.0, os-locale@^3.1.0:
48234753
lcid "^2.0.0"
48244754
mem "^4.0.0"
48254755

4826-
os-tmpdir@^1.0.0:
4827-
version "1.0.2"
4828-
resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
4829-
integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
4830-
4831-
osenv@^0.1.4:
4832-
version "0.1.5"
4833-
resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
4834-
integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
4835-
dependencies:
4836-
os-homedir "^1.0.0"
4837-
os-tmpdir "^1.0.0"
4838-
48394756
p-defer@^1.0.0:
48404757
version "1.0.0"
48414758
resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
@@ -5840,7 +5757,7 @@ rgba-regex@^1.0.0:
58405757
resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3"
58415758
integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=
58425759

5843-
rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3:
5760+
rimraf@^2.5.4, rimraf@^2.6.2, rimraf@^2.6.3:
58445761
version "2.7.1"
58455762
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
58465763
integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
@@ -5884,7 +5801,7 @@ safe-regex@^1.1.0:
58845801
resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
58855802
integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
58865803

5887-
sax@>=0.6.0, sax@^1.2.4, sax@~1.2.4:
5804+
sax@>=0.6.0, sax@~1.2.4:
58885805
version "1.2.4"
58895806
resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
58905807
integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
@@ -5926,7 +5843,7 @@ selfsigned@^1.10.7:
59265843
dependencies:
59275844
node-forge "0.9.0"
59285845

5929-
semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.6.0:
5846+
semver@^5.4.1, semver@^5.5.0, semver@^5.6.0:
59305847
version "5.7.1"
59315848
resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
59325849
integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
@@ -6475,7 +6392,7 @@ tar-stream@^2.0.0:
64756392
inherits "^2.0.3"
64766393
readable-stream "^3.1.1"
64776394

6478-
tar@^4.4.2, tar@^4.4.8:
6395+
tar@^4.4.8:
64796396
version "4.4.13"
64806397
resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
64816398
integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==

0 commit comments

Comments
 (0)