From 09d1e58c781064614736bf44286506ce0790a67d Mon Sep 17 00:00:00 2001 From: Lynnesbian Date: Fri, 16 Oct 2020 18:25:02 +1000 Subject: [PATCH] -q actually does something now, moved some stuff that should be in functions into functions --- bcao.py | 74 +++++++++++++++++++++++++++++---------------------------- 1 file changed, 38 insertions(+), 36 deletions(-) diff --git a/bcao.py b/bcao.py index e711993..4a1604e 100755 --- a/bcao.py +++ b/bcao.py @@ -7,6 +7,14 @@ import subprocess, argparse, sys, os, re, base64 +def log(message: str, importance: int = 0): + if not args.quiet or importance > 0: + print(message) + +def die(message: str, code: int = 1): + log(message) + exit(code) + try: from mutagen.oggvorbis import OggVorbis from mutagen.mp3 import MP3 @@ -14,36 +22,31 @@ try: from mutagen.flac import Picture from mutagen.aac import AAC except ImportError: - print("Please install python3-mutagen (pip install mutagen)") - sys.exit(1) + die("Please install python3-mutagen (pip install mutagen)") try: subprocess.check_output(["unzip", "--help"]) except: - print("Please install unzip (apt install unzip)") - sys.exit(1) + die("Please install unzip (apt install unzip)") try: subprocess.check_output(["which", "convert"]) subprocess.check_output(["which", "identify"]) except: - print("Please install imagemagick, and ensure convert and identify are in your $PATH (apt install imagemagick") - sys.exit(1) + die("Please install imagemagick, and ensure convert and identify are in your $PATH (apt install imagemagick") -parser = argparse.ArgumentParser(description = "BandCamp Automatic Organiser. Extracts the given zip file downloaded from Bandcamp and organises it.") +parser = argparse.ArgumentParser(description="Extracts the given zip file downloaded from Bandcamp and organises it.") parser.add_argument('zip', help='The zip file to use') -# KEEP THESE IN ALPHABETICAL ORDER! parser.add_argument('-d', '--destination', dest='destination', default='/home/lynne/Music/Music/', help="The directory to organise the music into. Default: /home/lynne/Music/Music/") -parser.add_argument('-q', '--quiet', dest='quiet', action='store_true', help='Disable non-error output') +parser.add_argument('-q', '--quiet', dest='quiet', action='store_true', help='Disable non-error output and assume default artist name.') parser.add_argument('-t', '--threshold', dest='threshold', nargs=1, default=300, help="Maximum acceptable cover art file size in kilobytes. Default: 300") -args=parser.parse_args() +args = parser.parse_args() if not os.path.exists(args.zip): - print("heh.... nice try kid... {0} aint a real file... i've been aroud the block a few times, ya know... you'll have to do a lot better than that to trick me.... kid...".format(args.zip)) - sys.exit(2) + die(f"Couldn't find {args.zip}.", 2) -print("Extracting...") +log("Extracting...") zipname = os.path.splitext(os.path.basename(args.zip))[0] tmp = "/tmp/bcao/{0}".format(zipname) subprocess.check_output(["rm", "-rf", tmp]) @@ -53,19 +56,19 @@ files = [] songs = [] for root, dirs, filez in os.walk(tmp): - for file in filez: #for every file + for file in filez: # for every file files.append(root + os.sep + file) cover = "" artists = [] album = "" -fileExtensionRegex = re.compile(r"[^\.]+$") -probablyASongRegex = re.compile(r"^.+ - .+ - \d{2,} .+\.[^\.]+$") #matches "artist - album - 01 track.xyz" but not "some weird bonus thing.mp3" +fileExtensionRegex = re.compile(r"[^.]+$") +probablyASongRegex = re.compile(r"^.+ - .+ - \d{2,} .+\.[^.]+$") # matches "artist - album - 01 track.xyz" but not "some weird bonus thing.mp3" musicExts = ["ogg", "flac", "alac", "aiff", "wav", "mp3", "opus", "m4a", "aac", "oga"] -bannedCharacters = ["?", "\\", "/", ":", "|", "*", "\"", "<", ">"] #characters that kill wangblows. all of these are fine on lincucks/crapOS except "/" +bannedCharacters = ["?", "\\", "/", ":", "|", "*", "\"", "<", ">"] # characters disallowed in NTFS filenames trackCount = 0 -print("Processing... please wait.") +log("Processing... please wait.") # use "01 Song.ogg" instead of "1 Song.ogg". Also works for albums with more than 99 tracks if that ever happens trackNumberLength = len(str(len(files))) if trackNumberLength < 2: @@ -84,7 +87,7 @@ for file in files: name = "{0} {1}.{2}".format(f["TRACKNUMBER"][0].zfill(trackNumberLength), f["TITLE"][0], ext) for bc in bannedCharacters: if bc in name: - name = name.replace(bc, "-") #replace banned characters with dashes + name = name.replace(bc, "-") # replace banned characters with dashes songs.append(name) if album == "": album = f["ALBUM"][0] @@ -94,22 +97,21 @@ for file in files: subprocess.check_output(["mv", file, os.path.dirname(file) + os.sep + name]) else: - print("UNSUPPORTED FORMAT BECAUSE LYNNE IS A LAZY MORON") + log("UNSUPPORTED FORMAT BECAUSE LYNNE IS A LAZY MORON") if len(artists) > 1: artists.append("Various Artists") if cover == "": # TODO: HANDLE THIS PROPERLY - print("couldn't find the cover art :)))))") - sys.exit(1) + die("couldn't find the cover art :)))))") while os.path.getsize(cover) / 1024 > args.threshold: if os.path.basename(cover) != "cover-lq.jpg": nucover = os.path.dirname(cover) + os.sep + "cover-lq.jpg" - subprocess.check_output(["convert", cover, "-quality", "85", "-strip", nucover]) #convert the file to a jpeg + subprocess.check_output(["convert", cover, "-quality", "85", "-strip", nucover]) # convert the file to a jpeg cover = nucover else: - subprocess.check_output(["convert", cover, "-resize", "90%", cover]) #shrink it slightly + subprocess.check_output(["convert", cover, "-resize", "90%", cover]) # shrink it slightly with open(cover, "rb") as cvr: data = cvr.read() @@ -136,33 +138,33 @@ for song in songs: artist = artists[0] artists.append("Custom...") -# print("Please choose the artist name to use when creating the folder.") +# log("Please choose the artist name to use when creating the folder.") choice = 0 while True: - print("Artist directory:") + log("Artist directory:") for i in range(len(artists)): - print("{0}) {1}".format(i + 1, artists[i])) - choice = input("> ") + log("{0}) {1}".format(i + 1, artists[i])) + choice = 1 if args.quiet else input("> ") try: choice = artists[int(choice) - 1] - except: - print() + except KeyError: + log(f"Please choose an option from 1 to {len(artists)}.") continue break if choice == "Custom...": - print("Enter the name to use.") + log("Enter the name to use.") choice = input("> ") -# print("Setting artist to {0}".format(choice)) +# log("Setting artist to {0}".format(choice)) artist = choice -mPath = "{}/{}/{}".format(args.destination, artist, album) +mPath = os.path.join(args.destination, artist, album) subprocess.check_output(["mkdir", "-p", mPath]) for root, dirs, filez in os.walk(tmp): - for file in filez: #for every file + for file in filez: # for every file subprocess.check_output(["mv", root + os.sep + file, mPath + os.sep + file]) -print("Deleting {}...".format(tmp)) +log("Deleting {}...".format(tmp)) subprocess.check_output(["rm", "-rf", tmp]) -print("Done!") +log("Done!")