heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Use audio icon when spectrogram fails. Add note to doc:media-types."

Browse Source 
This reverts commit 2b487fc16de2fc7c961f8df725c5ece0e5f56e3a.
This commit is contained in:
Ben Sturmfels 2020-04-28 15:28:59 +10:00
parent 632e973608
commit e3931333da
No known key found for this signature in database
GPG Key ID: 023C05E2C9C068F0
1 changed files with 15 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
mediagoblin/media_types/audio/processing.py
View File

@ -148,12 +148,9 @@ class CommonAudioProcessor(MediaProcessor):
_log.info('Creating OGG source for spectrogram') _log.info('Creating OGG source for spectrogram')
self.transcoder.transcode(self.process_filename, wav_tmp, self.transcoder.transcode(self.process_filename, wav_tmp,
mux_name='oggmux') mux_name='oggmux')
spectrogram_tmp = os.path.join(self.workbench.dir, spectrogram_tmp = os.path.join(self.workbench.dir,
self.name_builder.fill( self.name_builder.fill(
'{basename}-spectrogram.jpg')) '{basename}-spectrogram.jpg'))
try:
self.thumbnailer.spectrogram( self.thumbnailer.spectrogram(
wav_tmp, wav_tmp,
spectrogram_tmp, spectrogram_tmp,
@ -161,22 +158,13 @@ class CommonAudioProcessor(MediaProcessor):
fft_size=fft_size) fft_size=fft_size)
_log.debug('Saving spectrogram...') _log.debug('Saving spectrogram...')
store_public(self.entry, 'spectrogram', thumbnail, store_public(self.entry, 'spectrogram', spectrogram_tmp,
self.name_builder.fill('{basename}.spectrogram.jpg')) self.name_builder.fill('{basename}.spectrogram.jpg'))
file_metadata = {'max_width': max_width, file_metadata = {'max_width': max_width,
'fft_size': fft_size} 'fft_size': fft_size}
self.entry.set_file_metadata('spectrogram', **file_metadata) self.entry.set_file_metadata('spectrogram', **file_metadata)
except IndexError:
_log.warn(
'Your version of Numpy is too new to create the waveform thumbnail (#5457). '
"Try\n\t./bin/pip install numpy==1.9.1\n\t./bin/pip install scikits.audiolab==0.10.2")
except Exception as exc:
_log.warn('Failed to create spectrogram: '
+ '{0}'.exc)
def generate_thumb(self, size=None): def generate_thumb(self, size=None):
if not size: if not size:
max_width = mgg.global_config['media:thumb']['max_width'] max_width = mgg.global_config['media:thumb']['max_width']
@ -190,7 +178,6 @@ class CommonAudioProcessor(MediaProcessor):
'{basename}-thumbnail.jpg')) '{basename}-thumbnail.jpg'))
# We need the spectrogram to create a thumbnail # We need the spectrogram to create a thumbnail
try:
spectrogram = self.entry.media_files.get('spectrogram') spectrogram = self.entry.media_files.get('spectrogram')
if not spectrogram: if not spectrogram:
_log.info('No spectrogram found, we will create one.') _log.info('No spectrogram found, we will create one.')
@ -199,10 +186,6 @@ class CommonAudioProcessor(MediaProcessor):
spectrogram_filepath = mgg.public_store.get_local_path(spectrogram) spectrogram_filepath = mgg.public_store.get_local_path(spectrogram)
except:
_log.warn('Failed to create spectrogram, using default audio image instead.')
spectrogram_filepath = 'mediagoblin/static/images/media_thumbs/audio.png'
self.thumbnailer.thumbnail_spectrogram( self.thumbnailer.thumbnail_spectrogram(
spectrogram_filepath, spectrogram_filepath,
thumb_tmp, thumb_tmp,