Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
vnotepad
Exa
提交
10fecbd7
E
Exa
项目概览
vnotepad
/
Exa
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
E
Exa
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
10fecbd7
编写于
9月 03, 2015
作者:
B
Ben S
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Details view comments and tidy-ups
上级
a14f1d82
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
161 addition
and
21 deletion
+161
-21
src/dir.rs
src/dir.rs
+8
-0
src/file.rs
src/file.rs
+21
-10
src/output/details.rs
src/output/details.rs
+132
-11
未找到文件。
src/dir.rs
浏览文件 @
10fecbd7
...
...
@@ -14,8 +14,15 @@ use file::{File, fields};
/// check the existence of surrounding files, then highlight themselves
/// accordingly. (See `File#get_source_files`)
pub
struct
Dir
{
/// A vector of the files that have been read from this directory.
contents
:
Vec
<
PathBuf
>
,
/// The path that was read.
pub
path
:
PathBuf
,
/// Holds a `Git` object if scanning for Git repositories is switched on,
/// and this directory happens to contain one.
git
:
Option
<
Git
>
,
}
...
...
@@ -71,6 +78,7 @@ impl Dir {
}
/// Iterator over reading the contents of a directory as `File` objects.
pub
struct
Files
<
'dir
>
{
inner
:
SliceIter
<
'dir
,
PathBuf
>
,
dir
:
&
'dir
Dir
,
...
...
src/file.rs
浏览文件 @
10fecbd7
...
...
@@ -56,6 +56,7 @@ pub struct File<'dir> {
}
impl
<
'dir
>
File
<
'dir
>
{
/// Create a new `File` object from the given `Path`, inside the given
/// `Dir`, if appropriate.
///
...
...
@@ -70,11 +71,11 @@ impl<'dir> File<'dir> {
let
filename
=
path_filename
(
path
);
File
{
path
:
path
.to_path_buf
(),
dir
:
parent
,
metadata
:
metadata
,
ext
:
ext
(
&
filename
),
name
:
filename
.to_string
(),
path
:
path
.to_path_buf
(),
dir
:
parent
,
metadata
:
metadata
,
ext
:
ext
(
&
filename
),
name
:
filename
.to_string
(),
}
}
...
...
@@ -83,6 +84,12 @@ impl<'dir> File<'dir> {
self
.metadata
.is_dir
()
}
/// If this file is a directory on the filesystem, then clone its
/// `PathBuf` for use in one of our own `Dir` objects, and read a list of
/// its contents.
///
/// Returns an IO error upon failure, but this shouldn't be used to check
/// if a `File` is a directory or not! For that, just use `is_directory()`.
pub
fn
to_dir
(
&
self
,
scan_for_git
:
bool
)
->
io
::
Result
<
Dir
>
{
Dir
::
read_dir
(
&*
self
.path
,
scan_for_git
)
}
...
...
@@ -178,11 +185,11 @@ impl<'dir> File<'dir> {
// Use plain `metadata` instead of `symlink_metadata` - we *want* to follow links.
if
let
Ok
(
metadata
)
=
fs
::
metadata
(
&
target_path
)
{
Ok
(
File
{
path
:
target_path
.to_path_buf
(),
dir
:
self
.dir
,
metadata
:
metadata
,
ext
:
ext
(
&
filename
),
name
:
filename
.to_string
(),
path
:
target_path
.to_path_buf
(),
dir
:
self
.dir
,
metadata
:
metadata
,
ext
:
ext
(
&
filename
),
name
:
filename
.to_string
(),
})
}
else
{
...
...
@@ -282,6 +289,10 @@ impl<'dir> File<'dir> {
}
/// This file's permissions, with flags for each bit.
///
/// The extended-attribute '@' character that you see in here is in fact
/// added in later, to avoid querying the extended attributes more than
/// once. (Yes, it's a little hacky.)
pub
fn
permissions
(
&
self
)
->
f
::
Permissions
{
let
bits
=
self
.metadata
.permissions
()
.mode
();
let
has_bit
=
|
bit
|
{
bits
&
bit
==
bit
};
...
...
src/output/details.rs
浏览文件 @
10fecbd7
//! The **Details** output view displays each file as a row in a table.
//!
//! It's used in the following situations:
//!
//! - Most commonly, when using the `--long` command-line argument to display the
//! details of each file, which requires using a table view to hold all the data;
//! - When using the `--tree` argument, which uses the same table view to display
//! each file on its own line, with the table providing the tree characters;
//! - When using both the `--long` and `--grid` arguments, which constructs a
//! series of tables to fit all the data on the screen.
//!
//! You will probably recognise it from the `ls --long` command. It looks like
//! this:
//!
//! .rw-r--r-- 9.6k ben 29 Jun 16:16 Cargo.lock
//! .rw-r--r-- 547 ben 23 Jun 10:54 Cargo.toml
//! .rw-r--r-- 1.1k ben 23 Nov 2014 LICENCE
//! .rw-r--r-- 2.5k ben 21 May 14:38 README.md
//! .rw-r--r-- 382k ben 8 Jun 21:00 screenshot.png
//! drwxr-xr-x - ben 29 Jun 14:50 src
//! drwxr-xr-x - ben 28 Jun 19:53 target
//!
//! The table is constructed by creating a `Table` value, which produces a `Row`
//! value for each file. These rows can contain a vector of `Cell`s, or they can
//! contain depth information for the tree view, or both. These are described
//! below.
//!
//!
//! ## Constructing Detail Views
//!
//! When using the `--long` command-line argument, the details of each file are
//! displayed next to its name.
//!
//! The table holds a vector of all the column types. For each file and column, a
//! `Cell` value containing the ANSI-coloured text and Unicode width of each cell
//! is generated, with the row and column determined by indexing into both arrays.
//!
//! The column types vector does not actually include the filename. This is
//! because the filename is always the rightmost field, and as such, it does not
//! need to have its width queried or be padded with spaces.
//!
//! To illustrate the above:
//!
//! ┌─────────────────────────────────────────────────────────────────────────┐
//! │ columns: [ Permissions, Size, User, Date(Modified) ] │
//! ├─────────────────────────────────────────────────────────────────────────┤
//! │ rows: cells: filename: │
//! │ row 1: [ ".rw-r--r--", "9.6k", "ben", "29 Jun 16:16" ] Cargo.lock │
//! │ row 2: [ ".rw-r--r--", "547", "ben", "23 Jun 10:54" ] Cargo.toml │
//! │ row 3: [ "drwxr-xr-x", "-", "ben", "29 Jun 14:50" ] src │
//! │ row 4: [ "drwxr-xr-x", "-", "ben", "28 Jun 19:53" ] target │
//! └─────────────────────────────────────────────────────────────────────────┘
//!
//! Each column in the table needs to be resized to fit its widest argument. This
//! means that we must wait until every row has been added to the table before it
//! can be displayed, in order to make sure that every column is wide enough.
//!
//!
//! ## Constructing Tree Views
//!
//! When using the `--tree` argument, instead of a vector of cells, each row has a
//! `depth` field that indicates how far deep in the tree it is: the top level has
//! depth 0, its children have depth 1, and *their* children have depth 2, and so
//! on.
//!
//! On top of this, it also has a `last` field that specifies whether this is the
//! last row of this particular consecutive set of rows. This doesn't affect the
//! file's information; it's just used to display a different set of Unicode tree
//! characters! The resulting table looks like this:
//!
//! ┌───────┬───────┬───────────────────────┐
//! │ Depth │ Last │ Output │
//! ├───────┼───────┼───────────────────────┤
//! │ 0 │ │ documents │
//! │ 1 │ false │ ├── this_file.txt │
//! │ 1 │ false │ ├── that_file.txt │
//! │ 1 │ false │ ├── features │
//! │ 2 │ false │ │ ├── feature_1.rs │
//! │ 2 │ false │ │ ├── feature_2.rs │
//! │ 2 │ true │ │ └── feature_3.rs │
//! │ 1 │ true │ └── pictures │
//! │ 2 │ false │ ├── garden.jpg │
//! │ 2 │ false │ ├── flowers.jpg │
//! │ 2 │ false │ ├── library.png │
//! │ 2 │ true │ └── space.tiff │
//! └───────┴───────┴───────────────────────┘
//!
//! Creating the table like this means that each file has to be tested to see if
//! it's the last one in the group. This is usually done by putting all the files
//! in a vector beforehand, getting its length, then comparing the index of each
//! file to see if it's the last one. (As some files may not be successfully
//! `stat`ted, we don't know how many files are going to exist in each directory)
//!
//! These rows have a `None` value for their vector of cells, instead of a `Some`
//! vector containing any. It's possible to have *both* a vector of cells and
//! depth and last flags when the user specifies `--tree` *and* `--long`.
//!
//!
//! ## Extended Attributes and Errors
//!
//! Finally, files' extended attributes and any errors that occur while statting
//! them can also be displayed as their children. It looks like this:
//!
//! .rw-r--r-- 0 ben 3 Sep 13:26 forbidden
//! └── <Permission denied (os error 13)>
//! .rw-r--r--@ 0 ben 3 Sep 13:26 file_with_xattrs
//! ├── another_greeting (len 2)
//! └── greeting (len 5)
//!
//! These lines also have `None` cells, and the error string or attribute details
//! are used in place of the filename.
use
std
::
error
::
Error
;
use
std
::
io
;
use
std
::
path
::
PathBuf
;
...
...
@@ -66,15 +179,19 @@ pub struct Details {
}
impl
Details
{
/// Print the details of the given vector of files -- all of which will
/// have been read from the given directory, if present -- to stdout.
pub
fn
view
(
&
self
,
dir
:
Option
<&
Dir
>
,
files
:
Vec
<
File
>
)
{
// First, transform the Columns object into a vector of columns for
// the current directory.
let
columns_for_dir
=
match
self
.columns
{
Some
(
cols
)
=>
cols
.for_dir
(
dir
),
None
=>
Vec
::
new
(),
};
// Next, add a header if the user requests it.
let
mut
table
=
Table
::
with_options
(
self
.colours
,
columns_for_dir
);
if
self
.header
{
table
.add_header
()
}
...
...
@@ -85,9 +202,9 @@ impl Details {
}
}
/// Adds files to the table
- recursively, if the `recurse` option
///
is present
.
fn
add_files_to_table
<
'dir
,
U
:
Users
+
Send
+
Sync
>
(
&
self
,
mut
table
:
&
mut
Table
<
U
>
,
src
:
Vec
<
File
<
'dir
>>
,
depth
:
usize
)
{
/// Adds files to the table
, possibly recursively. This is easily
///
parallelisable, and uses a pool of threads
.
fn
add_files_to_table
<
'dir
,
U
:
Users
+
Send
>
(
&
self
,
mut
table
:
&
mut
Table
<
U
>
,
src
:
Vec
<
File
<
'dir
>>
,
depth
:
usize
)
{
use
num_cpus
;
use
scoped_threadpool
::
Pool
;
use
std
::
sync
::{
Arc
,
Mutex
};
...
...
@@ -133,8 +250,11 @@ impl Details {
};
let
cells
=
table
.lock
()
.unwrap
()
.cells_for_file
(
&
file
,
!
xattrs
.is_empty
());
let
links
=
true
;
let
name
=
Cell
{
text
:
filename
(
&
file
,
&
self
.colours
,
links
),
length
:
file
.file_name_width
()
};
let
name
=
Cell
{
text
:
filename
(
&
file
,
&
self
.colours
,
true
),
length
:
file
.file_name_width
()
};
let
mut
dir
=
None
;
...
...
@@ -218,10 +338,10 @@ struct Row {
/// Vector of cells to display.
///
/// Most of the rows will be
files that have had their metadata
///
successfully queried and displayed in these cells, so this will almost
///
always be `Some`. It will be `None` for a row that's only displaying
///
an attribute or an error
.
/// Most of the rows will be
used to display files' metadata, so this will
///
almost always be `Some`, containing a vector of cells. It will only be
///
`None` for a row displaying an attribute or error, neither of which
///
have cells
.
cells
:
Option
<
Vec
<
Cell
>>
,
// Did You Know?
...
...
@@ -242,7 +362,8 @@ struct Row {
impl
Row
{
/// Gets the 'width' of the indexed column, if present. If not, returns 0.
/// Gets the Unicode display width of the indexed column, if present. If
/// not, returns 0.
fn
column_width
(
&
self
,
index
:
usize
)
->
usize
{
match
self
.cells
{
Some
(
ref
cells
)
=>
cells
[
index
]
.length
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录