Skip to content

Commit 7541574

Browse files
o2sho2sh
committed
multicolor ascii for haskell/python/Clojure and news ascii for Cpp/Csharp and added support for php
1 parent 6af8789 commit 7541574

File tree

8 files changed

+112
-111
lines changed

8 files changed

+112
-111
lines changed

‎resources/clojure.ascii

+25-24
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,25 @@
1-
`.-:///+////:-.`
2-
.:/ooooooooooooooooo+/-`
3-
`:+oooooooooooooooooooooooo+:`
4-
./oooooooooooooooooooooooooooooo/`
5-
.-.` `.-/+/:-....-:/+ooooooooooo:
6-
`.....`` `-/ooooooooo+`
7-
.:/+ooo: `` -:::::::-.` `/oooooooo+`
8-
-+ooooo+` `://:` -:::::::::- .+ooooooo+`
9-
`+oooooo+ .//////. -::::::::::` `+ooooooo:
10-
+ooooooo` `////////. `:::::::::::` .oooooooo`
11-
-ooooooo/ :////////: .::::::::::- +ooooooo.
12-
:ooooooo: /////////` ::::::::::- +ooooooo-
13-
-ooooooo/ :///////` :. `:::::::::- oooooooo.
14-
`oooooooo. `/////:` -/: .::::::::` -ooooooo+
15-
/ooooooo+` .:///` .///- .::::::` `ooooooo/`
16-
`+ooooooo+. `-/. :////. `:::. -oooooo/.
17-
.ooooooooo/` `//////- ` .:::--.
18-
`+ooooooooo/-` ``....` `
19-
:ooooooooooo+/:-----::/ooo+//////++-
20-
`:oooooooooooooooooooooooooooooo:`
21-
`-+oooooooooooooooooooooooo/-
22-
`-/+oooooooooooooooo+:-`
23-
`.--::////::-.`
24-
````
1+
2+
{0} `.-:///+////:-.`
3+
{0} .:/ooooooooooooooooo+/-`
4+
{0} `:+oooooooooooooooooooooooo+:`
5+
{0} ./oooooooooooooooooooooooooooooo/`
6+
{0} .-.` `.-/+/:-....-:/+ooooooooooo:
7+
{0} `.....`` `-/ooooooooo+`
8+
{1} .:/+ooo: `` {0} -:::::::-.` `/oooooooo+`
9+
{1} -+ooooo+` `://:` {0} -:::::::::- .+ooooooo+`
10+
{1} `+oooooo+ .//////. {0} -::::::::::` `+ooooooo:
11+
{1} +ooooooo` `////////.{0} `:::::::::::` .oooooooo`
12+
{1} -ooooooo/ :////////: {0} .::::::::::- +ooooooo.
13+
{1} :ooooooo: /////////` {0} ::::::::::- +ooooooo-
14+
{1} -ooooooo/ :///////` :. {0}`:::::::::- oooooooo.
15+
{1} `oooooooo. `/////:` -/: {0} .::::::::` -ooooooo+
16+
{1} /ooooooo+` .:///` .///- {0} .::::::` `ooooooo/`
17+
{1} `+ooooooo+. `-/. :////. {0} `:::. -oooooo/.
18+
{1} .ooooooooo/` `//////- {0} ` .:::--.
19+
{1} `+ooooooooo/-` ``....` `
20+
{1} :ooooooooooo+/:-----::/ooo+//////++-
21+
{1} `:oooooooooooooooooooooooooooooo:`
22+
{1} `-+oooooooooooooooooooooooo/-
23+
{1} `-/+oooooooooooooooo+:-`
24+
{1} `.--::////::-.`
25+
{1} ````

‎resources/cpp.ascii

+8-12
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
1-
2-
3-
4-
`/+ooooo:
5-
.oss:.`.-` +s- .ss
6-
/ss+ /++os+++-.+++ss+++
7-
:sso` .--os/--``--:ss---
8-
`/sso///+- /+. `++
9-
.:////:`
10-
11-
12-
1+
2+
_____
3+
/ ____|_ _
4+
| | _| |_ _| |_
5+
| | |_ _|_ _|
6+
| |____|_| |_|
7+
\_____|
8+

‎resources/csharp.ascii

+9-19
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,11 @@
11

22

3-
`.-:::--.`
4-
./oyhhhhhhhhhhyo/.
5-
`+yhhhhhhhhhhhhhhhhhhy/`
6-
`+hhhhhhhhhhhhhhhhhhhhhhhh+`
7-
-yhhhhhhhhhhhhhyhhhhhhhhhhhhy.
8-
:hhhhhhhhhy+-` `-+yhhhhhs/.
9-
.hhhhhhhhh/ `+yo:` .` .`
10-
ohhhhhhhh- -:ho-:ho:
11-
yhhhhhhhs :+hs//hs/
12-
hhhhhhhho -:ho-:ho-
13-
ohhhhhhhh. /+hs/+hs/
14-
.hhhhhhhhy- :s/- -. -.
15-
/hhhhhhhhhs:. ./shhhhyo:`
16-
:hhhhhhhhhhhhyssyhhhhhhhhhhhy.
17-
.shhhhhhhhhhhhhhhhhhhhhhhho`
18-
-ohhhhhhhhhhhhhhhhhhhho.
19-
`:+yhhhhhhhhhhhhy+:`
20-
`.-:////:-.`
21-
3+
________/\\\\\\\\\____/\\\__/\\\___
4+
_____/\\\////////____\/\\\_\/\\\___
5+
___/\\\/____________/\\\\\\\\\\\\\_
6+
__/\\\_____________\///\\\///\\\/__
7+
_\/\\\_______________\/\\\_\/\\\___
8+
_\//\\\_____________/\\\\\\\\\\\\\_
9+
__\///\\\__________\///\\\///\\\/__
10+
____\////\\\\\\\\\___\/\\\_\/\\\___
11+
_______\/////////____\///__\///____

‎resources/haskell.ascii

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11

2-
-ssssss+``:+++++/`
3-
`ossssso. -++++++-
4-
/ssssss: ./+++++:`
5-
-ssssss+``:+++++/.
6-
`ossssso. -++++++- `ossssssssssssss
7-
/ssssss: ./+++++:``+sssssssssssss
8-
-ssssss+``:+++++/. -::::::::::::
9-
-ssssss+``:+++++++- .----------
10-
/ssssss: `/+++++++++:``+sssssssss
11-
`ossssso. -++++++/+++++/. :ssssssss
12-
-ssssss+``:+++++/. -/+++++-
13-
/ssssss: ./+++++:` `/+++++/`
14-
`ossssso. -++++++- :+++++/.
15-
-ssssss+``:+++++/` ./+++++-
2+
{0} -ssssss+{1}``:+++++/`
3+
{0} `ossssso.{1} -++++++-
4+
{0} /ssssss:{1} ./+++++:`
5+
{0} -ssssss+{1}``:+++++/.
6+
{0} `ossssso.{1} -++++++- {2}`ossssssssssssss
7+
{0} /ssssss:{1} ./+++++:{2}``+sssssssssssss
8+
{0} -ssssss+{1}``:+++++/.
9+
{0} -ssssss+{1}``:+++++++-
10+
{0} /ssssss:{1} `/+++++++++:{2}``+sssssssss
11+
{0} `ossssso.{1} -++++++/+++++/{2}. :ssssssss
12+
{0} -ssssss+{1}``:+++++/. -/+++++-
13+
{0} /ssssss:{1} ./+++++:` `/+++++/`
14+
{0} `ossssso.{1} -++++++- :+++++/.
15+
{0}-ssssss+{1}``:+++++/` ./+++++-

‎resources/php.ascii

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
_
2+
| |
3+
_ __ | |__ _ __
4+
| _ \| _ \| _ \
5+
| |_) | | | | |_) |
6+
| __/|_| |_| __/
7+
| | | |
8+
|_| |_|

‎resources/python.ascii

+18-18
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11

2-
`.-::::::-.`
3-
:ososssssssssso-
4-
.ss` .ssssssssyyy.
5-
.sso+ssssssssyyyy-
6-
`::::::::syyyyyyy-
7-
`:ossssssssssssyyyyyyyyy-.----.`
8-
.ssssssssssssssyyyyyyyyyy-.------`
9-
+sssssssssssyyyyyyyyyyyys`.-------
10-
ssssssssssssssssssssso+:`.--------
11-
sssssssso-```...........----------
12-
osssssys`..-----------------------
13-
:sssyyy+`------------------------.
14-
:syyyy+`-----------------------`
15-
.-::-`--------`````````````
16-
`----------------`
17-
`-----------. --`
18-
.-----------..--
19-
`..........``
2+
{0} `.-::::::-.`
3+
{0} :ososssssssssso-
4+
{0} .ss` .ssssssssyyy.
5+
{0} .sso+ssssssssyyyy-
6+
{0} `::::::::syyyyyyy-
7+
{0} `:ossssssssssssyyyyyyyyy-{1}.----.`
8+
{0} .ssssssssssssssyyyyyyyyyy-{1}.------`
9+
{0} +sssssssssssyyyyyyyyyyyys`{1}.-------
10+
{0} ssssssssssssssssssssso+:`{1}.--------
11+
{0} sssssssso-{1}```...........----------
12+
{0} osssssys`{1}..-----------------------
13+
{0} :sssyyy+`{1}------------------------.
14+
{0} :syyyy+`{1}-----------------------`
15+
{0} .-::-`{1}--------`````````````
16+
{1} `----------------`
17+
{1} `-----------. --`
18+
{1} .-----------..--
19+
{1} `..........``

‎resources/r.ascii

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11

2-
.,,,,,,,,,,,,,
3-
,,,,,,,,,,,,,,,,,********
4-
,,,,,,,,,,,,,,,,,**************
5-
,,,,,,,,,,,, *****
6-
,,,,,,,,, RRRRRRRRRRRRRRRR ***
7-
,,,,,,,,, RRRRRRRRRRRRRRRRRRR ***
8-
,,,,,,,, RRRRRRRRRRRRRRRRRRRR //
9-
,,,,,,* RRRRRRR RRRRRRR //
10-
,,,***** RRRRRRR RRRRRRR //
11-
******** RRRRRRRRRRRRRRRRRR //
12-
********* RRRRRRRRRRRRRR //
13-
,**********RRRRRRR RRRRRRR
14-
*******RRRRRRR////RRRRRRR
15-
RRRRRRR RRRRRRRR
2+
{0} .,,,,,,,,,,,,,
3+
{0} ,,,,,,,,,,,,,,,,,********
4+
{0} ,,,,,,,,,,,,,,,,,**************
5+
{0} ,,,,,,,,,,,, *****
6+
{0} ,,,,,,,,, {1}RRRRRRRRRRRRRRRR {0}***
7+
{0},,,,,,,,, {1}RRRRRRRRRRRRRRRRRRR {0}***
8+
{0},,,,,,,, {1}RRRRRRRRRRRRRRRRRRRR {0}//
9+
{0},,,,,,* {1}RRRRRRR RRRRRRR {0}//
10+
{0},,,***** {1}RRRRRRR RRRRRRR {0}//
11+
{0} ******** {1}RRRRRRRRRRRRRRRRRR {0}//
12+
{0} ********* {1}RRRRRRRRRRRRRR {0}//
13+
{0} ,**********{1}RRRRRRR RRRRRRR
14+
{0} *******{1}RRRRRRR////RRRRRRR
15+
{1} RRRRRRR RRRRRRRR

‎src/main.rs

+16-10
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,8 @@ enum Language {
178178
Scala,
179179
Shell,
180180
TypeScript,
181-
JavaScript,
181+
JavaScript,
182+
Php,
182183
}
183184

184185
impl fmt::Display for Language {
@@ -200,7 +201,8 @@ impl fmt::Display for Language {
200201
Language::Scala => write!(f, "Scala"),
201202
Language::Shell => write!(f, "Shell"),
202203
Language::TypeScript => write!(f, "TypeScript"),
203-
Language::JavaScript => write!(f, "JavaScript"),
204+
Language::JavaScript => write!(f, "JavaScript"),
205+
Language::Php => write!(f, "Php"),
204206
}
205207
}
206208
}
@@ -392,7 +394,8 @@ impl From<tokei::LanguageType> for Language {
392394
tokei::LanguageType::Scala => Language::Scala,
393395
tokei::LanguageType::Sh => Language::Shell,
394396
tokei::LanguageType::TypeScript => Language::TypeScript,
395-
tokei::LanguageType::JavaScript => Language::JavaScript,
397+
tokei::LanguageType::JavaScript => Language::JavaScript,
398+
tokei::LanguageType::Php => Language::Php,
396399
_ => unimplemented!(),
397400
}
398401
}
@@ -416,7 +419,8 @@ fn get_all_language_types() -> Vec<tokei::LanguageType> {
416419
tokei::LanguageType::Scala,
417420
tokei::LanguageType::Sh,
418421
tokei::LanguageType::TypeScript,
419-
tokei::LanguageType::JavaScript,
422+
tokei::LanguageType::JavaScript,
423+
tokei::LanguageType::Php,
420424
]
421425
}
422426

@@ -439,30 +443,32 @@ impl Info {
439443
Language::Scala => include_str!("../resources/scala.ascii"),
440444
Language::Shell => include_str!("../resources/shell.ascii"),
441445
Language::TypeScript => include_str!("../resources/typescript.ascii"),
442-
Language::JavaScript => include_str!("../resources/javascript.ascii"),
446+
Language::JavaScript => include_str!("../resources/javascript.ascii"),
447+
Language::Php => include_str!("../resources/php.ascii"),
443448
// _ => include_str!("../resources/unknown.ascii"),
444449
}
445450
}
446451

447452
fn colors(&self) -> Vec<Color> {
448453
match self.language {
449454
Language::C => vec![Color::BrightBlue, Color::Blue],
450-
Language::Clojure => vec![Color::Cyan],
455+
Language::Clojure => vec![Color::BrightBlue, Color::BrightGreen],
451456
Language::Cpp => vec![Color::Yellow],
452457
Language::Csharp => vec![Color::White],
453458
Language::Go => vec![Color::White],
454-
Language::Haskell => vec![Color::Cyan],
459+
Language::Haskell => vec![Color::BrightBlue, Color::BrightMagenta, Color::Blue],
455460
Language::Java => vec![Color::BrightBlue, Color::Red],
456461
Language::Lisp => vec![Color::Yellow],
457462
Language::Lua => vec![Color::Blue],
458-
Language::Python => vec![Color::Magenta],
459-
Language::R => vec![Color::Blue],
463+
Language::Python => vec![Color::Blue, Color::Yellow],
464+
Language::R => vec![Color::White, Color::Blue],
460465
Language::Ruby => vec![Color::Magenta],
461466
Language::Rust => vec![Color::White, Color::BrightRed],
462467
Language::Scala => vec![Color::Blue],
463468
Language::Shell => vec![Color::Green],
464469
Language::TypeScript => vec![Color::Cyan],
465-
Language::JavaScript => vec![Color::BrightYellow],
470+
Language::JavaScript => vec![Color::BrightYellow],
471+
Language::Php => vec![Color::BrightWhite],
466472
}
467473
}
468474
}

0 commit comments

Comments
 (0)