Allow ubireader_list_files to recursively list files under a path
#118
Conversation
ubireader/ubifs/list.py
Outdated
|
|
||
|
|
||
| def find_dir(inodes: Mapping[int, _Inode], inum: int, names: list[str], idx: int) -> int | None: | ||
| def find_dir(inodes: Mapping[int, _Inode], inum: int, names: Sequence[str], idx: int) -> int | None: |
There was a problem hiding this comment.
Why was Sequence used instead of list? I know Sequence is more generic, but list was already there, and I do not see the reason to pull in Sequence just to be more generic in a script.
There was a problem hiding this comment.
That's a change I forgot to revert. At one point I was passing down a tuple (specifically Path.parts) into this function. This required the change to Sequence to allow for tuples.
Since that's no longer necessary, I will revert this change.
ubireader/ubifs/list.py
Outdated
| if len(names) == 0: | ||
| return 1 | ||
| for dent in inodes[inum]['dent']: | ||
| for dent in inodes[inum].get('dent', []): |
There was a problem hiding this comment.
This made me think: what was broken here, and how is it a fix?
I think the reason it was changed was, that names is a sequence of path parts, where one of them could point to a file (instead of a directory), which has no dent.
However I think, that a more direct solution would be to check for the type of inode earlier, and return None if it is not a directory.
Looking at inode type also lets us optionally resolve and follow parts if they are pointing to symlinks.
There was a problem hiding this comment.
The _Inode type is marked as total=False so my IDE keeps complaining that 'dent' might be missing from the dictionary. To my knowledge there's nothing wrong with the current implementation, it's just a limitation of the type checking.
I guess a better fix would be to have multiple Inode types with different "required" keys, but for now I will revert the change in this PR.
scootermon
force-pushed
the
feat/list-recursive
branch
from
74e2c7b to
dee92a9
Compare
scootermon
force-pushed
the
feat/list-recursive
branch
2 times, most recently
from
e1e32df to
b6ad0e6
Compare
The default output of ubireader_list_files remains the same, but when you add '--recursive' it will recursively list all the inodes under the listpath. It then also displays the absolute path to the files instead of just the name.
scootermon
force-pushed
the
feat/list-recursive
branch
from
b6ad0e6 to
e2f6845
Compare
3 participants
This is based on top of #117, but I'm happy to rebase it.