MagnitudeOS/littlefs
1
0
Fork 0
forked from Imagelibrary/littlefs
Code Pull Requests Activity

scripts: Removed item/iter magic methods from fs object classes

Browse Source 
So no more __getitem__, __contains__, or __iter__ for Rbyd, Btree, Mdir,
Mtree, Lfs.File, etc.

These were way too error-prone, especially when accidental unpacking
triggered unintended disk traversal and weird error states. We didn't
even use the implicit behavior because we preferred the full name for
heavy disk operations.

The motivation for this was Python not catching this bug, which is a bit
silly:

  rid, rattr, *path_ = rbyd
This commit is contained in:
Christopher Haster
2025-04-07 02:46:54 -05:00
parent 81b1a3cb71
commit b2911fbbe7
6 changed files with 1 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
scripts/dbglfs.py
View File

@@ -857,18 +857,6 @@ class Rbyd:
else:
return rattr_
def __getitem__(self, key):
if not isinstance(key, tuple):
key = (key,)
return self.lookup(*key)
def __contains__(self, key):
if not isinstance(key, tuple):
key = (key,)
return self.lookup(*key) is not None
def rids(self, *,
path=False):
rid = -1
@@ -935,9 +923,6 @@ class Rbyd:
yield rattr_
tag_ = rattr_.tag
def __iter__(self):
return self.rattrs()
# lookup by name
def namelookup(self, did, name):
# binary search
@@ -1142,18 +1127,6 @@ class Btree:
else:
return rattr_
def __getitem__(self, key):
if not isinstance(key, tuple):
key = (key,)
return self.lookup(*key)
def __contains__(self, key):
if not isinstance(key, tuple):
key = (key,)
return self.lookup(*key) is not None
# note leaves only iterates over leaf rbyds, whereas traverse
# traverses all rbyds
def leaves(self, *,
@@ -1284,9 +1257,6 @@ class Btree:
else:
yield rattr
def __iter__(self):
return self.rattrs()
# lookup by name
def namelookupleaf(self, did, name, *,
path=False,
@@ -1538,18 +1508,6 @@ class Mdir:
return self.rbyd.lookup(mid.mrid, tag, mask,
path=path)
def __getitem__(self, key):
if not isinstance(key, tuple):
key = (key,)
return self.lookup(*key)
def __contains__(self, key):
if not isinstance(key, tuple):
key = (key,)
return self.lookup(*key) is not None
def mids(self, *,
path=False):
for r in self.rbyd.rids(
@@ -1586,9 +1544,6 @@ class Mdir:
yield from self.rbyd.rattrs(mid.mrid, tag, mask,
path=path)
def __iter__(self):
return self.rattrs()
# lookup by name
def namelookup(self, did, name):
# unlike rbyd namelookup, we need an exact match here
@@ -1886,18 +1841,6 @@ class Mtree:
else:
return mdir, name
def __getitem__(self, key):
if not isinstance(key, tuple):
key = (key,)
return self.lookup(*key)
def __contains__(self, key):
if not isinstance(key, tuple):
key = (key,)
return self.lookup(*key) is not None
# iterate over all mdirs, this includes the mrootchain
def _leaves(self, *,
path=False,
@@ -2129,9 +2072,6 @@ class Mtree:
else:
yield rattr
def __iter__(self):
return self.mids()
# lookup by name
def _namelookupleaf(self, did, name, *,
path=False,
@@ -3113,9 +3053,6 @@ class Lfs:
break
mid = self.mid(mbid, mrid)
def __iter__(self):
return self.files()
def orphans(self,
all=False):
all_ = all; del all
@@ -3493,9 +3430,6 @@ class Lfs:
path=path,
depth=depth)
def __iter__(self):
return self.datas()
# some convience operations for reading data
def bytes(self, *,
depth=None):