oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add invalid content.json to bad files

Browse source
This commit is contained in:
shortcutme 2017-11-19 18:19:45 +01:00
parent a2da8eca68
commit 972bef4f7d
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/Content/ContentDbDict.py
View file

@ -73,7 +73,7 @@ class ContentDbDict(dict):
for key in dict.keys(self): for key in dict.keys(self):
try: try:
val = self[key] val = self[key]
except Exception, err: except Exception as err:
self.log.warning("Error loading %s: %s" % (key, err)) self.log.warning("Error loading %s: %s" % (key, err))
continue continue
yield key, val yield key, val
@ -83,7 +83,7 @@ class ContentDbDict(dict):
for key in dict.keys(self): for key in dict.keys(self):
try: try:
val = self[key] val = self[key]
except Exception, err: except Exception as err:
self.log.warning("Error loading %s: %s" % (key, err)) self.log.warning("Error loading %s: %s" % (key, err))
continue continue
back.append((key, val)) back.append((key, val))
@ -105,6 +105,11 @@ class ContentDbDict(dict):
return self.__getitem__(key) return self.__getitem__(key)
except KeyError: except KeyError:
return default 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={}): def execute(self, query, params={}):
params["site_id"] = self.db_id params["site_id"] = self.db_id