|
|
@@ -97,7 +97,7 @@ def fetchjson(discogno, master=True, show=True):
|
|
|
msg("fetchjson complete!", 3)
|
|
|
return JSONDATA
|
|
|
|
|
|
-def buildlist(jsondata):
|
|
|
+def buildlist(jsondata, write=False):
|
|
|
## takes raw jsons data from Discogs.com and extracts Album, Artist, and tracklist list
|
|
|
## passes tracklist to gettracks to create list of track names
|
|
|
## appends "," + artist to end of track names
|
|
|
@@ -117,10 +117,18 @@ def buildlist(jsondata):
|
|
|
else:
|
|
|
print(Artist)
|
|
|
|
|
|
- print(gettracks(jsondata['tracklist']))
|
|
|
+ tracks = gettracks(jsondata['tracklist'])
|
|
|
|
|
|
-
|
|
|
+ for i in range(len(tracks)):
|
|
|
+ tracks[i] = tracks[i] + ", " + Artist
|
|
|
+
|
|
|
+ print(tracks)
|
|
|
|
|
|
+ if write:
|
|
|
+ with open('list.txt', 'w') as f:
|
|
|
+ for j in range (len(tracks)):
|
|
|
+ f.write(tracks[j] + "\n")
|
|
|
+ f.close()
|
|
|
|
|
|
def gettracks(tracks):
|
|
|
## takes raw json data from Discogs.com and creates a tracklist for the album
|
|
|
@@ -129,7 +137,7 @@ def gettracks(tracks):
|
|
|
goodtracks = []
|
|
|
|
|
|
for track in tracks:
|
|
|
- goodtracks.append(track['title'])
|
|
|
+ goodtracks.append(track['title'].replace(',',''))
|
|
|
|
|
|
return goodtracks
|
|
|
|
|
|
@@ -158,7 +166,8 @@ def parselist(musiclist):
|
|
|
global ITERATOR
|
|
|
ITERATOR+=1
|
|
|
for song in musiclist:
|
|
|
- searchterm = song['Title'] + " " + song['Artist'] + ' lyrics'
|
|
|
+# searchterm = song['Title'] + " " + song['Artist'] + ' lyrics HD'
|
|
|
+ searchterm = song['Title'] + " " + song['Artist']
|
|
|
dictlink={}
|
|
|
try:
|
|
|
ytresult = YoutubeSearch(searchterm, max_results=1).to_dict() ##increase timeout!!
|
|
|
@@ -223,8 +232,7 @@ if __name__ == "__main__":
|
|
|
if DISCOG != "":
|
|
|
msg("DISCOG found, fetch json", 3)
|
|
|
# print(fetchjson(DISCOG))
|
|
|
-# print(json_file)
|
|
|
- buildlist(fetchjson(DISCOG))
|
|
|
+ buildlist(fetchjson(DISCOG), True)
|
|
|
readlist(MUSICFILE)
|
|
|
parselist(music)
|
|
|
|
