frank/sharkdp--bat
1
0
Fork 0
mirror of https://github.com/sharkdp/bat synced 2026-07-23 17:03:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Small refactoring, handle invalid UTF-8 filenames

Browse Source
This commit is contained in:
sharkdp
2020-04-21 08:19:24 +02:00
committed by David Peter
parent 83d408bab3
commit 34619a2e89
5 changed files with 47 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/inputfile.rs
+6 -9
View File
@@ -55,26 +55,23 @@ impl<'a> InputFileReader<'a> {
#[derive(Debug, Clone, Copy, PartialEq)]
pub struct OrdinaryFile<'a> {
path: &'a OsStr,
user_provided_name: Option<&'a OsStr>,
user_provided_path: Option<&'a OsStr>,
}
impl<'a> OrdinaryFile<'a> {
pub fn from_path(path: &'a OsStr) -> OrdinaryFile<'a> {
OrdinaryFile {
path,
user_provided_name: None,
user_provided_path: None,
}
}
pub fn from_path_with_name(path: &'a OsStr, user_provided_name: &'a OsStr) -> OrdinaryFile<'a> {
OrdinaryFile {
path,
user_provided_name: Some(user_provided_name),
}
pub fn set_provided_path(&mut self, user_provided_path: &'a OsStr) {
self.user_provided_path = Some(user_provided_path);
}
pub(crate) fn filename(&self) -> &'a OsStr {
self.user_provided_name.unwrap_or_else(|| self.path)
pub(crate) fn provided_path(&self) -> &'a OsStr {
self.user_provided_path.unwrap_or_else(|| self.path)
}
}