From 5f94b413a73f96255a5e1ffe8150f135df5b96e1 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sat, 26 Oct 2019 13:47:27 +0100
Subject: [PATCH] json loading error handling

---
 content.py | 2 +-
 inbox.py   | 2 +-
 posts.py   | 4 ++--
 utils.py   | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/content.py b/content.py
index f11b22bdc..1508d8e13 100644
--- a/content.py
+++ b/content.py
@@ -326,7 +326,7 @@ def addHtmlTags(baseDir: str,httpPrefix: str, \
                             if emojiDictCtr>0:
                                 print('emojiDict loaded on try '+str(emojiDictCtr))
                             break
-                    except commentjson.JSONLibraryException as e:
+                    except (IndexError, AttributeError, commentjson.JSONLibraryException) as e:
                         print('WARN: commentjson exception addHtmlTags - '+str(e))
                         print('Failed to load emoji (try '+str(emojiDictCtr)+'): '+baseDir+'/emoji/emoji.json '+str(e))
                         time.sleep(1)
diff --git a/inbox.py b/inbox.py
index 9e1791c06..684e51f28 100644
--- a/inbox.py
+++ b/inbox.py
@@ -1727,7 +1727,7 @@ def runInboxQueue(projectVersion: str, \
             try:
                 with open(queueFilename, 'r') as fp:
                     queueJson=commentjson.load(fp)
-            except commentjson.JSONLibraryException as e:
+            except (IndexError, AttributeError, commentjson.JSONLibraryException) as e:
                 itemReadFailed+=1
                 print('WARN: commentjson exception runInboxQueue - '+str(e))
                 print('WARN: Failed to load inbox queue item '+queueFilename+' (try '+str(itemReadFailed)+')')
diff --git a/posts.py b/posts.py
index f2673647f..2cf86615a 100644
--- a/posts.py
+++ b/posts.py
@@ -1927,7 +1927,7 @@ def createSharedInboxIndex(baseDir: str,sharedBoxDir: str, \
         try:
             with open(sharedInboxFilename, 'r') as fp:
                 postJsonObject=commentjson.load(fp)                
-        except commentjson.JSONLibraryException as e:
+        except (IndexError, AttributeError, commentjson.JSONLibraryException) as e:
             print('WARN: commentjson exception createBoxBase - '+str(e))
             continue
 
@@ -1963,7 +1963,7 @@ def createSharedInboxIndex(baseDir: str,sharedBoxDir: str, \
                 with open(ocapFilename, 'r') as fp:
                     ocapJson=commentjson.load(fp)
                     loadedOcap=True
-            except commentjson.JSONLibraryException as e:
+            except (IndexError, AttributeError, commentjson.JSONLibraryException) as e:
                 print('WARN: commentjson exception createBoxBase - '+str(e))
 
             if loadedOcap:
diff --git a/utils.py b/utils.py
index 9302f480d..c9c0ba7e4 100644
--- a/utils.py
+++ b/utils.py
@@ -37,7 +37,7 @@ def loadJson(filename: str) -> {}:
             with open(filename, 'r') as fp:
                 jsonObject=commentjson.load(fp)
                 break
-        except commentjson.JSONLibraryException as e:
+        except (IndexError, AttributeError, commentjson.JSONLibraryException) as e:
             print('WARN: loadJson exception - '+str(e))
             time.sleep(2)
             tries+=1
@@ -127,7 +127,7 @@ def getDisplayName(baseDir: str,actor: str,personCache: {}) -> str:
                     with open(cachedActorFilename, 'r') as fp:
                         actorJson=commentjson.load(fp)
                         break
-                except commentjson.JSONLibraryException as e:
+                except (IndexError, AttributeError, commentjson.JSONLibraryException) as e:
                     print('WARN: getDisplayName '+str(e))
                     time.sleep(1)
                     tries+=1
@@ -300,7 +300,7 @@ def deletePost(baseDir: str,httpPrefix: str,nickname: str,domain: str,postFilena
             with open(postFilename, 'r') as fp:
                 postJsonObject=commentjson.load(fp)
                 break
-        except commentjson.JSONLibraryException as e:
+        except (IndexError, AttributeError, commentjson.JSONLibraryException) as e:
             print('WARN: deletePost '+str(e))
             time.sleep(1)
             tries+=1