GetTotal size also return optional sum of optional file sizes
This commit is contained in:
parent
aa9e8b067f
commit
96ceb253e8
1 changed files with 9 additions and 9 deletions
|
@ -91,7 +91,7 @@ class ContentDb(Db):
|
|||
"size": size,
|
||||
"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()]),
|
||||
"modified": int(content["modified"])
|
||||
"modified": int(content.get("modified", 0))
|
||||
}, {
|
||||
"site_id": self.site_ids.get(site.address, 0),
|
||||
"inner_path": inner_path
|
||||
|
@ -116,15 +116,15 @@ class ContentDb(Db):
|
|||
params = {"site_id": self.site_ids.get(site.address, 0)}
|
||||
if ignore:
|
||||
params["not__inner_path"] = ignore
|
||||
res = self.execute("SELECT SUM(size) + SUM(size_files) AS size FROM content WHERE ?", params)
|
||||
return res.fetchone()["size"]
|
||||
res = self.execute("SELECT SUM(size) + SUM(size_files) AS size, SUM(size_files_optional) AS size_optional FROM content WHERE ?", params)
|
||||
row = dict(res.fetchone())
|
||||
|
||||
def getOptionalSize(self, site):
|
||||
res = self.execute(
|
||||
"SELECT SUM(size_files_optional) AS size FROM content WHERE ?",
|
||||
{"site_id": self.site_ids.get(site.address, 0)}
|
||||
)
|
||||
return res.fetchone()["size"]
|
||||
if not row["size"]:
|
||||
row["size"] = 0
|
||||
if not row["size_optional"]:
|
||||
row["size_optional"] = 0
|
||||
|
||||
return row["size"], row["size_optional"]
|
||||
|
||||
def listModified(self, site, since):
|
||||
res = self.execute(
|
||||
|
|
Loading…
Reference in a new issue