diff --git a/irs/ripper.py b/irs/ripper.py index d362d02..156bd31 100644 --- a/irs/ripper.py +++ b/irs/ripper.py @@ -91,7 +91,8 @@ class Ripper: # those flaws for being exclusive to them. # And if those flaws are really enough to turn you off of them, # then you *probably* don't really want to be with them anyways. - # Either way, it's up to you. (I'd just ignore this) + # Either way, it's up to you. (I'd just ignore this code. + # It's so terrible and it doesn't even work for playlists) if Config.parse_organize(self): if self.type in ("album", "song"): diff --git a/irs/utils.py b/irs/utils.py index 61b43a3..03d8b39 100644 --- a/irs/utils.py +++ b/irs/utils.py @@ -311,14 +311,24 @@ def banner(): pkg_resources.get_distribution("irs").version, COLS)) -def menu(unicode, time=0.01): +def mark_check(unicode, success): + if len(unicode) > 1: + return success + else: + return unicode[0] + +def menu(u, time=0.01): flush_puts("Choose option from menu:", time) - flush_puts("\t[{0}song{1}] Download Song".format(BGREEN, END), time) - flush_puts("\t[{0}album{1}] Download Album".format(BGREEN, END), time) + flush_puts("\t[{0}{1}{2}] Download Song" + .format(BGREEN, mark_check(u, "song"), END), time) + flush_puts("\t[{0}{1}{2}] Download Album" + .format(BGREEN, mark_check(u, "album"), END), time) flush_puts("\t[{0}{1}{2}] Download Playlist" - .format(BGREEN, unicode[-1], END), time) - flush_puts("\t[{0}help{1}] Print This Menu".format(BGREEN, END), time) - flush_puts("\t[{0}exit{1}] Exit IRS".format(BGREEN, END), time) + .format(BGREEN, mark_check(u, "list"), END), time) + flush_puts("\t[{0}{1}{2}] Print This Menu" + .format(BGREEN, mark_check(u, "help"), END), time) + flush_puts("\t[{0}{1}{2}] Exit IRS" + .format(BGREEN, mark_check(u, "exit"), END), time) print("") @@ -326,7 +336,7 @@ def console(ripper): banner() print(END) if ripper.authorized is True: - unicode = [BGREEN + "✔" + END, "list"] + unicode = [BGREEN + "✔" + END, ""] elif ripper.authorized is False: unicode = [BRED + "✘" + END] flush_puts("[{0}] Authenticated with Spotify".format(unicode[0])) diff --git a/setup.py b/setup.py index 02c4738..354c34c 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup setup( name = 'irs', - version = '6.7.3', + version = '6.7.4', description = 'A music downloader that just gets metadata.', url = 'https://github.com/kepoorhampond/irs', author = 'Kepoor Hampond',