Skip to content

Commit

Permalink
Merge pull request #123 from sepandhaghighi/art_decor_check
Browse files Browse the repository at this point in the history
Art Decor Check Script
  • Loading branch information
sadrasabouri authored Apr 29, 2020
2 parents ea20da4 + 14fb59f commit dfef076
Show file tree
Hide file tree
Showing 9 changed files with 214 additions and 164 deletions.
1 change: 1 addition & 0 deletions .travis/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ fi

$PYTHON_COMMAND otherfile/version_check.py
$PYTHON_COMMAND otherfile/font_check.py
$PYTHON_COMMAND otherfile/art_decor_check.py
$PYTHON_COMMAND -m art testcov2

if [ "$IS_IN_TRAVIS" = 'false' ] || [ "$TRAVIS_PYTHON_VERSION" = '3.6' ]
Expand Down
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,34 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [Unreleased]
### Added
- `art_decor_check.py` file
### Changed
- `text` parameter removed from `art` and `aprint` functions
- `README.md` modified
- `CONTRIBUTING.md` modified
- MATLAB examples updated
- `kitty2` 1-line art renamed to `kitty`
### Removed
- 5 bipartite 1-line art
1. love you
2. message1
3. message2
4. musical
5. text decoration
- 12 duplicate 1-line art
1. dog
2. human
3. mis mujeres
4. 100$
5. worm2
6. stars in my eyes
7. chainsword
8. badass
9. aliens
10. this guy
11. kitty1
12. don fuller
## [4.6] - 2020-03-30
### Added
- `NON_ASCII_ARTS` list
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<a href="https://badge.fury.io/py/art"><img src="https://badge.fury.io/py/art.svg" alt="PyPI version" height="18"></a>
<a href="https://www.python.org/"><img src="https://img.shields.io/badge/built%20with-Python3-green.svg" alt="built with Python3" /></a>
<a href="https://github.com/sepandhaghighi/art/blob/master/FontList.ipynb"><img src="https://img.shields.io/badge/Font List-560-blue.svg"></a>
<a href="https://github.com/sepandhaghighi/art/blob/master/ArtList.ipynb"><img src="https://img.shields.io/badge/Art List-511-orange.svg"></a>
<a href="https://github.com/sepandhaghighi/art/blob/master/ArtList.ipynb"><img src="https://img.shields.io/badge/Art List-499-orange.svg"></a>
<a href="https://github.com/sepandhaghighi/art/blob/master/DecorList.ipynb"><img src="https://img.shields.io/badge/Decor List-10-green.svg"></a>
<a href="https://t.me/artlib_bot" target="__blank"><img src="https://img.shields.io/badge/Telegram-Bot-red.svg"></a>
<a href="https://anaconda.org/sepandhaghighi/art"><img src="https://anaconda.org/sepandhaghighi/art/badges/version.svg"></a>
Expand Down Expand Up @@ -72,7 +72,7 @@ ART is a Python lib for text converting to ASCII art fancy. ;-)
</tr>
<tr>
<td align="center">1-Line-Art Counter</td>
<td align="center">511</td>
<td align="center">499</td>
</tr>
<tr>
<td align="center">Decor Counter</td>
Expand Down
20 changes: 15 additions & 5 deletions art/art.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ def decor_list(text="test", font="fancy6"):
"""
for decor in DECORATION_NAMES:
print(decor)
tprint(text,font=font,decoration=decor)
tprint(text, font=font, decoration=decor)
line()


Expand Down Expand Up @@ -491,10 +491,14 @@ def text2art(text, font=DEFAULT_FONT, chr_ignore=True, decoration=None):
if decoration is not None:
result += decor(decoration)
next_word_flag = True
for index,word in enumerate(word_list):
if index == len(word_list)-1:
for index, word in enumerate(word_list):
if index == len(word_list) - 1:
next_word_flag = False
result = result + __word2art(word=word,font=font,chr_ignore=chr_ignore,letters=letters,next_word=next_word_flag)
result = result + __word2art(word=word,
font=font,
chr_ignore=chr_ignore,
letters=letters,
next_word=next_word_flag)
if decoration is not None:
result = result + decor(decoration, reverse=True)
return result
Expand Down Expand Up @@ -532,7 +536,13 @@ def set_default(font=DEFAULT_FONT, chr_ignore=True, filename="art",
if isinstance(overwrite, bool) is False:
raise artError(OVERWRITE_TYPE_ERROR)
tprint.__defaults__ = (font, chr_ignore, decoration)
tsave.__defaults__ = (font, filename, chr_ignore, print_status, overwrite, decoration)
tsave.__defaults__ = (
font,
filename,
chr_ignore,
print_status,
overwrite,
decoration)
text2art.__defaults__ = (font, chr_ignore, decoration)


Expand Down
192 changes: 89 additions & 103 deletions art/art_dic.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,97 +42,93 @@
"sleeping baby": "[{-_-}] ZZZzz zz z...",
"pistols2": "̿' ̿'\̵͇̿̿\з=(◕_◕)=ε/̵͇̿̿/'̿'̿ ̿",
"pistols3": " ̿̿ ̿̿ ̿’̿̿’̿\̵͇̿̿\з=( ͡ °_̯͡° )=ε/̵͇̿̿/’̿̿’̿ ̿ ̿̿ ̿̿",
"knife1": ")xxxxx[;;;;;;;;;>",
"knife2": ")xxx[::::::::::>",
"coffee1": "c[_]",
"coffee2": "l_D",
"coffee3": "l_P",
"coffee4": "l_B",
"robot1": "d[ o_0 ]b",
"pig1": "^(*(oo)*)^",
"needle1": "┣▇▇▇═─",
"needle2": "|==|iiii|>----- ",
"cat1": "=^..^=",
"fish swim": "¸.·´¯`·.´¯`·.¸¸.·´¯`·.¸><(((º>",
"sword1": "(===||:::::::::::::::>",
"rock on1": "\,,/(^_^)\,,/",
"rock on2": "\m/(-_-)\m/",
"caterpillar": ",/\,/\,/\,/\,/\,/\,o",
"sword2": "▬▬ι═══════ﺤ -═══════ι▬▬",
"professor": '"""⌐(ಠ۾ಠ)¬"""',
"sad1": "ε(´סּ︵סּ`)з",
"sword3": "ס₪₪₪₪§|(Ξ≥≤≥≤≥≤ΞΞΞΞΞΞΞΞΞΞ>",
"airplane1": " ‛¯¯٭٭¯¯(▫▫)¯¯٭٭¯¯’",
"cassette1": "|[●▪▪●]|",
"cassette2": "[¯ↂ■■ↂ¯]",
"car race": "∙،°. ˘Ô≈ôﺣ » » »",
"robot2": " c[○┬●]כ ",
"happy": " ۜ\(סּںסּَ` )/ۜ",
"love in my eye1": "(♥_♥)",
"love in my eye2": "(。❤◡❤。)",
"love in my eye3": "(❤◡❤)",
"cat2": "龴ↀ◡ↀ龴",
"cat3": "^.--.^",
"face": "•|龴◡龴|•",
"big nose": "˚∆˚",
"big eyes": "⺌∅‿∅⺌",
"woman": "▓⚗_⚗▓",
"dog": "ˁ˚ᴥ˚ˀ",
"stars": "✌⊂(✰‿✰)つ✌",
"hairstyle": "⨌⨀_⨀⨌",
"eyes": "℃ↂ_ↂↃ",
"cat face": "⦿⽘⦿",
"cute cat": "^⨀ᴥ⨀^",
"nose": "\˚ㄥ˚\\",
"pirate": "✌(◕‿-)✌",
"happy2": "⎦˚◡˚⎣",
"human": "•͡˘㇁•͡˘",
"awesome": "<:3 )~~~",
"dagger": "cxxx|;:;:;:;:;:;:;:;>",
"umadbro": "¯\_(ツ)_/¯ ",
"table flip": "(╯°□°)╯︵ ┻━┻",
"mis mujeres": "(-(-_(-_-)_-)-)",
"linqan": ":Q___",
"sad2": "(✖╭╮✖)",
"sad3": "(◑﹏◐)",
"sad4": "(◕_◕)",
"eye closed": " (╯_╰)",
"inlove": "(✿ ♥‿♥) ",
"cry": " (╯︵╰,)",
"100$": "[̲̅$̲̅(̲̅ιοο̲̅)̲̅$̲̅]",
"help": "٩(͡๏̯͡๏)۶",
"birds": "~(‾▿‾)~",
"pig2": "༼☉ɷ⊙༽",
"bullshit": "|3ᵕᶦᶦᶳᶣᶨᶵ",
"gun1": "︻╦╤─",
"gun2": "︻デ═一",
"gun3": "╦̵̵̿╤─ ҉ ~ •",
"bird": " (⌒▽⌒)",
"sword4": " |O/////[{:;:;:;:;:;:;:;:;>",
"elephant": "°j°m",
"headphone1": "d[-_-]b",
"headphone2": "d(-_-)b",
"headphone3": "(W)",
"up": "(◔/‿\◔)",
"airplane2": "✈",
"real face": "( ͡° ͜ʖ ͡°)",
"angry face": "(⋟﹏⋞)",
"heart2": "♡",
"boobs": "(.)(.)",
"sperm": "~~o",
"ping pong": "( •_•)O*¯`·.¸.·´¯`°Q(•_• )",
"chess": "♞▀▄▀▄♝▀▄ ",
"scissors": "✄",
"chair": "╦╣",
"zombie": "'º_º'",
"hybrix": "ʕʘ̅͜ʘ̅ʔ",
"bear": "ʕ•ᴥ•ʔ",
"cheer": " ^(¤o¤)^",
"hug me": "(っ◕‿◕)っ",
"arrow1": "»»---------------------►",
"arrow2": "XXX-------->",
"rak": "/⦿L⦿\\",
"nope": "t(-_-t)",
"knife1": ")xxxxx[;;;;;;;;;>",
"knife2": ")xxx[::::::::::>",
"coffee1": "c[_]",
"coffee2": "l_D",
"coffee3": "l_P",
"coffee4": "l_B",
"robot1": "d[ o_0 ]b",
"pig1": "^(*(oo)*)^",
"needle1": "┣▇▇▇═─",
"needle2": "|==|iiii|>----- ",
"cat1": "=^..^=",
"fish swim": "¸.·´¯`·.´¯`·.¸¸.·´¯`·.¸><(((º>",
"sword1": "(===||:::::::::::::::>",
"rock on1": "\,,/(^_^)\,,/",
"rock on2": "\m/(-_-)\m/",
"caterpillar": ",/\,/\,/\,/\,/\,/\,o",
"sword2": "▬▬ι═══════ﺤ -═══════ι▬▬",
"professor": '"""⌐(ಠ۾ಠ)¬"""',
"sad1": "ε(´סּ︵סּ`)з",
"sword3": "ס₪₪₪₪§|(Ξ≥≤≥≤≥≤ΞΞΞΞΞΞΞΞΞΞ>",
"airplane1": " ‛¯¯٭٭¯¯(▫▫)¯¯٭٭¯¯’",
"cassette1": "|[●▪▪●]|",
"cassette2": "[¯ↂ■■ↂ¯]",
"car race": "∙،°. ˘Ô≈ôﺣ » » »",
"robot2": " c[○┬●]כ ",
"happy": " ۜ\(סּںסּَ` )/ۜ",
"love in my eye1": "(♥_♥)",
"love in my eye2": "(。❤◡❤。)",
"love in my eye3": "(❤◡❤)",
"cat2": "龴ↀ◡ↀ龴",
"cat3": "^.--.^",
"face": "•|龴◡龴|•",
"big nose": "˚∆˚",
"big eyes": "⺌∅‿∅⺌",
"woman": "▓⚗_⚗▓",
"stars": "✌⊂(✰‿✰)つ✌",
"hairstyle": "⨌⨀_⨀⨌",
"eyes": "℃ↂ_ↂↃ",
"cat face": "⦿⽘⦿",
"cute cat": "^⨀ᴥ⨀^",
"nose": "\˚ㄥ˚\\",
"pirate": "✌(◕‿-)✌",
"happy2": "⎦˚◡˚⎣",
"awesome": "<:3 )~~~",
"dagger": "cxxx|;:;:;:;:;:;:;:;>",
"umadbro": "¯\_(ツ)_/¯ ",
"table flip": "(╯°□°)╯︵ ┻━┻",
"linqan": ":Q___",
"sad2": "(✖╭╮✖)",
"sad3": "(◑﹏◐)",
"sad4": "(◕_◕)",
"eye closed": " (╯_╰)",
"inlove": "(✿ ♥‿♥) ",
"cry": " (╯︵╰,)",
"help": "٩(͡๏̯͡๏)۶",
"birds": "~(‾▿‾)~",
"pig2": "༼☉ɷ⊙༽",
"bullshit": "|3ᵕᶦᶦᶳᶣᶨᶵ",
"gun1": "︻╦╤─",
"gun2": "︻デ═一",
"gun3": "╦̵̵̿╤─ ҉ ~ •",
"bird": " (⌒▽⌒)",
"sword4": " |O/////[{:;:;:;:;:;:;:;:;>",
"elephant": "°j°m",
"headphone1": "d[-_-]b",
"headphone2": "d(-_-)b",
"headphone3": "(W)",
"up": "(◔/‿\◔)",
"airplane2": "✈",
"real face": "( ͡° ͜ʖ ͡°)",
"angry face": "(⋟﹏⋞)",
"heart2": "♡♡",
"boobs": "(.)(.)",
"sperm": "~~o",
"ping pong": "( •_•)O*¯`·.¸.·´¯`°Q(•_• )",
"chess": "♞▀▄▀▄♝▀▄ ",
"scissors": "✄",
"chair": "╦╣",
"zombie": "'º_º'",
"hybrix": "ʕʘ̅͜ʘ̅ʔ",
"bear": "ʕ•ᴥ•ʔ",
"cheer": " ^(¤o¤)^",
"hug me": "(っ◕‿◕)っ",
"arrow1": "»»---------------------►",
"arrow2": "XXX-------->",
"rak": "/⦿L⦿\\",
"nope": "t(-_-t)",
"panda": "ヽ( ̄(エ) ̄)ノ",
"guitar": "c====(=#O| ) ~~ ♬·¯·♩¸¸♪·¯·♫¸ ",
"rocket": "∙∙∙∙∙·▫▫ᵒᴼᵒ▫ₒₒ▫ᵒᴼᵒ▫ₒₒ▫ᵒᴼᵒ☼)===>",
Expand Down Expand Up @@ -193,7 +189,6 @@
"ankush": "︻デ┳═ー*----*",
"sex symbol": "◢♂◣◥♀◤◢♂◣◥♀◤",
"barbell": "▐━━━━━▌",
"worm2": "~",
"sniper rifle": "︻デ┳═ー",
"being draged": "╰(◣﹏◢)╯",
"possessed": "<>_<>",
Expand Down Expand Up @@ -222,7 +217,6 @@
"hell yeah": "(òÓ,)_\,,/",
"roke": "_\m/",
"crayons": "((̲̅ ̲̅(̲̅C̲̅r̲̅a̲̅y̲̅o̲̅l̲̲̅̅a̲̅( ̲̅((>",
"stars in my eyes": "<*_*>",
"fish invasion": "›(̠̄:̠̄c ›(̠̄:̠̄c (¦Ҝ (¦Ҝ ҉ - - - ¦̺͆¦ ▪▌",
"bender": " ¦̵̱ ̵̱ ̵̱ ̵̱ ̵̱(̢ ̡͇̅└͇̅┘͇̅ (▤8כ−◦",
"sunny day": "☁ ▅▒░☼‿☼░▒▅ ☁",
Expand All @@ -241,7 +235,6 @@
"long rose": "---------------------{{---<((@)",
"kirby dance": "<(''<) <( ' ' )> (> '')>",
"death star defense team": "|-o-| (-o-) |-o-|",
"chainsword": " |O/////[{:;:;:;:;:;:;:;:;>",
"boobies": "(. )( .)",
"dancing people": "‎(/.__.)/ \(.__.\)",
"dance": '''(>'-')> <('_'<) ^('_')\- \m/(-_-)\m/ <( '-')> \_( .")> <(._.)-`''',
Expand Down Expand Up @@ -280,7 +273,6 @@
"robber": " -╤╗_(◙◙)_╔╤- - - - \o/ \o/ \o/",
"facepalm": "(>ლ)",
"yo": "__o000o__(o)(o)__o000o__",
"badass": "(⌐■_■)--︻╦╤─ - - -",
"cigarette1": "(̅_̅_̅_̅(̅_̅_̅_̅_̅_̅_̅_̅_̅̅_̅()ڪے",
"cigarette2": "(____((____________()~~~",
"cigarette3": "()___)____________)",
Expand All @@ -297,7 +289,6 @@
"spider1": "//O\\",
"machinegun": ",==,--",
"roadblock": "X+X+X+X+X",
"aliens": "(<>..<>)",
"marge simpson": "()()():|",
"homer simpson": "=(:o)",
"bat1": "^O^",
Expand Down Expand Up @@ -325,10 +316,8 @@
"devil": "]:->",
"shrug": "¯\_(ツ)_/¯",
"flex": "ᕙ(⇀‸↼‶)ᕗ",
"this guy": "(☞゚∀゚)☞",
"why": "ლ( `Д’ ლ)",
"meditation": "‿( ́ ̵ _-`)‿",
"kitty1": "=^..^=",
"pac man": "ᗧ···ᗣ···ᗣ··",
"emo": "(///_ ;)",
"shark attack": "~~~~~~\o/~~~~~/\~~~~~",
Expand Down Expand Up @@ -380,7 +369,6 @@
"sunglasses1": "(•_•)>⌐■-■ (⌐■_■)",
"mini penis": "=D",
"victory": "V(-.o)V",
"don fuller": "╭∩╮(Ο_Ο)╭∩╮",
"dgaf": "┌∩┐(◣ _ ◢)┌∩┐",
"ryans dick": "8======D",
"eds dick": "8=D",
Expand Down Expand Up @@ -463,7 +451,7 @@
"devilish grin": ">:-D",
"clowning": "*:o)",
"bugs bunny": "E=B",
"kitty2": "=^. .^=",
"kitty": "=^. .^=",
"fish skeleton1": ">-}-}-}->",
"fish skeleton2": ">++('>",
"snowman2": '{ }( : ^ )( """" )( )',
Expand Down Expand Up @@ -511,6 +499,4 @@
"dead girl": "'==>x\9",
"dead child": "'-=,o",
"dude glasses1": "@[O],[O]",
"dude glasses2": "@(o),(o)"

}
"dude glasses2": "@(o),(o)"}
Loading

0 comments on commit dfef076

Please sign in to comment.