Garmelon/gedaechtnas
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename methods for clarity

Browse source 
Path resolving methods now start with "path".
This commit is contained in:
Joscha 2025-04-28 01:38:04 +02:00
parent 69f36de2d3
commit 97d79f5747
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
gdn/src/data/datadir.rs
View file

@ -78,17 +78,17 @@ impl UnlockedDataDir {
&self.path &self.path
} }
fn version_file(&self) -> PathBuf { fn path_version_file(&self) -> PathBuf {
self.path.join("VERSION") self.path.join("VERSION")
} }
fn lock_file(&self) -> PathBuf { fn path_lock_file(&self) -> PathBuf {
self.path.join("LOCK") self.path.join("LOCK")
} }
pub fn lock(self) -> anyhow::Result<LockedDataDir> { pub fn lock(self) -> anyhow::Result<LockedDataDir> {
Ok(LockedDataDir { Ok(LockedDataDir {
lockfile: LockFile::lock(self.lock_file())?, lockfile: LockFile::lock(self.path_lock_file())?,
unlocked: self, unlocked: self,
}) })
} }
@ -114,7 +114,7 @@ impl UnlockedDataDir {
} }
pub(super) fn read_version(&self) -> anyhow::Result<u32> { pub(super) fn read_version(&self) -> anyhow::Result<u32> {
let path = self.version_file(); let path = self.path_version_file();
match self.read_string_optional(&path)? { match self.read_string_optional(&path)? {
None if self.path.exists() => Err(anyhow!("found data dir without version number")), None if self.path.exists() => Err(anyhow!("found data dir without version number")),
None => Ok(0), None => Ok(0),
@ -129,7 +129,7 @@ impl UnlockedDataDir {
if actual != expected { if actual != expected {
bail!( bail!(
"expected version {expected}, but found {actual} at {}", "expected version {expected}, but found {actual} at {}",
self.version_file().display() self.path_version_file().display()
); );
} }
Ok(()) Ok(())
@ -159,7 +159,7 @@ impl LockedDataDir {
} }
pub(super) fn write_version(&self, version: u32) -> anyhow::Result<()> { pub(super) fn write_version(&self, version: u32) -> anyhow::Result<()> {
self.write_string(&self.version_file(), &format!("{version}\n")) self.write_string(&self.path_version_file(), &format!("{version}\n"))
} }
} }