From c7845f3c882d0f1b215813bf0ef8231c2c03d7b6 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 13 Aug 2024 20:04:58 +0300 Subject: refactor(tvix/castore): move *Node and Directory to crate root *Node and Directory are types of the tvix-castore model, not the tvix DirectoryService model. A DirectoryService only happens to send Directories. Move types into individual files in a nodes/ subdirectory, as it's gotten too cluttered in a single file, and (re-)export all types from the crate root. This has the effect that we now cannot poke at private fields directly from other files inside `crate::directoryservice` (as it's not all in the same file anymore), but that's a good thing, it now forces us to go through the proper accessors. For the same reasons, we currently also need to introduce the `rename` functions on each *Node directly. A followup is gonna move the names out of the individual enum kinds, so we can better represent "unnamed nodes". Change-Id: Icdb34dcfe454c41c94f2396e8e99973d27db8418 Reviewed-on: https://cl.tvl.fyi/c/depot/+/12199 Reviewed-by: yuka Autosubmit: flokli Tested-by: BuildkiteCI --- tvix/castore/src/nodes/symlink_node.rs | 50 ++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 tvix/castore/src/nodes/symlink_node.rs (limited to 'tvix/castore/src/nodes/symlink_node.rs') diff --git a/tvix/castore/src/nodes/symlink_node.rs b/tvix/castore/src/nodes/symlink_node.rs new file mode 100644 index 000000000000..2fac27231a85 --- /dev/null +++ b/tvix/castore/src/nodes/symlink_node.rs @@ -0,0 +1,50 @@ +use crate::{NamedNode, ValidateNodeError}; + +/// A SymlinkNode represents a symbolic link in a Directory or at the root. +#[derive(Debug, Clone, PartialEq, Eq)] +pub struct SymlinkNode { + /// The (base)name of the symlink + name: bytes::Bytes, + /// The target of the symlink. + target: bytes::Bytes, +} + +impl SymlinkNode { + pub fn new(name: bytes::Bytes, target: bytes::Bytes) -> Result { + if target.is_empty() || target.contains(&b'\0') { + return Err(ValidateNodeError::InvalidSymlinkTarget(target)); + } + Ok(Self { name, target }) + } + + pub fn target(&self) -> &bytes::Bytes { + &self.target + } + + pub(crate) fn rename(self, name: bytes::Bytes) -> Self { + Self { name, ..self } + } +} + +impl PartialOrd for SymlinkNode { + fn partial_cmp(&self, other: &Self) -> Option { + Some(self.cmp(other)) + } +} + +impl Ord for SymlinkNode { + fn cmp(&self, other: &Self) -> std::cmp::Ordering { + self.get_name().cmp(other.get_name()) + } +} + +impl NamedNode for &SymlinkNode { + fn get_name(&self) -> &bytes::Bytes { + &self.name + } +} +impl NamedNode for SymlinkNode { + fn get_name(&self) -> &bytes::Bytes { + &self.name + } +} -- cgit 1.4.1