development/tokei
development/tokei
1
0
Fork 0
mirror of https://github.com/XAMPPRocky/tokei synced 2024-10-05 23:39:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Aaronepower/tokei

Browse source
This commit is contained in:
Aaronepower 2016-03-29 14:39:03 +01:00
parent 2a97d41c20 fe1cb5dc24
commit e0fa667f8f
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/language.rs
View file

@ -96,7 +96,7 @@ impl<'a> fmt::Display for Language<'a> {
self.total
};
write!(f,
" {: <12} {: >12} {:>12} {:>12} {:>12} {:>12}",
" {: <18} {: >6} {:>12} {:>12} {:>12} {:>12}",
self.name,
total,
self.lines,

12
src/main.rs
View file

@ -73,6 +73,7 @@ fn main() {
let lua = Language::new("Lua", "--", "--[[", "]]");
let makefile = Language::new_single("Makefile", "#");
let markdown = Language::new_blank("Markdown");
let mustache = Language::new_multi("Mustache", "{{!", "}}");
let objective_c = Language::new_c("Objective C");
let objective_cpp = Language::new_c("Objective C++");
let ocaml = Language::new_multi("OCaml", "(*", "*)");
@ -80,6 +81,7 @@ fn main() {
let pascal = Language::new("Pascal", "//,(*", "{", "}");
let polly = Language::new_html("Polly");
let perl = Language::new("Perl", "#", "=", "=cut");
let protobuf = Language::new_single("Protocol Buffers", "//");
let python = Language::new("Python", "#", "'''", "'''");
let r = Language::new_single("R", "#");
let ruby = Language::new("Ruby", "#", "=begin", "=end");
@ -93,8 +95,10 @@ fn main() {
let text = Language::new_blank("Plain Text");
let toml = Language::new_single("TOML", "#");
let type_script = Language::new_c("TypeScript");
let vim_script = Language::new_single("Vim script", "\"");
let xml = Language::new_html("XML");
let yaml = Language::new_single("YAML", "#");
let zsh = Language::new_single("Zsh", "#");
// Languages are placed inside a BTreeMap, in order to print alphabetically by default
let languages = btreemap! {
@ -160,12 +164,14 @@ fn main() {
"mli" => &ocaml,
"mm" => &objective_cpp,
"makefile" => &makefile,
"mustache" => &mustache,
"php" => &php,
"pas" => &pascal,
"pl" => &perl,
"text" => &text,
"txt" => &text,
"polly" => &polly,
"proto" => &protobuf,
"py" => &python,
"r" => &r,
"rake" => &ruby,
@ -181,9 +187,11 @@ fn main() {
"sty" => &tex,
"toml" => &toml,
"ts" => &type_script,
"vim" => &vim_script,
"xml" => &xml,
"yaml" => &yaml,
"yml" => &yaml,
"zsh" => &zsh,
};
// Print every supported language.
@ -363,10 +371,10 @@ fn get_all_files<'a, I: Iterator<Item = &'a str>>(paths: I,
if let Ok(paths) = glob(path) {
for path in paths {
let path = unwrap_rs_cont!(path);
let extension = unwrap_opt_cont!(get_extension(&path));
let language = if unwrap_opt_cont!(path.to_str()).contains("Makefile") {
languages.get("makefile").unwrap()
} else {
let extension = unwrap_opt_cont!(get_extension(&path));
unwrap_opt_cont!(languages.get(&*extension))
};
@ -388,10 +396,10 @@ fn get_all_files<'a, I: Iterator<Item = &'a str>>(paths: I,
for entry in walker {
let entry = unwrap_rs_cont!(entry);
let extension = unwrap_opt_cont!(get_extension(entry.path()));
let language = if unwrap_opt_cont!(entry.path().to_str()).contains("Makefile") {
languages.get("makefile").unwrap()
} else {
let extension = unwrap_opt_cont!(get_extension(entry.path()));
unwrap_opt_cont!(languages.get(&*extension))
};