diff options
author | Ben Bridle <bridle.benjamin@gmail.com> | 2024-08-06 19:11:46 +1200 |
---|---|---|
committer | Ben Bridle <bridle.benjamin@gmail.com> | 2024-08-06 19:12:43 +1200 |
commit | 65b53003e8de9543ba25a3b3d3cace399b92dc1d (patch) | |
tree | 90ba625f4522553136e55b452c9f2f91f29d9753 /src/devices/file/directory_child.rs | |
parent | 406b4d3ea56a19c0389b4214a7d8d15bf3028eb8 (diff) | |
download | bedrock-pc-65b53003e8de9543ba25a3b3d3cace399b92dc1d.zip |
Refactor the file device
The major feature of this refactor is the creation of BedrockFilePath,
a type which can be losslessly converted into an operating-system
specific path or a Bedrock-style byte path. It also prevents file paths
which can't be represented as Bedrock-style byte paths from being
constructed, and allows the use of a base directory which acts as an
inescapable sandbox.
BedrockFilePath will support the creation of a virtual root directory
on Windows which will allow navigation between drive letters via the
standard hierarchical navigation ports.
This commit has been tested on Linux, but not yet Windows. Further work
is expected before the new code will work on Windows.
Diffstat (limited to 'src/devices/file/directory_child.rs')
-rw-r--r-- | src/devices/file/directory_child.rs | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/src/devices/file/directory_child.rs b/src/devices/file/directory_child.rs new file mode 100644 index 0000000..376ec7d --- /dev/null +++ b/src/devices/file/directory_child.rs @@ -0,0 +1,35 @@ +use super::*; + +use std::cmp::Ordering; + + +pub struct DirectoryChild { + pub path: BedrockFilePath, + pub entry_type: EntryType, +} + + +// --------------------------------------------------------------------------- + +impl PartialEq for DirectoryChild { + fn eq(&self, other: &Self) -> bool { + self.entry_type == other.entry_type && self.path == other.path + } +} + +impl Eq for DirectoryChild {} + +impl PartialOrd for DirectoryChild { + fn partial_cmp(&self, other: &Self) -> Option<Ordering> { + Some(self.cmp(other)) + } +} + +impl Ord for DirectoryChild { + fn cmp(&self, other: &Self) -> Ordering { + match self.entry_type.cmp(&other.entry_type) { + Ordering::Equal => self.path.cmp(&other.path), + ordering => ordering, + } + } +} |