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

GetTotal size also return optional sum of optional file sizes

Browse source
This commit is contained in:
shortcutme 2017-10-04 13:19:19 +02:00
parent aa9e8b067f
commit 96ceb253e8
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/Content/ContentDb.py
View file

@ -91,7 +91,7 @@ class ContentDb(Db):
"size": size, "size": size,
"size_files": sum([val["size"] for key, val in content.get("files", {}).iteritems()]), "size_files": sum([val["size"] for key, val in content.get("files", {}).iteritems()]),
"size_files_optional": sum([val["size"] for key, val in content.get("files_optional", {}).iteritems()]), "size_files_optional": sum([val["size"] for key, val in content.get("files_optional", {}).iteritems()]),
"modified": int(content["modified"]) "modified": int(content.get("modified", 0))
}, { }, {
"site_id": self.site_ids.get(site.address, 0), "site_id": self.site_ids.get(site.address, 0),
"inner_path": inner_path "inner_path": inner_path
@ -116,15 +116,15 @@ class ContentDb(Db):
params = {"site_id": self.site_ids.get(site.address, 0)} params = {"site_id": self.site_ids.get(site.address, 0)}
if ignore: if ignore:
params["not__inner_path"] = ignore params["not__inner_path"] = ignore
res = self.execute("SELECT SUM(size) + SUM(size_files) AS size FROM content WHERE ?", params) res = self.execute("SELECT SUM(size) + SUM(size_files) AS size, SUM(size_files_optional) AS size_optional FROM content WHERE ?", params)
return res.fetchone()["size"] row = dict(res.fetchone())
def getOptionalSize(self, site): if not row["size"]:
res = self.execute( row["size"] = 0
"SELECT SUM(size_files_optional) AS size FROM content WHERE ?", if not row["size_optional"]:
{"site_id": self.site_ids.get(site.address, 0)} row["size_optional"] = 0
)
return res.fetchone()["size"] return row["size"], row["size_optional"]
def listModified(self, site, since): def listModified(self, site, since):
res = self.execute( res = self.execute(