From c784399a6b50f36f5d3302d07a6ab6310eb00afe Mon Sep 17 00:00:00 2001 From: HaveAGitGat <43864057+HaveAGitGat@users.noreply.github.com> Date: Fri, 15 May 2020 00:43:20 +0100 Subject: [PATCH 1/6] package update --- package-lock.json | 266 +++++++++++++++++++++------------------------- package.json | 24 ++--- 2 files changed, 135 insertions(+), 155 deletions(-) diff --git a/package-lock.json b/package-lock.json index aa6733f5..c7375750 100644 --- a/package-lock.json +++ b/package-lock.json @@ -72,17 +72,17 @@ "integrity": "sha512-mO5GWzBPsPf6865iIbzNE0AvkKF3NE+2S3eRUpE+FE07BOAkXh6G+GW/Pj01hhXjve1WScbaIO4UlY1JKeqCcA==" }, "@babel/runtime": { - "version": "7.9.2", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz", - "integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz", + "integrity": "sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==", "requires": { "regenerator-runtime": "^0.13.4" } }, "@babel/runtime-corejs3": { - "version": "7.8.7", - "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.8.7.tgz", - "integrity": "sha512-sc7A+H4I8kTd7S61dgB9RomXu/C+F4IrRr4Ytze4dnfx7AXEpCrejSNpjx7vq6y/Bak9S6Kbk65a/WgMLtg43Q==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.9.6.tgz", + "integrity": "sha512-6toWAfaALQjt3KMZQc6fABqZwUDDuWzz+cAfPhqyEnzxvdWOAkjwPNxgF8xlmo7OWLsSjaKjsskpKHRLaMArOA==", "requires": { "core-js-pure": "^3.0.0", "regenerator-runtime": "^0.13.4" @@ -302,44 +302,34 @@ "optional": true }, "@material-ui/core": { - "version": "4.9.8", - "resolved": "https://registry.npmjs.org/@material-ui/core/-/core-4.9.8.tgz", - "integrity": "sha512-4cslpG6oLoPWUfwPkX+hvbak4hAGiOfgXOu/UIYeeMrtsTEebC0Mirjoby7zhS4ny86YI3rXEFW6EZDmlj5n5w==", + "version": "4.9.14", + "resolved": "https://registry.npmjs.org/@material-ui/core/-/core-4.9.14.tgz", + "integrity": "sha512-71oYrOpInx5honJ9GzZlygPjmsFhn7Bui61/SWLJsPTkMnfvuZfU3qVqlEHjXyDsnZ+uKmLAIdsrOYnphJxxXw==", "requires": { "@babel/runtime": "^7.4.4", - "@material-ui/styles": "^4.9.6", - "@material-ui/system": "^4.9.6", - "@material-ui/types": "^5.0.0", - "@material-ui/utils": "^4.9.6", + "@material-ui/styles": "^4.9.14", + "@material-ui/system": "^4.9.14", + "@material-ui/types": "^5.1.0", + "@material-ui/utils": "^4.9.12", "@types/react-transition-group": "^4.2.0", - "clsx": "^1.0.2", + "clsx": "^1.0.4", "hoist-non-react-statics": "^3.3.2", - "popper.js": "^1.14.1", + "popper.js": "^1.16.1-lts", "prop-types": "^15.7.2", "react-is": "^16.8.0", - "react-transition-group": "^4.3.0" - }, - "dependencies": { - "hoist-non-react-statics": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz", - "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==", - "requires": { - "react-is": "^16.7.0" - } - } + "react-transition-group": "^4.4.0" } }, "@material-ui/styles": { - "version": "4.9.6", - "resolved": "https://registry.npmjs.org/@material-ui/styles/-/styles-4.9.6.tgz", - "integrity": "sha512-ijgwStEkw1OZ6gCz18hkjycpr/3lKs1hYPi88O/AUn4vMuuGEGAIrqKVFq/lADmZUNF3DOFIk8LDkp7zmjPxtA==", + "version": "4.9.14", + "resolved": "https://registry.npmjs.org/@material-ui/styles/-/styles-4.9.14.tgz", + "integrity": "sha512-zecwWKgRU2VzdmutNovPB4s5LKI0TWyZKc/AHfPu9iY8tg4UoLjpa4Rn9roYrRfuTbBZHI6b0BXcQ8zkis0nzQ==", "requires": { "@babel/runtime": "^7.4.4", "@emotion/hash": "^0.8.0", - "@material-ui/types": "^5.0.0", + "@material-ui/types": "^5.1.0", "@material-ui/utils": "^4.9.6", - "clsx": "^1.0.2", + "clsx": "^1.0.4", "csstype": "^2.5.2", "hoist-non-react-statics": "^3.3.2", "jss": "^10.0.3", @@ -351,37 +341,28 @@ "jss-plugin-rule-value-function": "^10.0.3", "jss-plugin-vendor-prefixer": "^10.0.3", "prop-types": "^15.7.2" - }, - "dependencies": { - "hoist-non-react-statics": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz", - "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==", - "requires": { - "react-is": "^16.7.0" - } - } } }, "@material-ui/system": { - "version": "4.9.6", - "resolved": "https://registry.npmjs.org/@material-ui/system/-/system-4.9.6.tgz", - "integrity": "sha512-QtfoAePyqXoZ2HUVSwGb1Ro0kucMCvVjbI0CdYIR21t0Opgfm1Oer6ni9P5lfeXA39xSt0wCierw37j+YES48Q==", + "version": "4.9.14", + "resolved": "https://registry.npmjs.org/@material-ui/system/-/system-4.9.14.tgz", + "integrity": "sha512-oQbaqfSnNlEkXEziDcJDDIy8pbvwUmZXWNqlmIwDqr/ZdCK8FuV3f4nxikUh7hvClKV2gnQ9djh5CZFTHkZj3w==", "requires": { "@babel/runtime": "^7.4.4", "@material-ui/utils": "^4.9.6", + "csstype": "^2.5.2", "prop-types": "^15.7.2" } }, "@material-ui/types": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@material-ui/types/-/types-5.0.0.tgz", - "integrity": "sha512-UeH2BuKkwDndtMSS0qgx1kCzSMw+ydtj0xx/XbFtxNSTlXydKwzs5gVW5ZKsFlAkwoOOQ9TIsyoCC8hq18tOwg==" + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/@material-ui/types/-/types-5.1.0.tgz", + "integrity": "sha512-7cqRjrY50b8QzRSYyhSpx4WRw2YuO0KKIGQEVk5J8uoz2BanawykgZGoWEqKm7pVIbzFDN0SpPcVV4IhOFkl8A==" }, "@material-ui/utils": { - "version": "4.9.6", - "resolved": "https://registry.npmjs.org/@material-ui/utils/-/utils-4.9.6.tgz", - "integrity": "sha512-gqlBn0JPPTUZeAktn1rgMcy9Iczrr74ecx31tyZLVGdBGGzsxzM6PP6zeS7FuoLS6vG4hoZP7hWnOoHtkR0Kvw==", + "version": "4.9.12", + "resolved": "https://registry.npmjs.org/@material-ui/utils/-/utils-4.9.12.tgz", + "integrity": "sha512-/0rgZPEOcZq5CFA4+4n6Q6zk7fi8skHhH2Bcra8R3epoJEYy5PL55LuMazPtPH1oKeRausDV/Omz4BbgFsn1HQ==", "requires": { "@babel/runtime": "^7.4.4", "prop-types": "^15.7.2", @@ -389,9 +370,9 @@ } }, "@popperjs/core": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.2.0.tgz", - "integrity": "sha512-CxL7vhVO+m7RoyCSZQqf3NRD1UzWFXdasfyj3PsadWPfRdPB9UO/PjYwTILBaHc2RDPlZUeFtz8sfPVuSyshIA==" + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.4.0.tgz", + "integrity": "sha512-NMrDy6EWh9TPdSRiHmHH2ye1v5U0gBD7pRYwSwJvomx7Bm4GG04vu63dYiVzebLOx2obPpJugew06xVP0Nk7hA==" }, "@restart/context": { "version": "2.1.4", @@ -399,9 +380,9 @@ "integrity": "sha512-INJYZQJP7g+IoDUh/475NlGiTeMfwTXUEr3tmRneckHIxNolGOW9CTq83S8cxq0CgJwwcMzMJFchxvlwe7Rk8Q==" }, "@restart/hooks": { - "version": "0.3.22", - "resolved": "https://registry.npmjs.org/@restart/hooks/-/hooks-0.3.22.tgz", - "integrity": "sha512-tW0T3hP6emYNOc76/iC96rlu+f7JYLSVk/Wnn+7dj1gJUcw4CkQNLy16vx2mBLtVKsFMZ9miVEZXat8blruDHQ==", + "version": "0.3.25", + "resolved": "https://registry.npmjs.org/@restart/hooks/-/hooks-0.3.25.tgz", + "integrity": "sha512-m2v3N5pxTsIiSH74/sb1yW8D9RxkJidGW+5Mfwn/lHb2QzhZNlaU1su7abSyT9EGf0xS/0waLjrf7/XxQHUk7w==", "requires": { "lodash": "^4.17.15", "lodash-es": "^4.17.15" @@ -442,6 +423,11 @@ "@types/react": "*" } }, + "@types/warning": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/warning/-/warning-3.0.0.tgz", + "integrity": "sha1-DSUBJorY+ZYrdA04fEZU9fjiPlI=" + }, "JSONStream": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz", @@ -760,9 +746,9 @@ "integrity": "sha1-9y12C+Cbf3bQjtj66Ysomo0F+rM=" }, "bootstrap": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.4.1.tgz", - "integrity": "sha512-tbx5cHubwE6e2ZG7nqM3g/FZ5PQEDMWmMGNrCUBVRPHXTJaH7CBDdsLeu3eCh3B1tzAxTnAbtmrzvWEvT2NNEA==" + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.5.0.tgz", + "integrity": "sha512-Z93QoXvodoVslA+PWNdk23Hze4RBYIkpb5h8I2HY2Tu2h7A0LpAgLcyrhrSUyo2/Oxm2l1fRZPs1e5hnxnliXA==" }, "brace-expansion": { "version": "1.1.11", @@ -855,9 +841,9 @@ "integrity": "sha1-sffn/HPSXn/R1FWtyU4UODAYK1o=" }, "chokidar": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.3.1.tgz", - "integrity": "sha512-4QYCEWOcK3OJrxwvyyAOxFuhpvOVCYkr33LPfFNBjAD/w3sEzWsp2BUOkI4l9bHvWioAd0rc6NlHUOEaWkTeqg==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.0.tgz", + "integrity": "sha512-aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ==", "requires": { "anymatch": "~3.1.1", "braces": "~3.0.2", @@ -866,7 +852,7 @@ "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", "normalize-path": "~3.0.0", - "readdirp": "~3.3.0" + "readdirp": "~3.4.0" } }, "classnames": { @@ -985,9 +971,9 @@ "integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==" }, "core-js-pure": { - "version": "3.6.4", - "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.6.4.tgz", - "integrity": "sha512-epIhRLkXdgv32xIUFaaAry2wdxZYBi6bgM7cB136dzzXXa+dFyRLTZeLUJxnd8ShrmyVXBub63n2NHo2JAt8Cw==" + "version": "3.6.5", + "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.6.5.tgz", + "integrity": "sha512-lacdXOimsiD0QyNf9BC/mxivNJ/ybBGJXQFKzRekp1WTHoVUWsUHEn+2T8GJAzzIhyOuXA+gOxCVN3l+5PLPUA==" }, "core-util-is": { "version": "1.0.2", @@ -1067,11 +1053,11 @@ } }, "css-vendor": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/css-vendor/-/css-vendor-2.0.7.tgz", - "integrity": "sha512-VS9Rjt79+p7M0WkPqcAza4Yq1ZHrsHrwf7hPL/bjQB+c1lwmAI+1FXxYTYt818D/50fFVflw0XKleiBN5RITkg==", + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/css-vendor/-/css-vendor-2.0.8.tgz", + "integrity": "sha512-x9Aq0XTInxrkuFeHKbYC7zWY8ai7qJ04Kxd9MnvbC1uO5DagxoHQjm4JvG+vCdXOoFtCjbL2XSZfxmoYa9uQVQ==", "requires": { - "@babel/runtime": "^7.6.2", + "@babel/runtime": "^7.8.3", "is-in-browser": "^1.0.2" } }, @@ -1365,9 +1351,9 @@ } }, "eslint-config-prettier": { - "version": "6.10.1", - "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-6.10.1.tgz", - "integrity": "sha512-svTy6zh1ecQojvpbJSgH3aei/Rt7C6i090l5f2WQ4aB05lYHeZIR1qL4wZyyILTbtmnbHP5Yn8MrsOJMGa8RkQ==", + "version": "6.11.0", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-6.11.0.tgz", + "integrity": "sha512-oB8cpLWSAjOVFEJhhyMZh6NOEOtBVziaqdDQ86+qhDHFbZXoRTM7pNSvFRfW/W/L/LrQ38C99J5CGuRBBzBsdA==", "requires": { "get-stdin": "^6.0.0" } @@ -1472,17 +1458,17 @@ } }, "eslint-plugin-prettier": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.2.tgz", - "integrity": "sha512-GlolCC9y3XZfv3RQfwGew7NnuFDKsfI4lbvRK+PIIo23SFH+LemGs4cKwzAaRa+Mdb+lQO/STaIayno8T5sJJA==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.3.tgz", + "integrity": "sha512-+HG5jmu/dN3ZV3T6eCD7a4BlAySdN7mLIbJYo0z1cFQuI+r2DiTJEFeF68ots93PsnrMxbzIZ2S/ieX+mkrBeQ==", "requires": { "prettier-linter-helpers": "^1.0.0" } }, "eslint-plugin-react": { - "version": "7.19.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.19.0.tgz", - "integrity": "sha512-SPT8j72CGuAP+JFbT0sJHOB80TX/pu44gQ4vXH/cq+hQTiY2PuZ6IHkqXJV6x1b28GDdo1lbInjKUrrdUf0LOQ==", + "version": "7.20.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.20.0.tgz", + "integrity": "sha512-rqe1abd0vxMjmbPngo4NaYxTcR3Y4Hrmc/jg4T+sYz63yqlmJRknpEQfmWY+eDWPuMmix6iUIK+mv0zExjeLgA==", "requires": { "array-includes": "^3.1.1", "doctrine": "^2.1.0", @@ -1493,7 +1479,6 @@ "object.values": "^1.1.1", "prop-types": "^15.7.2", "resolve": "^1.15.1", - "semver": "^6.3.0", "string.prototype.matchall": "^4.0.2", "xregexp": "^4.3.0" }, @@ -1507,9 +1492,9 @@ } }, "resolve": { - "version": "1.15.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz", - "integrity": "sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==", + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz", + "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==", "requires": { "path-parse": "^1.0.6" } @@ -1764,9 +1749,9 @@ "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, "fsevents": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz", - "integrity": "sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz", + "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==", "optional": true }, "fstream": { @@ -1850,11 +1835,6 @@ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz", "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==" }, - "gud": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/gud/-/gud-1.0.0.tgz", - "integrity": "sha512-zGEOVKFM5sVPPrYs7J5/hYEw2Pof8KCyOwyhG8sAF26mCAeUFAcYPu1mwB7hhpIP29zOIBaDqwuHdLp0jvZXjw==" - }, "har-schema": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", @@ -1901,9 +1881,9 @@ } }, "hoist-non-react-statics": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz", - "integrity": "sha512-0XsbTXxgiaCDYDIWFcwkmerZPSwywfUqYmwT4jzewKTQSWoE6FCMoUVOeBJWK3E/CrWbxRG3m5GzY4lnIwGRBA==", + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz", + "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==", "requires": { "react-is": "^16.7.0" } @@ -2987,13 +2967,12 @@ "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==" }, "mini-create-react-context": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/mini-create-react-context/-/mini-create-react-context-0.3.2.tgz", - "integrity": "sha512-2v+OeetEyliMt5VHMXsBhABoJ0/M4RCe7fatd/fBy6SMiKazUSEt3gxxypfnk2SHMkdBYvorHRoQxuGoiwbzAw==", + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/mini-create-react-context/-/mini-create-react-context-0.4.0.tgz", + "integrity": "sha512-b0TytUgFSbgFJGzJqXPKCFCBWigAjpjo+Fl7Vf7ZbKRDptszpppKxXH6DRXEABZ/gcEQczeb0iZ7JvL8e8jjCA==", "requires": { - "@babel/runtime": "^7.4.0", - "gud": "^1.0.0", - "tiny-warning": "^1.0.2" + "@babel/runtime": "^7.5.5", + "tiny-warning": "^1.0.3" } }, "minimatch": { @@ -3261,9 +3240,9 @@ "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==" }, "path-to-regexp": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz", - "integrity": "sha1-Wf3g9DW62suhA6hOnTvGTpa5k30=", + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz", + "integrity": "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==", "requires": { "isarray": "0.0.1" }, @@ -3292,9 +3271,9 @@ "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=" }, "picomatch": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.1.tgz", - "integrity": "sha512-ISBaA8xQNmwELC7eOjqFKMESB2VIqt4PPDD0nsS95b/9dZXvVKOlz9keMSnoGGKcOHXfTvDD6WMaRoSc9UuhRA==" + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", + "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==" }, "pify": { "version": "2.3.0", @@ -3410,9 +3389,9 @@ } }, "react-bootstrap": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-1.0.0.tgz", - "integrity": "sha512-Ep6ZNH6wL5m9bytOS6T9mjSz0YE1bEkc+uHItvenRcA3amr5ApkpKYzAWgdglhRPZHPvm+pnqs1z5IPwv/2UZw==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-1.0.1.tgz", + "integrity": "sha512-xMHwsvDN7sIv26P9wWiosWjITZije2dRCjEJHVfV2KFoSJY+8uv2zttEw0XMB7xviQcW3zuIGLJXuj8vf6lYEg==", "requires": { "@babel/runtime": "^7.4.2", "@restart/context": "^2.1.4", @@ -3423,16 +3402,16 @@ "invariant": "^2.2.4", "prop-types": "^15.7.2", "prop-types-extra": "^1.1.0", - "react-overlays": "^3.0.1", + "react-overlays": "^3.1.2", "react-transition-group": "^4.0.0", "uncontrollable": "^7.0.0", "warning": "^4.0.3" }, "dependencies": { "@types/react": { - "version": "16.9.32", - "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.32.tgz", - "integrity": "sha512-fmejdp0CTH00mOJmxUPPbWCEBWPvRIL4m8r0qD+BSDUqmutPyGQCHifzMpMzdvZwROdEdL78IuZItntFWgPXHQ==", + "version": "16.9.35", + "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.35.tgz", + "integrity": "sha512-q0n0SsWcGc8nDqH2GJfWQWUOmZSJhXV64CjVN5SvcNti3TdEaA3AH0D8DwNmMdzjMAC/78tB8nAZIlV8yTz+zQ==", "requires": { "@types/prop-types": "*", "csstype": "^2.2.0" @@ -3479,9 +3458,9 @@ } }, "react-input-slider": { - "version": "5.1.5", - "resolved": "https://registry.npmjs.org/react-input-slider/-/react-input-slider-5.1.5.tgz", - "integrity": "sha512-uBUsrbKAvzplx0f6c2hiZLgU2NZdth6hLgHiHC/5Zh9TCWiwnogEGZ3Kwx8WbFmlCSjQYof/5WkCGeWtnFWzFA==", + "version": "5.1.7", + "resolved": "https://registry.npmjs.org/react-input-slider/-/react-input-slider-5.1.7.tgz", + "integrity": "sha512-w8ciwQCJcY5qKygQQTKTvnxR1CYiTE6fd1M0w29sHqzXPq+44SiWqPJxg7esuejFzRAluHaus7BEgRSJcQcpLg==", "requires": { "@babel/runtime": "^7.9.2", "@emotion/core": "^10.0.14" @@ -3521,13 +3500,14 @@ } }, "react-overlays": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/react-overlays/-/react-overlays-3.0.1.tgz", - "integrity": "sha512-QEt6I3Cjy06pe2FwY/tuWaXEzSVOuXfP8zsC6oWHJhMYpEJQgZV/TCwbCw5slMW6VcgwcWPc4HrBzN0yfxf5Xw==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/react-overlays/-/react-overlays-3.2.0.tgz", + "integrity": "sha512-YTgCmw6l4uBOYylSnc3V8WLX+A0EoGnzDrqkYz0K7MUKbMBZFpaxLXH4EF9eZbspd+syZHQ5XAABI7n/zak1EA==", "requires": { "@babel/runtime": "^7.4.5", "@popperjs/core": "^2.0.0", "@restart/hooks": "^0.3.12", + "@types/warning": "^3.0.0", "dom-helpers": "^5.1.0", "prop-types": "^15.7.2", "uncontrollable": "^7.0.0", @@ -3557,15 +3537,15 @@ } }, "react-router": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/react-router/-/react-router-5.1.2.tgz", - "integrity": "sha512-yjEuMFy1ONK246B+rsa0cUam5OeAQ8pyclRDgpxuSCrAlJ1qN9uZ5IgyKC7gQg0w8OM50NXHEegPh/ks9YuR2A==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-5.2.0.tgz", + "integrity": "sha512-smz1DUuFHRKdcJC0jobGo8cVbhO3x50tCL4icacOlcwDOEQPq4TMqwx3sY1TP+DvtTgz4nm3thuo7A+BK2U0Dw==", "requires": { "@babel/runtime": "^7.1.2", "history": "^4.9.0", "hoist-non-react-statics": "^3.1.0", "loose-envify": "^1.3.1", - "mini-create-react-context": "^0.3.0", + "mini-create-react-context": "^0.4.0", "path-to-regexp": "^1.7.0", "prop-types": "^15.6.2", "react-is": "^16.6.0", @@ -3574,15 +3554,15 @@ } }, "react-router-dom": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.1.2.tgz", - "integrity": "sha512-7BPHAaIwWpZS074UKaw1FjVdZBSVWEk8IuDXdB+OkLb8vd/WRQIpA4ag9WQk61aEfQs47wHyjWUoUGGZxpQXew==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.2.0.tgz", + "integrity": "sha512-gxAmfylo2QUjcwxI63RhQ5G85Qqt4voZpUXSEqCwykV0baaOTQDR1f0PmY8AELqIyVc0NEZUj0Gov5lNGcXgsA==", "requires": { "@babel/runtime": "^7.1.2", "history": "^4.9.0", "loose-envify": "^1.3.1", "prop-types": "^15.6.2", - "react-router": "5.1.2", + "react-router": "5.2.0", "tiny-invariant": "^1.0.2", "tiny-warning": "^1.0.0" } @@ -3656,9 +3636,9 @@ } }, "react-transition-group": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.3.0.tgz", - "integrity": "sha512-1qRV1ZuVSdxPlPf4O8t7inxUGpdyO5zG9IoNfJxSO0ImU2A1YWkEQvFPuIPZmMLkg5hYs7vv5mMOyfgSkvAwvw==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.1.tgz", + "integrity": "sha512-Djqr7OQ2aPUiYurhPalTrVy9ddmFCCzwhqQmtN+J3+3DzLO209Fdr70QrN8Z3DsglWql6iY1lDWAfpFiBtuKGw==", "requires": { "@babel/runtime": "^7.5.5", "dom-helpers": "^5.0.1", @@ -3733,11 +3713,11 @@ } }, "readdirp": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.3.0.tgz", - "integrity": "sha512-zz0pAkSPOXXm1viEwygWIPSPkcBYjW1xU5j/JBh5t9bGCJwa6f9+BJa6VaB2g+b55yVrmXzqkyLf4xaWYM0IkQ==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz", + "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==", "requires": { - "picomatch": "^2.0.7" + "picomatch": "^2.2.1" } }, "recharts": { @@ -3971,9 +3951,9 @@ "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=" }, "shelljs": { - "version": "0.8.3", - "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.3.tgz", - "integrity": "sha512-fc0BKlAWiLpwZljmOvAOTE/gXawtCoNrP5oaY7KIaQbbyHeQVg01pSEuEGvGh3HEdBU4baCD7wQBwADmM/7f7A==", + "version": "0.8.4", + "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.4.tgz", + "integrity": "sha512-7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ==", "requires": { "glob": "^7.0.0", "interpret": "^1.0.0", @@ -4248,9 +4228,9 @@ "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=" }, "tiny-invariant": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.0.6.tgz", - "integrity": "sha512-FOyLWWVjG+aC0UqG76V53yAWdXfH8bO6FNmyZOuUrzDzK8DI3/JRY25UD7+g49JWM1LXwymsKERB+DzI0dTEQA==" + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.1.0.tgz", + "integrity": "sha512-ytxQvrb1cPc9WBEI/HSeYYoGD0kWnGEOR8RY6KomWLBVhqz0RgTwVO9dLrGz7dC+nN9llyI7OKAgRq8Vq4ZBSw==" }, "tiny-warning": { "version": "1.0.3", @@ -4356,9 +4336,9 @@ "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==" }, "unzipper": { - "version": "0.10.10", - "resolved": "https://registry.npmjs.org/unzipper/-/unzipper-0.10.10.tgz", - "integrity": "sha512-wEgtqtrnJ/9zIBsQb8UIxOhAH1eTHfi7D/xvmrUoMEePeI6u24nq1wigazbIFtHt6ANYXdEVTvc8XYNlTurs7A==", + "version": "0.10.11", + "resolved": "https://registry.npmjs.org/unzipper/-/unzipper-0.10.11.tgz", + "integrity": "sha512-+BrAq2oFqWod5IESRjL3S8baohbevGcVA+teAIOYWM3pDVdseogqbzhhvvmiyQrUNKFUnDMtELW3X8ykbyDCJw==", "requires": { "big-integer": "^1.6.17", "binary": "~0.3.0", diff --git a/package.json b/package.json index e5adbcf6..3eaba909 100644 --- a/package.json +++ b/package.json @@ -10,23 +10,23 @@ "lint:fix": "eslint {imports,tests}/**/* --ext .{{t,j}s{,x}} --fix" }, "dependencies": { - "@babel/runtime": "^7.9.2", + "@babel/runtime": "^7.9.6", "@emotion/core": "^10.0.28", "@ffmpeg-installer/ffmpeg": "^1.0.20", - "@material-ui/core": "^4.9.8", + "@material-ui/core": "^4.9.14", "asap": "^2.0.6", "babel-eslint": "^10.1.0", - "bootstrap": "^4.4.1", + "bootstrap": "^4.5.0", "child_process": "^1.0.2", - "chokidar": "^3.3.1", + "chokidar": "^3.4.0", "core-js": "^3.6.5", "dateformat": "^3.0.3", "es5-shim": "^4.5.14", "eslint": "^6.8.0", - "eslint-config-prettier": "^6.10.1", + "eslint-config-prettier": "^6.11.0", "eslint-plugin-import": "^2.20.2", - "eslint-plugin-prettier": "^3.1.2", - "eslint-plugin-react": "^7.19.0", + "eslint-plugin-prettier": "^3.1.3", + "eslint-plugin-react": "^7.20.0", "eslint-plugin-react-hooks": "^2.5.1", "eslint-plugin-simple-import-sort": "^4.0.0", "exiftool-vendored": "^8.22.0", @@ -44,14 +44,14 @@ "prettier": "^1.19.1", "promise": "^8.1.0", "react": "^16.13.1", - "react-bootstrap": "^1.0.0", + "react-bootstrap": "^1.0.1", "react-copy-to-clipboard": "^5.0.2", "react-dom": "^16.13.1", "react-input-range": "^1.3.0", - "react-input-slider": "^5.1.5", + "react-input-slider": "^5.1.7", "react-json-pretty": "^2.2.0", "react-loading": "^2.0.3", - "react-router-dom": "^5.1.2", + "react-router-dom": "^5.2.0", "react-spinners": "^0.6.1", "react-sweet-progress": "^1.1.2", "react-table": "^6.11.5", @@ -62,9 +62,9 @@ "request": "^2.88.2", "request-progress": "^3.0.0", "rimraf": "^3.0.2", - "shelljs": "^0.8.3", + "shelljs": "^0.8.4", "shortid": "^2.2.15", - "unzipper": "^0.10.10", + "unzipper": "^0.10.11", "whatwg-fetch": "^3.0.0", "zip-folder": "^1.0.0" }, From 95d9d7deebe3ca237e9d3dd683d4f01e50f1ef34 Mon Sep 17 00:00:00 2001 From: HaveAGitGat <43864057+HaveAGitGat@users.noreply.github.com> Date: Fri, 15 May 2020 20:37:10 +0100 Subject: [PATCH 2/6] Split command on to prevent issues when ffmpeg command has commas in --- imports/ui/libraries/tab_Libraries.jsx | 12 ++++++------ .../pluginTemplates/Action/TranscodeCustom.jsx | 12 ++++++------ private/worker1.js | 10 ++++++++-- 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/imports/ui/libraries/tab_Libraries.jsx b/imports/ui/libraries/tab_Libraries.jsx index 702d0122..2c0c2f3f 100644 --- a/imports/ui/libraries/tab_Libraries.jsx +++ b/imports/ui/libraries/tab_Libraries.jsx @@ -994,17 +994,17 @@ class App extends Component {

When using FFmpeg, you need to separate the input and - output parameters with a comma. FFmpeg Examples: + output parameters with {''}. FFmpeg Examples:

-

-r 1,-r 24

-

,-sn -c:v copy -c:a copy

+

-r 1{''}-r 24

+

{''}-sn -c:v copy -c:a copy

- ,-c:v lib265 -crf 23 -ac 6 -c:a aac -preset veryfast + {''}-c:v lib265 -crf 23 -ac 6 -c:a aac -preset veryfast

-

,-map 0 -c copy -c:v libx265 -c:a aac

+

{''}-map 0 -c copy -c:v libx265 -c:a aac

- -c:v h264_cuvid,-c:v hevc_nvenc -preset slow -c:a copy + -c:v h264_cuvid{''}-c:v hevc_nvenc -preset slow -c:a copy

diff --git a/imports/ui/plugins/pluginTemplates/Action/TranscodeCustom.jsx b/imports/ui/plugins/pluginTemplates/Action/TranscodeCustom.jsx index 87fa7d92..b11a5fc1 100644 --- a/imports/ui/plugins/pluginTemplates/Action/TranscodeCustom.jsx +++ b/imports/ui/plugins/pluginTemplates/Action/TranscodeCustom.jsx @@ -108,14 +108,14 @@ export default class App extends Component {

When using FFmpeg, you need to separate the input and output - parameters with a comma. FFmpeg Examples: + parameters with {''}. FFmpeg Examples:

-

-r 1,-r 24

-

,-sn -c:v copy -c:a copy

-

,-c:v lib265 -crf 23 -ac 6 -c:a aac -preset veryfast

-

,-map 0 -c copy -c:v libx265 -c:a aac

-

-c:v h264_cuvid,-c:v hevc_nvenc -preset slow -c:a copy

+

-r 1{''}-r 24

+

{''}-sn -c:v copy -c:a copy

+

{''}-c:v lib265 -crf 23 -ac 6 -c:a aac -preset veryfast

+

{''}-map 0 -c copy -c:v libx265 -c:a aac

+

-c:v h264_cuvid{''}-c:v hevc_nvenc -preset slow -c:a copy

Please see the following for help with creating FFmpeg commands:

diff --git a/private/worker1.js b/private/worker1.js index d286b137..637f229f 100644 --- a/private/worker1.js +++ b/private/worker1.js @@ -117,7 +117,7 @@ process.on("message", (m) => { shellThreadModule.send(infoArray); } } catch (err) { } - + } if (m[0] == "queueNumber") { @@ -147,7 +147,13 @@ process.on("message", (m) => { logger("info", "File received:" + fileToProcess); var presetSplit; - presetSplit = preset.split(","); + + if (preset.includes('')) { + presetSplit = preset.split(""); + } else { + presetSplit = preset.split(","); + } + var workerCommand = ""; //Create folder to folder conversion output folders From 3c71543e0205d2f0b847fd003fafd1a6b97a02c7 Mon Sep 17 00:00:00 2001 From: HaveAGitGat <43864057+HaveAGitGat@users.noreply.github.com> Date: Fri, 15 May 2020 20:37:25 +0100 Subject: [PATCH 3/6] Transcode cache info --- imports/ui/libraries/tab_Libraries_Folder.jsx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/imports/ui/libraries/tab_Libraries_Folder.jsx b/imports/ui/libraries/tab_Libraries_Folder.jsx index 044e8509..d48b3a23 100644 --- a/imports/ui/libraries/tab_Libraries_Folder.jsx +++ b/imports/ui/libraries/tab_Libraries_Folder.jsx @@ -1314,6 +1314,9 @@ class Folder extends Component { } >

Transcode cache:

+
+

Files will be transcoded into the transcode cache. Completed files will then be moved to library/output folder.

+
Date: Fri, 15 May 2020 20:37:48 +0100 Subject: [PATCH 4/6] Keep only 2 log backups --- server/logger.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/logger.js b/server/logger.js index 254a3cbd..ceecdae2 100644 --- a/server/logger.js +++ b/server/logger.js @@ -7,8 +7,8 @@ log4js.configure({ tdarr: { type: "file", filename: homePath + "/Tdarr/Logs/log.txt", - maxLogSize: 1 * 1024 * 1024, // = 10Mb - backups: 5, // keep five backup files + maxLogSize: 1 * 1024 * 1024, // = 1MB + backups: 2, }, console: { type: "console" }, }, From c4ee78a8d66c5a5a23caa243b87b28fcc73bd1db Mon Sep 17 00:00:00 2001 From: HaveAGitGat <43864057+HaveAGitGat@users.noreply.github.com> Date: Sun, 17 May 2020 23:06:49 +0100 Subject: [PATCH 5/6] Delay after unzip --- server/backupFuncs.js | 96 +++++++++++++++++++++++++------------------ 1 file changed, 56 insertions(+), 40 deletions(-) diff --git a/server/backupFuncs.js b/server/backupFuncs.js index 573eaee0..819e3f99 100644 --- a/server/backupFuncs.js +++ b/server/backupFuncs.js @@ -121,52 +121,68 @@ Meteor.methods({ .on( "finish", Meteor.bindEnvironment(function () { - backupStatus[0].status = "Complete"; - - for (var i = 0; i < collections.length; i++) { - var count = 0; - backupStatus.push({ name: collections[i][1] }); - backupStatus[i + 1].status = "Cleaning existing DB"; - collections[i][0].remove({}); - backupStatus[i + 1].status = "Existing DB cleaned"; - try { - var dbItems = fs.readFileSync( - homePath + - `/Tdarr/Backups/${file}-unzip/${collections[i][1]}.txt`, - dbItems, - "utf8" - ); - backupStatus[i + 1].status = "Reading backup file"; - dbItems = JSON.parse(dbItems); - if (dbItems.length > 0) { - for (var j = 0; j < dbItems.length; j++) { - count++; - backupStatus[i + 1].status = - "Restoring:" + count + "/" + dbItems.length; - if (dbItems[j]._id) { - var id = dbItems[j]._id; - try { - collections[i][0].upsert(id, { - $set: dbItems[j], - }); - } catch (err) { - logger.error("Error restoring item:"); - logger.error(j); - logger.error(dbItems[j]._id); + + function unzipTimeout() { + return new Promise((resolve) => { + setTimeout(function () { + resolve(); + }, 1000); + }); + }; + + (async function () { + + await unzipTimeout(); + + backupStatus[0].status = "Complete"; + + for (var i = 0; i < collections.length; i++) { + var count = 0; + backupStatus.push({ name: collections[i][1] }); + backupStatus[i + 1].status = "Cleaning existing DB"; + collections[i][0].remove({}); + backupStatus[i + 1].status = "Existing DB cleaned"; + logger.info("Restoring:" + collections[i][1]); + try { + var dbItems = fs.readFileSync( + homePath + + `/Tdarr/Backups/${file}-unzip/${collections[i][1]}.txt`, + dbItems, + "utf8" + ); + backupStatus[i + 1].status = "Reading backup file"; + dbItems = JSON.parse(dbItems); + if (dbItems.length > 0) { + for (var j = 0; j < dbItems.length; j++) { + count++; + backupStatus[i + 1].status = + "Restoring:" + count + "/" + dbItems.length; + if (dbItems[j]._id) { + var id = dbItems[j]._id; + try { + collections[i][0].upsert(id, { + $set: dbItems[j], + }); + } catch (err) { + logger.error("Error restoring item:"); + logger.error(j); + logger.error(dbItems[j]._id); + } } } + } else { + backupStatus[i + 1].status = "No items to restore!"; } - } else { - backupStatus[i + 1].status = "No items to restore!"; + } catch (err) { + logger.error(err); + backupStatus[i + 1].status = "Error:" + JSON.stringify(err); } - } catch (err) { - logger.error(err); - backupStatus[i + 1].status = "Error:" + JSON.stringify(err); } - } - fsextra.removeSync(homePath + `/Tdarr/Backups/${file}-unzip`); - backupStatus.push({ name: "Status", status: "Finished!" }); + fsextra.removeSync(homePath + `/Tdarr/Backups/${file}-unzip`); + backupStatus.push({ name: "Status", status: "Finished!" }); + + })(); }) ); } catch (err) { From 63ff55922466c79210053369d2bd2b3593caeb64 Mon Sep 17 00:00:00 2001 From: HaveAGitGat <43864057+HaveAGitGat@users.noreply.github.com> Date: Sun, 17 May 2020 23:43:15 +0100 Subject: [PATCH 6/6] 1.109 notes and tidy --- imports/ui/App.jsx | 2 +- imports/ui/tab_Dev.jsx | 19 ++++++++++++ imports/ui/tab_Dev_latest.jsx | 53 ++++++++++++++++++++++++++++----- private/worker2.js | 4 +-- server/mod/Launch.js | 55 ----------------------------------- 5 files changed, 68 insertions(+), 65 deletions(-) delete mode 100644 server/mod/Launch.js diff --git a/imports/ui/App.jsx b/imports/ui/App.jsx index b24c8ff5..3cef3ebc 100644 --- a/imports/ui/App.jsx +++ b/imports/ui/App.jsx @@ -38,7 +38,7 @@ const tabs = [ export default AppRouter = () => { const [basePath, setBasePath] = React.useState(""); const [currentVersion, setVersion] = React.useState(""); - const [newVersion, setNewVersion] = React.useState(1.108); + const [newVersion, setNewVersion] = React.useState(1.109); const [showUpdateScreen, setShowUpdateScreen] = React.useState(false); toggleConsole = () => { diff --git a/imports/ui/tab_Dev.jsx b/imports/ui/tab_Dev.jsx index 5f4e988e..fffbc9c4 100644 --- a/imports/ui/tab_Dev.jsx +++ b/imports/ui/tab_Dev.jsx @@ -91,6 +91,25 @@ export default class App extends Component {

{" "} + Beta v1.108 release [18th April 2020]: +
+ Changes: +
+ -[New] Add default plugins to new libraries +
+ -[Improvement] Check other properties to calculate bitrate +
+ -[Improvement] Reduce worker spawn rate +
+ -[Improvement] Change process priority from "Below normal" to "Low" + when switch enabled (Win) +
+ -[Fix] Prevent folder watcher re-adding already scanned files +
+
+

+

+ {" "} Beta v1.107 release [4th April 2020]:
Changes: diff --git a/imports/ui/tab_Dev_latest.jsx b/imports/ui/tab_Dev_latest.jsx index 9e19f0e8..d4652a6b 100644 --- a/imports/ui/tab_Dev_latest.jsx +++ b/imports/ui/tab_Dev_latest.jsx @@ -11,21 +11,60 @@ export default class App extends Component { return (

+ + IMPORTANT: +
+ On Sunday 24th May 2020 the 'tdarr' container will be replaced with the 'tdarr_aio' container as the + tdarr container does not provide much benefit but makes things increasingly difficult as Tdarr + development progresses. It's also confusing for new users to have a selection of containers. +
+ After 24th May 2020, both the tdarr and tdarr_aio containers will be the SAME but all documentation will direct new + users to download the new 'tdarr' container. Existing tdarr_aio users can continue using that container (tdarr_aio) and will receive updates. +
+ Current 'tdarr' container users will need to create a Tdarr backup (on the 'Backups' tab) and then restore the backup once they've set up the new 'tdarr' + container on/after 24th May 2020. +
+
+ In summary: +
+ Pre 24th May 2020: +
+ tdarr - Alpine image with MongoDB needed separately +
+ tdarr_aio - all-in-one Ubuntu image with MongoDB inside and hardware transcoding +
+
+ Post 24th May 2020: +
+ tdarr - all-in-one Ubuntu image with MongoDB inside and hardware transcoding +
+ tdarr_aio - all-in-one Ubuntu image with MongoDB inside and hardware transcoding +
+
+ Please use the channels on the 'Help' tab if you have any questions + + + +
+
{" "} - Beta v1.108 release [18th April 2020]: + Beta v1.109 release [17th May 2020]:
Changes:
- -[New] Add default plugins to new libraries + -[New] Added health check and transcode cache description +
+ -[New] More errors detected during thorough health check +
+ -[New] Health check will be skipped if both options (Quick/Thorough) unchecked
- -[Improvement] Check other properties to calculate bitrate + -[New] Queue files for transcode even if they've failed reading with FFprobe
- -[Improvement] Reduce worker spawn rate + -[New] More comprehensive logging system
- -[Improvement] Change process priority from "Below normal" to "Low" - when switch enabled (Win) + -[New] Clearer UI for how to edit library titles
- -[Fix] Prevent folder watcher re-adding already scanned files + -[New] Split FFmpeg input and output args with {''} to prevent issues when FFmpeg command contains commas

diff --git a/private/worker2.js b/private/worker2.js index 8f31e395..3026d8bd 100644 --- a/private/worker2.js +++ b/private/worker2.js @@ -72,8 +72,8 @@ function updateConsole(text) { var killCommand = "pkill -P " + shellWorker.pid; } if (process.platform == "darwin") { - var killCommand = 'pgrep -P ' + shellWorker.pid - //var killCommand = "rkill " + shellWorker.pid; + //var killCommand = 'pgrep -P ' + shellWorker.pid + var killCommand = "rkill " + shellWorker.pid; } if (shell.exec(killCommand).code !== 0) { shell.exit(1); diff --git a/server/mod/Launch.js b/server/mod/Launch.js deleted file mode 100644 index fa918e87..00000000 --- a/server/mod/Launch.js +++ /dev/null @@ -1,55 +0,0 @@ - -var shellWorker -var shell = require('shelljs'); - -//console.dir(process.argv) -var mainJSPath = process.argv[2] -process.env.MONGO_URL = process.argv[3] -process.env.PORT = process.argv[4] -process.env.ROOT_URL = process.argv[5] - - -//mainJS path = path to Tdarr Server - -shellWorker = shell.exec(`node "${mainJSPath}"`, function (code, stdout, stderr, stdin) { - console.log('Exit code:', code); - - process.exit() -}); - - -process.on('uncaughtException', function (err) { - console.log(err) - process.exit(); -}); - -process.on('message', (infoArray) => { - - if (infoArray[0] == "exitThread") { - - try { - - if (process.platform == 'win32') { - var killCommand = 'taskkill /PID ' + shellWorker.pid + ' /T /F' - } - if (process.platform == 'linux') { - //var killCommand = 'vps -o pid --no-headers --ppid ' + shellWorker.pid - var killCommand = 'pkill -P ' + shellWorker.pid - } - if (process.platform == 'darwin') { - //var killCommand = 'pgrep -P ' + shellWorker.pid - var killCommand = 'pkill -P ' + shellWorker.pid - } - // if (shell.exec(killCommand).code !== 0) { - // shell.exit(1); - // } - shell.exec(killCommand) - - } catch (err) { - console.log(err) - } - shellWorker = null - process.exit(); - } - -})