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

SiteStorage Py3 compatibility

Browse source
This commit is contained in:
shortcutme 2019-03-16 00:10:49 +01:00
parent fd895d0ef5
commit 59426c31f7
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/Site/SiteStorage.py
View file

@ -111,7 +111,7 @@ class SiteStorage(object):
self.log.error("[MISSING] %s" % file_inner_path) self.log.error("[MISSING] %s" % file_inner_path)
found += 1 found += 1
if found % 100 == 0: if found % 100 == 0:
time.sleep(0.000001) # Context switch to avoid UI block time.sleep(0.001) # Context switch to avoid UI block
# Rebuild sql cache # Rebuild sql cache
@util.Noparallel() @util.Noparallel()
@ -129,7 +129,7 @@ class SiteStorage(object):
self.log.info("Deleting %s" % db_path) self.log.info("Deleting %s" % db_path)
try: try:
os.unlink(db_path) os.unlink(db_path)
except Exception, err: except Exception as err:
self.log.error("Delete error: %s" % err) self.log.error("Delete error: %s" % err)
db = self.openDb() db = self.openDb()
@ -191,16 +191,16 @@ class SiteStorage(object):
return res return res
# Open file object # Open file object
def open(self, inner_path, mode="rb", create_dirs=False): def open(self, inner_path, mode="rb", create_dirs=False, **kwargs):
file_path = self.getPath(inner_path) file_path = self.getPath(inner_path)
if create_dirs: if create_dirs:
file_dir = os.path.dirname(file_path) file_dir = os.path.dirname(file_path)
if not os.path.isdir(file_dir): if not os.path.isdir(file_dir):
os.makedirs(file_dir) os.makedirs(file_dir)
return open(file_path, mode) return open(file_path, mode, **kwargs)
# Open file object # Open file object
def read(self, inner_path, mode="r"): def read(self, inner_path, mode="rb"):
return open(self.getPath(inner_path), mode).read() return open(self.getPath(inner_path), mode).read()
# Write content to file # Write content to file
@ -303,7 +303,7 @@ class SiteStorage(object):
# Load and parse json file # Load and parse json file
def loadJson(self, inner_path): def loadJson(self, inner_path):
with self.open(inner_path) as file: with self.open(inner_path, "r", encoding="utf8") as file:
return json.load(file) return json.load(file)
def formatJson(self, data): def formatJson(self, data):
@ -334,7 +334,7 @@ class SiteStorage(object):
# Write formatted json file # Write formatted json file
def writeJson(self, inner_path, data): def writeJson(self, inner_path, data):
# Write to disk # Write to disk
self.write(inner_path, self.formatJson(data)) self.write(inner_path, self.formatJson(data).encode("utf8"))
# Get file size # Get file size
def getSize(self, inner_path): def getSize(self, inner_path):
@ -394,7 +394,7 @@ class SiteStorage(object):
back["num_content"] += 1 back["num_content"] += 1
i += 1 i += 1
if i % 50 == 0: if i % 50 == 0:
time.sleep(0.0001) # Context switch to avoid gevent hangs time.sleep(0.001) # Context switch to avoid gevent hangs
if not os.path.isfile(self.getPath(content_inner_path)): # Missing content.json file if not os.path.isfile(self.getPath(content_inner_path)): # Missing content.json file
back["num_content_missing"] += 1 back["num_content_missing"] += 1
self.log.debug("[MISSING] %s" % content_inner_path) self.log.debug("[MISSING] %s" % content_inner_path)