diff --git a/audioFilesTools.py b/audioFilesTools.py index 8ac84da..012857f 100644 --- a/audioFilesTools.py +++ b/audioFilesTools.py @@ -12,10 +12,14 @@ def getGenre(filename): audiofile = eyed3.load(filename) #No genre if not audiofile.tag.genre: - return None + return str(None) else: - return audiofile.tag.genre.name.encode('utf-8') + genere = str(audiofile.tag.genre.name.encode('utf-8')) + genere = genere.replace('b\'', '') + genere = genere.replace('\'', '') + return genere - \ No newline at end of file + + diff --git a/sliceSpectrogram.py b/sliceSpectrogram.py index 8b2abec..f8e78bb 100644 --- a/sliceSpectrogram.py +++ b/sliceSpectrogram.py @@ -34,7 +34,7 @@ def sliceSpectrogram(filename, desiredSize): #For each sample for i in range(nbSamples): - print "Creating slice: ", (i+1), "/", nbSamples, "for", filename + print ("Creating slice: ", (i+1), "/", nbSamples, "for", filename) #Extract and save 128x128 sample startPixel = i*desiredSize imgTmp = img.crop((startPixel, 1, startPixel + desiredSize, desiredSize + 1)) diff --git a/songToData.py b/songToData.py index 40ae425..f1e6b0b 100644 --- a/songToData.py +++ b/songToData.py @@ -2,7 +2,6 @@ from subprocess import Popen, PIPE, STDOUT import os from PIL import Image -import eyed3 from sliceSpectrogram import createSlicesFromSpectrograms from audioFilesTools import isMono, getGenre @@ -16,9 +15,6 @@ #Define currentPath = os.path.dirname(os.path.realpath(__file__)) -#Remove logs -eyed3.log.setLevel("ERROR") - #Create spectrogram from mp3 files def createSpectrogram(filename,newFilename): #Create temporary mono track if needed @@ -29,7 +25,7 @@ def createSpectrogram(filename,newFilename): p = Popen(command, shell=True, stdin=PIPE, stdout=PIPE, stderr=STDOUT, close_fds=True, cwd=currentPath) output, errors = p.communicate() if errors: - print errors + print (errors) #Create spectrogram filename.replace(".mp3","") @@ -37,7 +33,7 @@ def createSpectrogram(filename,newFilename): p = Popen(command, shell=True, stdin=PIPE, stdout=PIPE, stderr=STDOUT, close_fds=True, cwd=currentPath) output, errors = p.communicate() if errors: - print errors + print (errors) #Remove tmp mono track os.remove("/tmp/{}.mp3".format(newFilename)) @@ -59,7 +55,7 @@ def createSpectrogramsFromAudio(): #Rename files according to genre for index,filename in enumerate(files): - print "Creating spectrogram for file {}/{}...".format(index+1,nbFiles) + print ("Creating spectrogram for file {}/{}...".format(index+1,nbFiles)) fileGenre = getGenre(rawDataPath+filename) genresID[fileGenre] = genresID[fileGenre] + 1 if fileGenre in genresID else 1 fileID = genresID[fileGenre] @@ -68,10 +64,10 @@ def createSpectrogramsFromAudio(): #Whole pipeline .mp3 -> .png slices def createSlicesFromAudio(): - print "Creating spectrograms..." + print ("Creating spectrograms...") createSpectrogramsFromAudio() - print "Spectrograms created!" + print ("Spectrograms created!") - print "Creating slices..." + print ("Creating slices...") createSlicesFromSpectrograms(desiredSize) - print "Slices created!" \ No newline at end of file + print ("Slices created!")