adding latest working version

This commit is contained in:
2020-03-07 03:01:24 +00:00
parent 76fe7333db
commit eed16b9128
7 changed files with 154836 additions and 71 deletions

View File

@@ -1,8 +1,461 @@
{ {
"The All\u2010American Rejects [2003]": null, "Please Please Me [1963]": {
"Move Along [2005]": null, "avg": 150,
"B-Sides & Rarities [2007]": null, "median": 151,
"When the World Comes Down [2009]": null, "std": 38,
"Kids in the Street [2012]": null, "max": 208,
"The All\u2010American Rejects [2000]": null "min": 92,
"p_10": 104,
"p_25": 108,
"p_75": 185,
"p_90": 186,
"count": 13
},
"With the Beatles [1963]": {
"avg": 143,
"median": 156,
"std": 51,
"max": 227,
"min": 54,
"p_10": 64,
"p_25": 106,
"p_75": 172,
"p_90": 194,
"count": 14
},
"Introducing\u2026 The Beatles [1964]": {
"avg": 143,
"median": 143,
"std": 38,
"max": 208,
"min": 92,
"p_10": 103,
"p_25": 108,
"p_75": 176,
"p_90": 186,
"count": 11
},
"Meet the Beatles! [2014]": {
"avg": 142,
"median": 151,
"std": 49,
"max": 215,
"min": 54,
"p_10": 64,
"p_25": 94,
"p_75": 181,
"p_90": 196,
"count": 24
},
"Twist and Shout [1964]": {
"avg": 178,
"median": 173,
"std": 55,
"max": 288,
"min": 105,
"p_10": 109,
"p_25": 141,
"p_75": 205,
"p_90": 253,
"count": 12
},
"The Beatles\u2019 Second Album [2004]": {
"avg": 192,
"median": 184,
"std": 69,
"max": 339,
"min": 82,
"p_10": 114,
"p_25": 155,
"p_75": 227,
"p_90": 274,
"count": 21
},
"The Beatles\u2019 Long Tall Sally [1964]": {
"avg": 171,
"median": 171,
"std": 46,
"max": 241,
"min": 81,
"p_10": 131,
"p_25": 138,
"p_75": 193,
"p_90": 238,
"count": 12
},
"Something New [2014]": {
"avg": 142,
"median": 147,
"std": 36,
"max": 185,
"min": 77,
"p_10": 82,
"p_25": 118,
"p_75": 170,
"p_90": 180,
"count": 22
},
"Beatles for Sale [1964]": {
"avg": 140,
"median": 127,
"std": 68,
"max": 316,
"min": 53,
"p_10": 74,
"p_25": 102,
"p_75": 158,
"p_90": 202,
"count": 12
},
"Beatles \u201965 [2004]": {
"avg": 155,
"median": 146,
"std": 64,
"max": 358,
"min": 71,
"p_10": 104,
"p_25": 117,
"p_75": 155,
"p_90": 171,
"count": 21
},
"Beatles VI [2014]": {
"avg": 142,
"median": 140,
"std": 46,
"max": 205,
"min": 53,
"p_10": 84,
"p_25": 110,
"p_75": 173,
"p_90": 194,
"count": 18
},
"Rubber Soul [1999]": {
"avg": 155,
"median": 144,
"std": 40,
"max": 239,
"min": 89,
"p_10": 115,
"p_25": 127,
"p_75": 169,
"p_90": 223,
"count": 22
},
"Revolver [2014]": {
"avg": 144,
"median": 134,
"std": 41,
"max": 212,
"min": 90,
"p_10": 92,
"p_25": 105,
"p_75": 165,
"p_90": 205,
"count": 22
},
"Sgt. Pepper\u2019s Lonely Hearts Club Band [1994]": {
"avg": 177,
"median": 169,
"std": 48,
"max": 297,
"min": 87,
"p_10": 131,
"p_25": 150,
"p_75": 198,
"p_90": 227,
"count": 20
},
"The Beatles [1968]": {
"avg": 124,
"median": 124,
"std": 68,
"max": 272,
"min": 9,
"p_10": 26,
"p_25": 111,
"p_75": 146,
"p_90": 205,
"count": 15
},
"Abbey Road [2009]": {
"avg": 84,
"median": 72,
"std": 43,
"max": 154,
"min": 28,
"p_10": 35,
"p_25": 52,
"p_75": 127,
"p_90": 141,
"count": 14
},
"Let It Be [2010]": {
"avg": 162,
"median": 154,
"std": 62,
"max": 244,
"min": 57,
"p_10": 69,
"p_25": 117,
"p_75": 204,
"p_90": 243,
"count": 13
},
"Decca Sessions 1.1.62 [1987]": {
"avg": 182,
"median": 167,
"std": 56,
"max": 289,
"min": 107,
"p_10": 126,
"p_25": 130,
"p_75": 227,
"p_90": 241,
"count": 9
},
"The Unreleased Tracks, Volume 2 [1990]": {
"avg": 142,
"median": 125,
"std": 43,
"max": 241,
"min": 105,
"p_10": 108,
"p_25": 110,
"p_75": 143,
"p_90": 195,
"count": 9
},
"Reunions 74 & 92 [1992]": {
"avg": 149,
"median": 170,
"std": 65,
"max": 240,
"min": 32,
"p_10": 71,
"p_25": 125,
"p_75": 170,
"p_90": 205,
"count": 6
},
"Studio 2 Sessions at Abbey Road, Vol. 1 [1995]": {
"avg": 133,
"median": 112,
"std": 35,
"max": 185,
"min": 92,
"p_10": 105,
"p_25": 105,
"p_75": 175,
"p_90": 185,
"count": 22
},
"Studio 2 Sessions at Abbey Road, Vol. 2 [1995]": null,
"Studio 2 Sessions at Abbey Road, Vol. 3 [1995]": {
"avg": 177,
"median": 147,
"std": 52,
"max": 248,
"min": 117,
"p_10": 117,
"p_25": 142,
"p_75": 248,
"p_90": 248,
"count": 16
},
"Studio 2 Sessions at Abbey Road, Vol. 4 [1995]": {
"avg": 199,
"median": 207,
"std": 53,
"max": 269,
"min": 127,
"p_10": 127,
"p_25": 148,
"p_75": 237,
"p_90": 269,
"count": 18
},
"The Alternate Abbey Road [2000]": {
"avg": 91,
"median": 81,
"std": 42,
"max": 154,
"min": 28,
"p_10": 36,
"p_25": 57,
"p_75": 128,
"p_90": 137,
"count": 16
},
"Alf Together Now [2001]": {
"avg": 192,
"median": 170,
"std": 68,
"max": 339,
"min": 108,
"p_10": 164,
"p_25": 168,
"p_75": 170,
"p_90": 323,
"count": 12
},
"Collectors Items [2002]": {
"avg": 207,
"median": 192,
"std": 126,
"max": 639,
"min": 89,
"p_10": 100,
"p_25": 139,
"p_75": 231,
"p_90": 267,
"count": 16
},
"Complete Home Recordings 1967\u20131968 [2002]": {
"avg": 181,
"median": 199,
"std": 71,
"max": 274,
"min": 32,
"p_10": 107,
"p_25": 113,
"p_75": 229,
"p_90": 270,
"count": 20
},
"Complete Home Recordings 1968 [2002]": {
"avg": 150,
"median": 136,
"std": 82,
"max": 351,
"min": 32,
"p_10": 63,
"p_25": 107,
"p_75": 163,
"p_90": 272,
"count": 24
},
"The Seven Years of Christmas [2002]": {
"avg": 695,
"median": 659,
"std": 339,
"max": 1122,
"min": 114,
"p_10": 332,
"p_25": 659,
"p_75": 921,
"p_90": 1042,
"count": 5
},
"20 X 4 Remastered Edition [2005]": {
"avg": 158,
"median": 145,
"std": 61,
"max": 230,
"min": 66,
"p_10": 91,
"p_25": 128,
"p_75": 220,
"p_90": 226,
"count": 5
},
"Inside Sgt. Pepper (Part Three) [2007]": {
"avg": 228,
"median": 235,
"std": 11,
"max": 235,
"min": 212,
"p_10": 212,
"p_25": 212,
"p_75": 235,
"p_90": 235,
"count": 9
},
"Carnival of Light - Fakes, Frauds, and Phonies (Million Volt Laugh and Sound Rave) [2009]": null,
"Transcending Time [2010]": {
"avg": 130,
"median": 115,
"std": 68,
"max": 243,
"min": 57,
"p_10": 58,
"p_25": 72,
"p_75": 174,
"p_90": 218,
"count": 6
},
"Hot as Sun [2010]": {
"avg": 141,
"median": 156,
"std": 43,
"max": 182,
"min": 70,
"p_10": 95,
"p_25": 132,
"p_75": 166,
"p_90": 176,
"count": 4
},
"From the Basement to the Boardroom [2011]": {
"avg": 125,
"median": 121,
"std": 69,
"max": 227,
"min": 32,
"p_10": 32,
"p_25": 54,
"p_75": 173,
"p_90": 203,
"count": 9
},
"The Decca Tapes [2013]": {
"avg": 163,
"median": 165,
"std": 60,
"max": 289,
"min": 94,
"p_10": 97,
"p_25": 107,
"p_75": 206,
"p_90": 228,
"count": 13
},
"Kinfauns Demos [Missing]": {
"avg": 144,
"median": 142,
"std": 71,
"max": 299,
"min": 32,
"p_10": 51,
"p_25": 94,
"p_75": 198,
"p_90": 230,
"count": 28
},
"Rare Tracks [Missing]": {
"avg": 181,
"median": 186,
"std": 28,
"max": 212,
"min": 126,
"p_10": 148,
"p_25": 168,
"p_75": 204,
"p_90": 210,
"count": 8
},
"The Lost Album (Two and a Half) [Missing]": {
"avg": 169,
"median": 161,
"std": 61,
"max": 282,
"min": 32,
"p_10": 111,
"p_25": 123,
"p_75": 203,
"p_90": 243,
"count": 22
},
"8 Mile and Abbey: Eminem Meets the Beatles [2014]": null
} }

File diff suppressed because one or more lines are too long

BIN
beatles.jpeg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 47 KiB

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

View File

@@ -2,7 +2,7 @@ from __future__ import annotations
from abc import ABC, abstractmethod, abstractstaticmethod from abc import ABC, abstractmethod, abstractstaticmethod
from dataclasses import dataclass from dataclasses import dataclass
# from pprint import pprint from pprint import pprint
from typing import Union, List, Dict from typing import Union, List, Dict
from collections import Counter from collections import Counter
import html import html
@@ -159,6 +159,9 @@ class LyricsBuilder(LyricsConcreteBuilder):
artist=self.artist, country=self.country artist=self.artist, country=self.country
) )
# pprint(self.musicbrainz_artists['artist-list']) # pprint(self.musicbrainz_artists['artist-list'])
# for i in self.musicbrainz_artists['artist-list']:
# print(i['name'])
# raise(SystemExit)
return self return self
def sort_artists(self) -> None: def sort_artists(self) -> None:
@@ -335,15 +338,16 @@ class LyricsBuilder(LyricsConcreteBuilder):
label=f'Finding lyrics for {self.total_track_count}' label=f'Finding lyrics for {self.total_track_count}'
f' tracks for {self.artist}. This may take some time! ☕️', f' tracks for {self.artist}. This may take some time! ☕️',
) as bar: ) as bar:
bar.update(5)
for x in self.all_albums_lyrics_url: for x in self.all_albums_lyrics_url:
for alb, urls in x.items(): for alb, urls in x.items():
bar.update(1) # bar.update(1)
update = len(urls) update = len(urls)
lyrics = addict.Dict( lyrics = addict.Dict(
(alb, [self.request_lyrics_from_url(i) for i in urls]) (alb, [self.request_lyrics_from_url(i) for i in urls])
) )
self.all_albums_lyrics.append(lyrics) self.all_albums_lyrics.append(lyrics)
bar.update(update - 1) bar.update(update)
with open(f'{os.getcwd()}/all_albums_lyrics.json', 'w') as f: with open(f'{os.getcwd()}/all_albums_lyrics.json', 'w') as f:
json.dump(self.all_albums_lyrics, f, indent=2) json.dump(self.all_albums_lyrics, f, indent=2)
@@ -679,8 +683,8 @@ class Lyrics:
final_average = math.ceil(np.mean(all_averages)) final_average = math.ceil(np.mean(all_averages))
except ValueError: except ValueError:
click.echo( click.echo(
'Oops! https://lyrics.ovh couldn\'t find any lyrics across all' 'Oops! https://lyrics.ovh couldn\'t find any lyrics across any'
' albums. This is caused by inconsistent Artist names from' ' album. This is caused by inconsistent Artist names from'
' Musicbrainz and lyrics.ovh. Try another artist.' ' Musicbrainz and lyrics.ovh. Try another artist.'
) )
raise (SystemExit) raise (SystemExit)

View File

@@ -1,6 +1,6 @@
import json import json
from pprint import pprint from pprint import pprint
from wordcloud import WordCloud
words = [ words = [
{ {
@@ -37576,3 +37576,5 @@ for i in words:
# except (TypeError, IndexError): # except (TypeError, IndexError):
# pass # pass
print(all_words) print(all_words)
wc = WordCloud(background_color="white", max_words=200, width=400, height=400, mask=char_mask, random_state=1).generate(all_words)