mirror of
https://github.com/LazoCoder/Pokemon-Terminal
synced 2024-11-26 22:00:20 +00:00
Fixed bug where inputs with escape code counted the escape code as a letter
If you type ‘_cha’, this should count as 3 letters, not 4. This matters because typing ‘_ch’ should give suggestions and not change the wallpaper. Only inputs with 3 characters or above should change the wallpaper or terminal.
This commit is contained in:
LazoCoder
parent
db2d3fa515
commit
54543b61c7
4 changed files with 18 additions and 202 deletions
|
|
@ -1,5 +1,5 @@
|
|||
tell application "iTerm"
|
||||
tell current session of current window
|
||||
set background image to "/Users/Laki/GitHub/Pokemon-Terminal/./Images/Generation II - Johto/195.png"
|
||||
set background image to "/Users/Laki/GitHub/Pokemon-Terminal/./Images/Generation I - Kanto/025.png"
|
||||
end tell
|
||||
end tell
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
tell application "System Events"
|
||||
tell current desktop
|
||||
set picture to "/Users/Laki/GitHub/Pokemon-Terminal/./Images/Generation II - Johto/195.png"
|
||||
set picture to "/Users/Laki/GitHub/Pokemon-Terminal/./Images/Generation I - Kanto/088.png"
|
||||
end tell
|
||||
end tell
|
||||
21
main.py
21
main.py
|
|
@ -131,6 +131,7 @@ def change_wallpaper(db, arg):
|
|||
print("Did you mean " + suggestions[0].get_name().capitalize() + "?")
|
||||
scripter.change_wallpaper(suggestions[0])
|
||||
else:
|
||||
print("Result: " + arg)
|
||||
print("Did you mean " + suggestions[0].get_name().capitalize() + "?")
|
||||
print("Other suggestions:")
|
||||
print_columns(suggestions[1:])
|
||||
|
|
@ -140,6 +141,14 @@ def change_wallpaper(db, arg):
|
|||
def single_argument_handler(arg):
|
||||
# Handle the logic for when there is only one command line parameter inputted.
|
||||
db = Database()
|
||||
|
||||
# If there is an escape code, then change the wallpaper, not the terminal.
|
||||
if str(arg).startswith("_"):
|
||||
escape_code = True
|
||||
arg = arg[1:]
|
||||
else:
|
||||
escape_code = False
|
||||
|
||||
if len(arg) < 3 and arg.isalpha():
|
||||
prefix_search(db, arg)
|
||||
elif arg == "extra":
|
||||
|
|
@ -158,10 +167,10 @@ def single_argument_handler(arg):
|
|||
print_columns(db.get_sinnoh())
|
||||
elif arg == "all":
|
||||
print_columns(db.get_all())
|
||||
elif arg == "random" and escape_code:
|
||||
change_wallpaper(db, db.get_random().get_name())
|
||||
elif arg == "random":
|
||||
change_terminal_background(db, db.get_random().get_name())
|
||||
elif arg == "_random":
|
||||
change_wallpaper(db, db.get_random().get_name())
|
||||
elif arg == "slideshow":
|
||||
slideshow(db, 1, 494)
|
||||
elif arg == "slideshow-kanto":
|
||||
|
|
@ -172,12 +181,12 @@ def single_argument_handler(arg):
|
|||
slideshow(db, 252, 387)
|
||||
elif arg == "slideshow-sinnoh":
|
||||
slideshow(db, 387, 494)
|
||||
elif arg == "?" and escape_code:
|
||||
scripter.determine_wallpaper_pokemon(db)
|
||||
elif arg == "?":
|
||||
scripter.determine_terminal_pokemon(db)
|
||||
elif arg == "_?":
|
||||
scripter.determine_wallpaper_pokemon(db)
|
||||
elif str(arg).startswith("_"):
|
||||
change_wallpaper(db, arg[1:])
|
||||
elif escape_code:
|
||||
change_wallpaper(db, arg)
|
||||
else:
|
||||
change_terminal_background(db, arg)
|
||||
|
||||
|
|
|
|||
194
pokemon
194
pokemon
|
|
@ -1,194 +0,0 @@
|
|||
#!/Library/Frameworks/Python.framework/Versions/3.5/bin/python3.5
|
||||
|
||||
# The main module that brings everything together.
|
||||
|
||||
from sys import argv
|
||||
from database import Database
|
||||
import scripter
|
||||
import sys
|
||||
import time
|
||||
|
||||
|
||||
def print_list(list_of_items):
|
||||
# Print all the items in a list. Used for printing each Pokemon from a particular region.
|
||||
for item in list_of_items:
|
||||
print(item)
|
||||
|
||||
|
||||
def print_columns(items):
|
||||
# Print a list as multiple columns instead of just one.
|
||||
rows = []
|
||||
items_per_column = int(len(items) / 4) + 1
|
||||
|
||||
for index in range(0, len(items)):
|
||||
pokemon = items[index]
|
||||
|
||||
if not pokemon.is_extra():
|
||||
name = pokemon.get_id() + " " + str(pokemon.get_name()).capitalize()
|
||||
else:
|
||||
name = "--- " + pokemon.get_name()
|
||||
|
||||
name = name.ljust(20)
|
||||
|
||||
if len(rows) < items_per_column:
|
||||
rows.append(name)
|
||||
else:
|
||||
rows[index % items_per_column] += name
|
||||
|
||||
print_list(rows)
|
||||
|
||||
|
||||
def prefix_search(db, arg):
|
||||
# Find all Pokemon in database, db, with the prefix, arg.
|
||||
result = db.names_with_prefix(arg)
|
||||
if len(result) == 0:
|
||||
print("No Pokemon found with prefix '" + arg + "'.")
|
||||
else:
|
||||
print_columns(result)
|
||||
|
||||
|
||||
def print_extra(db):
|
||||
# Print all the 'Extra' Pokemon from the 'Extra' folder.
|
||||
result = db.get_extra()
|
||||
if len(result) == 0:
|
||||
print("No Pokemon were found in Images/Extra.")
|
||||
else:
|
||||
print_columns(result)
|
||||
|
||||
|
||||
def print_usage():
|
||||
# Print the instructions of usage.
|
||||
print(
|
||||
'''
|
||||
Usage:
|
||||
pokemon [parameter]
|
||||
|
||||
Parameters:
|
||||
[name] - Change the terminal background to the specified Pokemon.
|
||||
[index] - Change the terminal background to a Pokemon by its index.
|
||||
[region] - List all the Pokemon of the specified region.
|
||||
[one letter] - List all Pokemon who's names begin with a particular letter.
|
||||
[two letters] - List all Pokemon who's names begin with those two letters.
|
||||
|
||||
Other Parameters:
|
||||
pokemon all - List all the Pokemon supported.
|
||||
pokemon regions - List all the available regions.
|
||||
pokemon extra - List all the Pokemon from the 'Extra' folder.
|
||||
pokemon random - Change the terminal background to a random Pokemon.
|
||||
pokemon ? - Identify the current Pokemon in the terminal.
|
||||
pokemon _pikachu - Change the desktop wallpaper to the specified Pokemon.
|
||||
pokemon _random - Change the desktop wallpaper to a random Pokemon.
|
||||
pokemon _? - Identify the current Pokemon in the wallpaper.
|
||||
pokemon slideshow - Iterate through each Pokemon.
|
||||
pokemon slideshow-kanto - Iterate through each Pokemon in the specified region.
|
||||
pokemon help - Display this menu.
|
||||
''')
|
||||
|
||||
|
||||
def slideshow(db, start, end):
|
||||
# Show each Pokemon in order, one by one.
|
||||
try:
|
||||
for x in range(start, end):
|
||||
pokemon = db.get_pokemon(x)
|
||||
scripter.change_terminal(pokemon)
|
||||
time.sleep(0.25)
|
||||
except KeyboardInterrupt:
|
||||
print("Program was terminated.")
|
||||
sys.exit()
|
||||
|
||||
|
||||
def change_terminal_background(db, arg):
|
||||
# Change the terminal background to the specified Pokemon, if it exists.
|
||||
if arg in db:
|
||||
pokemon = db.get_pokemon(arg)
|
||||
scripter.change_terminal(pokemon)
|
||||
else: # If not found in the database, try to give suggestions.
|
||||
suggestions = db.names_with_infix(arg)
|
||||
if len(suggestions) == 0:
|
||||
print("No such Pokemon was found and no suggestion are available.")
|
||||
elif len(suggestions) == 1:
|
||||
scripter.change_terminal(suggestions[0])
|
||||
print("Did you mean " + suggestions[0].get_name().capitalize() + "?")
|
||||
scripter.change_terminal(suggestions[0])
|
||||
else:
|
||||
print("Did you mean " + suggestions[0].get_name().capitalize() + "?")
|
||||
print("Other suggestions:")
|
||||
print_columns(suggestions[1:])
|
||||
scripter.change_terminal(suggestions[0])
|
||||
|
||||
|
||||
def change_wallpaper(db, arg):
|
||||
# Change the wallpaper to the specified Pokemon, if it exists.
|
||||
if arg in db:
|
||||
pokemon = db.get_pokemon(arg)
|
||||
scripter.change_wallpaper(pokemon)
|
||||
else: # If not found in the database, try to give suggestions.
|
||||
suggestions = db.names_with_infix(arg)
|
||||
if len(suggestions) == 0:
|
||||
print("No such Pokemon was found and no suggestion are available.")
|
||||
elif len(suggestions) == 1:
|
||||
scripter.change_terminal(suggestions[0])
|
||||
print("Did you mean " + suggestions[0].get_name().capitalize() + "?")
|
||||
scripter.change_wallpaper(suggestions[0])
|
||||
else:
|
||||
print("Did you mean " + suggestions[0].get_name().capitalize() + "?")
|
||||
print("Other suggestions:")
|
||||
print_columns(suggestions[1:])
|
||||
scripter.change_wallpaper(suggestions[0])
|
||||
|
||||
|
||||
def single_argument_handler(arg):
|
||||
# Handle the logic for when there is only one command line parameter inputted.
|
||||
db = Database()
|
||||
if len(arg) < 3 and arg.isalpha():
|
||||
prefix_search(db, arg)
|
||||
elif arg == "extra":
|
||||
print_extra(db)
|
||||
elif arg == "regions":
|
||||
print_list(db.get_regions())
|
||||
elif arg == "help":
|
||||
print_usage()
|
||||
elif arg == "kanto":
|
||||
print_columns(db.get_kanto())
|
||||
elif arg == "johto":
|
||||
print_columns(db.get_johto())
|
||||
elif arg == "hoenn":
|
||||
print_columns(db.get_hoenn())
|
||||
elif arg == "sinnoh":
|
||||
print_columns(db.get_sinnoh())
|
||||
elif arg == "all":
|
||||
print_columns(db.get_all())
|
||||
elif arg == "random":
|
||||
change_terminal_background(db, db.get_random().get_name())
|
||||
elif arg == "_random":
|
||||
change_wallpaper(db, db.get_random().get_name())
|
||||
elif arg == "slideshow":
|
||||
slideshow(db, 1, 494)
|
||||
elif arg == "slideshow-kanto":
|
||||
slideshow(db, 1, 152)
|
||||
elif arg == "slideshow-johto":
|
||||
slideshow(db, 152, 252)
|
||||
elif arg == "slideshow-hoenn":
|
||||
slideshow(db, 252, 387)
|
||||
elif arg == "slideshow-sinnoh":
|
||||
slideshow(db, 387, 494)
|
||||
elif arg == "?":
|
||||
scripter.determine_terminal_pokemon(db)
|
||||
elif arg == "_?":
|
||||
scripter.determine_wallpaper_pokemon(db)
|
||||
elif str(arg).startswith("_"):
|
||||
change_wallpaper(db, arg[1:])
|
||||
else:
|
||||
change_terminal_background(db, arg)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
# Entrance to the program.
|
||||
if len(argv) == 1:
|
||||
print("No command line arguments specified."
|
||||
"\nTry typing in a Pokemon name or number."
|
||||
"\nOr type \"help\" to see all the commands.")
|
||||
elif len(argv) == 2:
|
||||
single_argument_handler(argv[1].lower())
|
||||
else:
|
||||
print("Only one command line argument is supported.")
|
||||
1
pokemon
Symbolic link
1
pokemon
Symbolic link
|
|
@ -0,0 +1 @@
|
|||
main.py
|
||||
Loading…
Reference in a new issue