Cleaned up main and taggers
This commit is contained in:
RemixDev
parent
09331516c7
commit
975fdf95dd
|
|
@ -10,11 +10,9 @@ import os.path
|
|||
@click.option('-p', '--path', type=str, help='Downloads in the given folder')
|
||||
@click.argument('url', nargs=-1, required=True)
|
||||
def download(url, bitrate, portable, path):
|
||||
localpath = os.path.realpath('.')
|
||||
|
||||
configFolder = None
|
||||
if portable:
|
||||
configFolder = os.path.join(localpath, 'config')
|
||||
localpath = os.path.realpath('.')
|
||||
configFolder = os.path.join(localpath, 'config') if portable else None
|
||||
if path is not None:
|
||||
if path == '': path = '.'
|
||||
path = os.path.realpath(path)
|
||||
|
|
@ -22,10 +20,12 @@ def download(url, bitrate, portable, path):
|
|||
app = cli(path, configFolder)
|
||||
app.login()
|
||||
url = list(url)
|
||||
|
||||
if os.path.isfile(url[0]):
|
||||
filename = url[0]
|
||||
with open(filename) as f:
|
||||
url = f.readlines()
|
||||
|
||||
app.downloadLink(url, bitrate)
|
||||
click.echo("All done!")
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
from mutagen.flac import FLAC, Picture
|
||||
from mutagen.id3 import ID3, ID3NoHeaderError, TXXX, TIT2, TPE1, TALB, TPE2, TRCK, TPOS, TCON, TYER, TDAT, TLEN, TBPM, \
|
||||
TPUB, TSRC, USLT, SYLT, APIC, IPLS, TCOM, TCOP, TCMP, Encoding
|
||||
from mutagen.id3 import ID3, ID3NoHeaderError, \
|
||||
TXXX, TIT2, TPE1, TALB, TPE2, TRCK, TPOS, TCON, TYER, TDAT, TLEN, TBPM, \
|
||||
TPUB, TSRC, USLT, SYLT, APIC, IPLS, TCOM, TCOP, TCMP, Encoding, PictureType
|
||||
|
||||
# Adds tags to a MP3 file
|
||||
def tagID3(stream, track, save):
|
||||
|
|
@ -15,14 +16,14 @@ def tagID3(stream, track, save):
|
|||
tag.add(TIT2(text=track.title))
|
||||
|
||||
if save['artist'] and len(track.artists):
|
||||
if save['multiArtistSeparator'] != "default":
|
||||
if save['multiArtistSeparator'] == "default":
|
||||
tag.add(TPE1(text=track.artists))
|
||||
else:
|
||||
if save['multiArtistSeparator'] == "nothing":
|
||||
tag.add(TPE1(text=track.mainArtist['name']))
|
||||
else:
|
||||
tag.add(TPE1(text=track.artistsString))
|
||||
tag.add(TXXX(desc="ARTISTS", text=track.artists))
|
||||
else:
|
||||
tag.add(TPE1(text=track.artists))
|
||||
|
||||
if save['album']:
|
||||
tag.add(TALB(text=track.album['title']))
|
||||
|
|
@ -34,16 +35,24 @@ def tagID3(stream, track, save):
|
|||
tag.add(TPE2(text=track.album['artists']))
|
||||
|
||||
if save['trackNumber']:
|
||||
tag.add(TRCK(
|
||||
text=str(track.trackNumber) + ("/" + str(track.album['trackTotal']) if save['trackTotal'] else "")))
|
||||
trackNumber = str(track.trackNumber)
|
||||
if save['trackTotal']:
|
||||
trackNumber += "/" + str(track.album['trackTotal'])
|
||||
tag.add(TRCK(text=trackNumber))
|
||||
if save['discNumber']:
|
||||
tag.add(
|
||||
TPOS(text=str(track.discNumber) + ("/" + str(track.album['discTotal']) if save['discTotal'] else "")))
|
||||
discNumber = str(track.discNumber)
|
||||
if save['discTotal']:
|
||||
discNumber += "/" + str(track.album['discTotal'])
|
||||
tag.add(TPOS(text=discNumber))
|
||||
|
||||
if save['genre']:
|
||||
tag.add(TCON(text=track.album['genre']))
|
||||
if save['year']:
|
||||
tag.add(TYER(text=str(track.date['year'])))
|
||||
if save['date']:
|
||||
# Referencing ID3 standard
|
||||
# https://id3.org/id3v2.3.0#TDAT
|
||||
# The 'Date' frame is a numeric string in the DDMM format.
|
||||
tag.add(TDAT(text=str(track.date['day']) + str(track.date['month'])))
|
||||
if save['length']:
|
||||
tag.add(TLEN(text=str(int(track.duration)*1000)))
|
||||
|
|
@ -62,7 +71,11 @@ def tagID3(stream, track, save):
|
|||
if track.lyrics['unsync'] and save['lyrics']:
|
||||
tag.add(USLT(text=track.lyrics['unsync']))
|
||||
if track.lyrics['syncID3'] and save['syncedLyrics']:
|
||||
tag.add(SYLT(Encoding.UTF8, format=2, type=1, text=track.lyrics['syncID3']))
|
||||
# Referencing ID3 standard
|
||||
# https://id3.org/id3v2.3.0#sec4.10
|
||||
# Type: 1 => is lyrics
|
||||
# Format: 2 => Absolute time, 32 bit sized, using milliseconds as unit
|
||||
tag.add(SYLT(Encoding.UTF8, type=1, format=2, text=track.lyrics['syncID3']))
|
||||
|
||||
involved_people = []
|
||||
for role in track.contributors:
|
||||
|
|
@ -80,11 +93,21 @@ def tagID3(stream, track, save):
|
|||
tag.add(TCMP(text="1"))
|
||||
|
||||
if save['cover'] and track.album['picPath']:
|
||||
with open(track.album['picPath'], 'rb') as f:
|
||||
tag.add(
|
||||
APIC(Encoding.UTF8 if save['coverDescriptionUTF8'] else Encoding.LATIN1, 'image/jpeg' if track.album['picPath'].endswith('jpg') else 'image/png', 3, desc='cover', data=f.read()))
|
||||
|
||||
tag.save(stream, v1=2 if save['saveID3v1'] else 0, v2_version=3,
|
||||
descEncoding = Encoding.LATIN1
|
||||
if save['coverDescriptionUTF8']:
|
||||
descEncoding = Encoding.UTF8
|
||||
|
||||
mimeType = 'image/jpeg'
|
||||
if track.album['picPath'].endswith('png'):
|
||||
mimeType = 'image/png'
|
||||
|
||||
with open(track.album['picPath'], 'rb') as f:
|
||||
tag.add(APIC(descEncoding, mimeType, PictureType.COVER_FRONT, desc='cover', data=f.read()))
|
||||
|
||||
tag.save( stream,
|
||||
v1=2 if save['saveID3v1'] else 0,
|
||||
v2_version=3,
|
||||
v23_sep=None if save['useNullSeparator'] else '/' )
|
||||
|
||||
# Adds tags to a FLAC file
|
||||
|
|
@ -98,20 +121,20 @@ def tagFLAC(stream, track, save):
|
|||
tag["TITLE"] = track.title
|
||||
|
||||
if save['artist'] and len(track.artists):
|
||||
if save['multiArtistSeparator'] != "default":
|
||||
if save['multiArtistSeparator'] == "default":
|
||||
tag["ARTIST"] = track.artists
|
||||
else:
|
||||
if save['multiArtistSeparator'] == "nothing":
|
||||
tag["ARTIST"] = track.mainArtist['name']
|
||||
else:
|
||||
tag["ARTIST"] = track.artistsString
|
||||
tag["ARTISTS"] = track.artists
|
||||
else:
|
||||
tag["ARTIST"] = track.artists
|
||||
|
||||
if save['album']:
|
||||
tag["ALBUM"] = track.album['title']
|
||||
|
||||
if save['albumArtist'] and len(track.album['artists']):
|
||||
if save['singleAlbumArtist']:
|
||||
if save['singleAlbumArtist'] and track.album['mainArtist']['save']:
|
||||
tag["ALBUMARTIST"] = track.album['mainArtist']['name']
|
||||
else:
|
||||
tag["ALBUMARTIST"] = track.album['artists']
|
||||
|
|
@ -126,12 +149,17 @@ def tagFLAC(stream, track, save):
|
|||
tag["DISCTOTAL"] = str(track.album['discTotal'])
|
||||
if save['genre']:
|
||||
tag["GENRE"] = track.album['genre']
|
||||
|
||||
# YEAR tag is not suggested as a standard tag
|
||||
# Being YEAR already contained in DATE will only use DATE instead
|
||||
# Reference: https://www.xiph.org/vorbis/doc/v-comment.html#fieldnames
|
||||
if save['date']:
|
||||
tag["DATE"] = track.dateString
|
||||
elif save['year']:
|
||||
tag["DATE"] = str(track.date['year'])
|
||||
|
||||
if save['length']:
|
||||
tag["LENGTH"] = str(track.duration)
|
||||
tag["LENGTH"] = str(int(track.duration)*1000)
|
||||
if save['bpm']:
|
||||
tag["BPM"] = str(track.bpm)
|
||||
if save['label']:
|
||||
|
|
@ -149,7 +177,7 @@ def tagFLAC(stream, track, save):
|
|||
|
||||
for role in track.contributors:
|
||||
if role in ['author', 'engineer', 'mixer', 'producer', 'writer', 'composer']:
|
||||
if save['involvedPeople'] and role != 'composer' or role == 'composer' and save['composer']:
|
||||
if save['involvedPeople'] and role != 'composer' or save['composer'] and role == 'composer':
|
||||
tag[role] = track.contributors[role]
|
||||
elif role == 'musicpublisher' and save['involvedPeople']:
|
||||
tag["ORGANIZATION"] = track.contributors['musicpublisher']
|
||||
|
|
@ -161,8 +189,10 @@ def tagFLAC(stream, track, save):
|
|||
|
||||
if save['cover'] and track.album['picPath']:
|
||||
image = Picture()
|
||||
image.type = 3
|
||||
image.mime = 'image/jpeg' if track.album['picPath'].endswith('jpg') else 'image/png'
|
||||
image.type = PictureType.COVER_FRONT
|
||||
image.mime = 'image/jpeg'
|
||||
if track.album['picPath'].endswith('png'):
|
||||
image.mime = 'image/png'
|
||||
with open(track.album['picPath'], 'rb') as f:
|
||||
image.data = f.read()
|
||||
tag.add_picture(image)
|
||||
|
|
|
|||
Loading…
Reference in New Issue