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

Better calculation of deletable optional files

Browse source
This commit is contained in:
shortcutme 2017-02-13 16:25:12 +01:00
parent 6a71bb256e
commit 3ff2ec9104
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
plugins/OptionalManager/ContentDbPlugin.py
View file

@ -342,6 +342,14 @@ class ContentDbPlugin(object):
limit_bytes = float(re.sub("[^0-9.]", "", config.optional_limit)) * 1024 * 1024 * 1024 limit_bytes = float(re.sub("[^0-9.]", "", config.optional_limit)) * 1024 * 1024 * 1024
return limit_bytes return limit_bytes
def getOptionalNeedDelete(self, size):
if config.optional_limit.endswith("%"):
limit_percent = float(re.sub("[^0-9.]", "", config.optional_limit))
need_delete = size - ((helper.getFreeSpace() + size) * (limit_percent / 100))
else:
need_delete = size - self.getOptionalLimitBytes()
return need_delete
def checkOptionalLimit(self, limit=None): def checkOptionalLimit(self, limit=None):
if not limit: if not limit:
limit = self.getOptionalLimitBytes() limit = self.getOptionalLimitBytes()
@ -353,8 +361,13 @@ class ContentDbPlugin(object):
size = self.execute("SELECT SUM(size) FROM file_optional WHERE is_downloaded = 1 AND is_pinned = 0").fetchone()[0] size = self.execute("SELECT SUM(size) FROM file_optional WHERE is_downloaded = 1 AND is_pinned = 0").fetchone()[0]
if not size: if not size:
size = 0 size = 0
need_delete = size - limit
self.log.debug("Optional size: %.1fMB/%.1fMB" % (float(size) / 1024 / 1024, float(limit) / 1024 / 1024)) need_delete = self.getOptionalNeedDelete(size)
self.log.debug(
"Optional size: %.1fMB/%.1fMB, Need delete: %.1fMB" %
(float(size) / 1024 / 1024, float(limit) / 1024 / 1024, float(need_delete) / 1024 / 1024)
)
if need_delete <= 0: if need_delete <= 0:
return False return False