Conor425/ludusavi-manifest
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add separate normalization for registry paths

Browse source
This commit is contained in:
mtkennerly 2024-04-21 21:18:51 -04:00
parent a7cc7d5fd3
commit e7a8647c17
No known key found for this signature in database
GPG key ID: E764BE00BE6E6408
4 changed files with 65 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/wiki.rs
View file

@ -6,7 +6,7 @@ use wikitext_parser::{Attribute, TextPiece};
use crate::{
manifest::{placeholder, Os, Store, Tag},
path,
path, registry,
resource::ResourceFile,
should_cancel, Error, Regularity, State,
};
@ -625,7 +625,10 @@ impl WikiPath {
}
pub fn normalize(mut self) -> Self {
self.composite = path::normalize(&self.composite);
self.composite = match self.kind {
None | Some(PathKind::File) => path::normalize(&self.composite),
Some(PathKind::Registry) => registry::normalize(&self.composite),
};
if self.kind.is_none() {
self.kind = Some(PathKind::File);
@ -692,7 +695,10 @@ impl WikiPath {
}
pub fn usable(&self) -> bool {
path::usable(&self.composite) && !self.irregular()
match self.kind {
None | Some(PathKind::File) => path::usable(&self.composite) && !self.irregular(),
Some(PathKind::Registry) => registry::usable(&self.composite) && !self.irregular(),
}
}
}