un-cargocult bools

This commit is contained in:
ed committed 2026-09-17 21:12:46 +00:00
1 parent 558f6aee44
commit ec8ec0f1a6
3 files changed
+20 -17

No files matched your search

+5 -2
View File
@@ -2969,6 +2969,9 @@ class AuthSrv(object):
errors = True
for vol in vfs.all_nodes.values():
for zs in vf_bmap().values():
if vol.flags.get(zs) in (None, False, ""):
vol.flags.pop(zs, None)
for k in list(vol.flags.keys()):
if re.match("^-[^-]+$", k):
vol.flags.pop(k)
@@ -3306,7 +3309,7 @@ class AuthSrv(object):
"dth3x": vf["th3x"],
"u2ts": vf["u2ts"],
"shr_who": vf["shr_who"],
"frand": bool(vf.get("rand")),
"frand": "rand" in vf,
"lifetime": vf.get("lifetime") or 0,
"unlist": vf.get("unlist") or "",
"sb_lg": "" if "no_sb_lg" in vf else (vf.get("lg_sbf") or "y"),
@@ -3364,7 +3367,7 @@ class AuthSrv(object):
"u2sz": self.args.u2sz,
"u2ts": vf["u2ts"],
"u2ow": vf["u2ow"],
"frand": bool(vf.get("rand")),
"frand": "rand" in vf,
"lifetime": vn.js_ls["lifetime"],
"u2sort": self.args.u2sort,
}
+3 -3
View File
@@ -3888,7 +3888,7 @@ class HttpCli(object):
rnd = 0
else:
rnd = int(self.uparam.get("rand") or self.headers.get("rand") or 0)
if vfs.flags.get("rand"): # force-enable
if "rand" in vfs.flags: # force-enable
rnd = max(rnd, vfs.flags["nrand"])
zs = self.uparam.get("life", self.headers.get("life", ""))
@@ -7978,7 +7978,7 @@ class HttpCli(object):
else:
j2a["og_url"] = j2a["og_raw"] = url_base
if not vn.flags.get("og_no_head"):
if "og_no_head" not in vn.flags:
ogh = {"twitter:card": "summary"}
title = str(vn.flags.get("og_title") or "")
@@ -8047,7 +8047,7 @@ class HttpCli(object):
while title.endswith(" - "):
title = title[:3]
if vn.flags.get("og_s_title") or not title:
if "og_s_title" in vn.flags or not title:
title = str(vn.flags.get("og_title") or "")
for tag, hname in tagmap.items():
+12 -12
View File
@@ -1174,7 +1174,7 @@ class Up2k(object):
vpath = k
_, flags = self._expr_idx_filter(flags)
n4g = bool(flags.get("noforget"))
n4g = "noforget" in flags
ft = "\033[0;32m{}{:.0}"
ff = "\033[0;35m{}{:.0}"
@@ -1404,10 +1404,10 @@ class Up2k(object):
top = vol.realpath
rei = vol.flags.get("noidx")
reh = vol.flags.get("nohash")
n4g = bool(vol.flags.get("noforget"))
n4g = "noforget" in vol.flags
ffat = "fat32" in vol.flags
cst = bos.stat(top)
dev = cst.st_dev if vol.flags.get("xdev") else 0
dev = cst.st_dev if "xdev" in vol.flags else 0
with self.mutex:
with self.reg_mutex:
@@ -1467,7 +1467,7 @@ class Up2k(object):
[],
cst,
dev,
bool(vol.flags.get("xvol")),
"xvol" in vol.flags,
)
if not n4g:
n_rm = self._drop_lost(db.c, top, excl)
@@ -3208,16 +3208,16 @@ class Up2k(object):
jcur = self.cur.get(ptop)
reg = self.registry[ptop]
vfs = self.vfs.all_vols[cj["vtop"]]
n4g = bool(vfs.flags.get("noforget"))
noclone = bool(vfs.flags.get("noclone"))
rand = vfs.flags.get("rand") or cj.get("rand")
n4g = "noforget" in vfs.flags
noclone = "noclone" in vfs.flags
rand = "rand" in vfs.flags or cj.get("rand")
lost: list[tuple["sqlite3.Cursor", str, str]] = []
safe_dedup = vfs.flags.get("safededup") or 50
data_ok = safe_dedup < 10 or n4g
vols = [(ptop, jcur)] if jcur else []
if vfs.flags.get("xlink") or "reflink" in vfs.flags:
if vols and ("xlink" in vfs.flags or "reflink" in vfs.flags):
vols += [(k, v) for k, v in self.cur.items() if k != ptop]
if noclone:
@@ -3708,7 +3708,7 @@ class Up2k(object):
st = bos.stat(fp)
try:
vrel = vjoin(job["prel"], fname)
xlink = bool(vf.get("xlink"))
xlink = "xlink" in vf
cur, wark, _, _, _, _, _ = self._find_from_vpath(ptop, vrel)
self._forget_file(ptop, vrel, vf, cur, wark, True, st.st_size, xlink)
except Exception as ex:
@@ -3763,7 +3763,7 @@ class Up2k(object):
if rm and bos.path.exists(dst):
wunlink(self.log, dst, flags)
if not is_mv and not flags.get("dedup"):
if not is_mv and "dedup" not in flags:
raise Exception("dedup is disabled in config")
if "reflink" in flags:
@@ -4464,7 +4464,7 @@ class Up2k(object):
cur = None
try:
ptop = dbv.realpath
xlink = bool(dbv.flags.get("xlink"))
xlink = "xlink" in dbv.flags
cur, wark, _, _, _, _, _ = self._find_from_vpath(ptop, volpath)
self._forget_file(
ptop, volpath, dbv.flags, cur, wark, True, st.st_size, xlink
@@ -4951,7 +4951,7 @@ class Up2k(object):
raise Pebkac(400, t)
self._copy_tags(c1, c2, w)
xlink = bool(svn.flags.get("xlink"))
xlink = "xlink" in svn.flags
with self.reg_mutex:
has_dupes = self._forget_file(