From 972bef4f7d639f8b789e37bc8b5181b30504d80c Mon Sep 17 00:00:00 2001 From: shortcutme Date: Sun, 19 Nov 2017 18:19:45 +0100 Subject: [PATCH] Add invalid content.json to bad files --- src/Content/ContentDbDict.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/Content/ContentDbDict.py b/src/Content/ContentDbDict.py index a41640a8..a707931b 100644 --- a/src/Content/ContentDbDict.py +++ b/src/Content/ContentDbDict.py @@ -73,7 +73,7 @@ class ContentDbDict(dict): for key in dict.keys(self): try: val = self[key] - except Exception, err: + except Exception as err: self.log.warning("Error loading %s: %s" % (key, err)) continue yield key, val @@ -83,7 +83,7 @@ class ContentDbDict(dict): for key in dict.keys(self): try: val = self[key] - except Exception, err: + except Exception as err: self.log.warning("Error loading %s: %s" % (key, err)) continue back.append((key, val)) @@ -105,6 +105,11 @@ class ContentDbDict(dict): return self.__getitem__(key) except KeyError: return default + except Exception as err: + self.site.bad_files[key] = self.site.bad_files.get(key, 1) + dict.__delitem__(self, key) + self.log.warning("Error loading %s: %s" % (key, err)) + return default def execute(self, query, params={}): params["site_id"] = self.db_id