From 2a16b75c0ba02cb7fdf7eca42d573ce7417f4bdc Mon Sep 17 00:00:00 2001 From: PaulaBras <68814660+PaulaBras@users.noreply.github.com> Date: Fri, 7 Oct 2022 00:07:54 +0200 Subject: [PATCH 1/5] savefile, extract begin, select directory --- README.md | 12 +++--- updater/data-out.yaml | 8 ++++ updater/package-lock.json | 32 +++++++++++++- updater/package.json | 3 +- updater/programInternal.yaml | 1 + updater/sectorfileUpdater.yaml | 8 ++++ updater/src/index.html | 6 +-- updater/src/index.js | 79 ++++++++++++++++++++++++++++------ updater/src/preload.js | 10 ++++- updater/src/renderer.js | 32 +++++++------- updater/yarn.lock | 77 +++++++++++++++++++++------------ 11 files changed, 201 insertions(+), 67 deletions(-) create mode 100644 updater/data-out.yaml create mode 100644 updater/programInternal.yaml create mode 100644 updater/sectorfileUpdater.yaml diff --git a/README.md b/README.md index 3424077..9851343 100644 --- a/README.md +++ b/README.md @@ -6,12 +6,12 @@ Dieses kleine Tool soll GNG Sector Müll beheben. Leider beschäftigt sich jeder * Select ES Folder * Version herausfinden / eingeben * Updates prüfen (file from Server mit Update Möglichkeiten) bspw (vonVersion-nachVersion): - * 2200-2201 - * 2200-2202 - * 2200-2203 - * 2200-2204 - * 2200-2205 - * 2200-2206 + * 2207-2201 + * 2207-2202 + * 2207-2203 + * 2207-2204 + * 2207-2205 + * 2207-2206 * Update herunterladen und enpacken * Hierbei werden neue und modifizierte Dateien verändert. (Erkannt wird das vorab mit einem Server script, welches die Fullpackes vergleicht und mittels git vergleicht. Einschränkung hier --diff-filter=ACRTUXBD) * Inline, wie bei Git ist hier nicht möglich, da nicht git vorrausgesetzt werden kann auf dem Zielcomputer diff --git a/updater/data-out.yaml b/updater/data-out.yaml new file mode 100644 index 0000000..40d0940 --- /dev/null +++ b/updater/data-out.yaml @@ -0,0 +1,8 @@ +cid: + save: true + id: 0 +password: + save: true + pass: NaN +customUrl: '' +currentInstalledAirac: 0 diff --git a/updater/package-lock.json b/updater/package-lock.json index 4f75100..e106112 100644 --- a/updater/package-lock.json +++ b/updater/package-lock.json @@ -12,7 +12,8 @@ "@octokit/core": "^4.0.5", "decompress-zip": "^0.3.3", "electron-dl": "^3.3.1", - "electron-squirrel-startup": "^1.0.0" + "electron-squirrel-startup": "^1.0.0", + "js-yaml": "^4.1.0" }, "devDependencies": { "@electron-forge/cli": "^6.0.0-beta.66", @@ -958,6 +959,11 @@ "safe-buffer": "~5.2.0" } }, + "node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" + }, "node_modules/asar": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/asar/-/asar-3.2.0.tgz", @@ -4028,6 +4034,17 @@ "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", "dev": true }, + "node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, "node_modules/json-buffer": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", @@ -7183,6 +7200,11 @@ } } }, + "argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" + }, "asar": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/asar/-/asar-3.2.0.tgz", @@ -9556,6 +9578,14 @@ "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", "dev": true }, + "js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "requires": { + "argparse": "^2.0.1" + } + }, "json-buffer": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", diff --git a/updater/package.json b/updater/package.json index 2f7f5d0..9af2e05 100644 --- a/updater/package.json +++ b/updater/package.json @@ -48,7 +48,8 @@ "@octokit/core": "^4.0.5", "decompress-zip": "^0.3.3", "electron-dl": "^3.3.1", - "electron-squirrel-startup": "^1.0.0" + "electron-squirrel-startup": "^1.0.0", + "js-yaml": "^4.1.0" }, "devDependencies": { "@electron-forge/cli": "^6.0.0-beta.66", diff --git a/updater/programInternal.yaml b/updater/programInternal.yaml new file mode 100644 index 0000000..534f448 --- /dev/null +++ b/updater/programInternal.yaml @@ -0,0 +1 @@ +folderPath: "C:\\Euroscope" \ No newline at end of file diff --git a/updater/sectorfileUpdater.yaml b/updater/sectorfileUpdater.yaml new file mode 100644 index 0000000..430a868 --- /dev/null +++ b/updater/sectorfileUpdater.yaml @@ -0,0 +1,8 @@ +cid: + save: true + id: 1467870 +password: + save: false + pass: "Testen123" +customUrl: "" +currentInstalledAirac: 2205 \ No newline at end of file diff --git a/updater/src/index.html b/updater/src/index.html index e1a4276..0a027a7 100644 --- a/updater/src/index.html +++ b/updater/src/index.html @@ -8,14 +8,14 @@
+ +Output Test here
Input URL
Input Directory
- - -Output Test here
+