From dbe62722401eacfff9cb151080501d35e1ebe4a2 Mon Sep 17 00:00:00 2001
From: mrfry <mr.fry@tutanota.com>
Date: Sat, 8 Apr 2023 18:19:12 +0200
Subject: [PATCH] not failing on invalid p2p files

---
 src/modules/api/submodules/p2p.ts | 20 +++++++++++++++++---
 src/utils/files.ts                |  1 +
 submodules/qmining-data-editor    |  2 +-
 submodules/qmining-page           |  2 +-
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/modules/api/submodules/p2p.ts b/src/modules/api/submodules/p2p.ts
index 11668d1..371f130 100644
--- a/src/modules/api/submodules/p2p.ts
+++ b/src/modules/api/submodules/p2p.ts
@@ -435,15 +435,29 @@ function setup(data: SubmoduleData): Submodule {
             fname: paths.peersFile,
             logMsg: 'Peers file updated',
             action: () => {
-                peers = utils.ReadJSON(paths.peersFile)
+                try {
+                    peers = utils.ReadJSON(paths.peersFile)
+                } catch (e) {
+                    logger.Log(
+                        `Peers file contents are invalid! Check if syntax is correct for ${paths.peersFile}`,
+                        'redbg'
+                    )
+                }
             },
         },
         {
             fname: paths.selfInfoFile,
             logMsg: 'P2P self info file changed',
             action: () => {
-                selfInfo = utils.ReadJSON(paths.selfInfoFile)
-                selfInfo.publicKey = publicKey
+                try {
+                    selfInfo = utils.ReadJSON(paths.selfInfoFile)
+                    selfInfo.publicKey = publicKey
+                } catch (e) {
+                    logger.Log(
+                        `Self info file contents are invalid! Check if syntax is correct for ${paths.selfInfoFile}`,
+                        'redbg'
+                    )
+                }
             },
         },
     ]
diff --git a/src/utils/files.ts b/src/utils/files.ts
index e0812cc..90eae6a 100644
--- a/src/utils/files.ts
+++ b/src/utils/files.ts
@@ -24,6 +24,7 @@ export const validateFiles = (): boolean => {
     Object.entries(files).forEach(([key, file]: [string, FileDescriptor]) => {
         let fileExists = utils.FileExists(file.path)
         if (file.defaultValue != null && !fileExists) {
+            // FIXME: create path too
             utils.WriteFile(file.defaultValue, file.path)
             fileExists = true
         }
diff --git a/submodules/qmining-data-editor b/submodules/qmining-data-editor
index 39dfd7a..5a665bc 160000
--- a/submodules/qmining-data-editor
+++ b/submodules/qmining-data-editor
@@ -1 +1 @@
-Subproject commit 39dfd7a0f48d850b543d38d607320236038f54fb
+Subproject commit 5a665bc766eb81aabd8a844e57329cc3a213d9f4
diff --git a/submodules/qmining-page b/submodules/qmining-page
index f82ecaa..7386dca 160000
--- a/submodules/qmining-page
+++ b/submodules/qmining-page
@@ -1 +1 @@
-Subproject commit f82ecaa6d00d4f0625fb678c2c645a6ed3d79c03
+Subproject commit 7386dcaa68385990c756de67290f511a43cd4110