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

Move get used optional file size to separate function

Browse source
This commit is contained in:
shortcutme 2018-01-19 02:14:29 +01:00
parent a715650af6
commit d7b6c54b08
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
plugins/OptionalManager/ContentDbPlugin.py
View file

@ -343,6 +343,12 @@ 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 getOptionalUsedBytes(self):
size = self.execute("SELECT SUM(size) FROM file_optional WHERE is_downloaded = 1 AND is_pinned = 0").fetchone()[0]
if not size:
size = 0
return size
def getOptionalNeedDelete(self, size): def getOptionalNeedDelete(self, size):
if config.optional_limit.endswith("%"): if config.optional_limit.endswith("%"):
limit_percent = float(re.sub("[^0-9.]", "", config.optional_limit)) limit_percent = float(re.sub("[^0-9.]", "", config.optional_limit))
@ -359,9 +365,7 @@ class ContentDbPlugin(object):
self.log.debug("Invalid limit for optional files: %s" % limit) self.log.debug("Invalid limit for optional files: %s" % limit)
return False return False
size = self.execute("SELECT SUM(size) FROM file_optional WHERE is_downloaded = 1 AND is_pinned = 0").fetchone()[0] size = self.getOptionalUsedBytes()
if not size:
size = 0
need_delete = self.getOptionalNeedDelete(size) need_delete = self.getOptionalNeedDelete(size)