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

use name_builder with store_public, not create_pub_filepath

Browse Source
This commit is contained in:
Rodney Ewing 2013-08-13 10:28:12 -07:00
parent 550af89fc1
commit c6eaa555de
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -201,11 +201,11 @@ class CommonAudioProcessor(MediaProcessor):
self.name_builder.fill( self.name_builder.fill(
'{basename}{ext}')) '{basename}{ext}'))
webm_audio_filepath = create_pub_filepath( #webm_audio_filepath = create_pub_filepath(
self.entry, # self.entry,
'{original}.webm'.format( # '{original}.webm'.format(
original=os.path.splitext( # original=os.path.splitext(
self.orig_filename[-1])[0])) # self.orig_filename[-1])[0]))
self.transcoder.transcode( self.transcoder.transcode(
self.orig_filename, self.orig_filename,
@ -217,7 +217,7 @@ class CommonAudioProcessor(MediaProcessor):
_log.debug('Saving medium...') _log.debug('Saving medium...')
store_public(self.entry, 'medium', webm_audio_tmp, store_public(self.entry, 'medium', webm_audio_tmp,
webm_audio_filepath) self.name_builder.fill('{basename}.medium{ext}'))
def create_spectrogram(self, quality=None, max_width=None, fft_size=None): def create_spectrogram(self, quality=None, max_width=None, fft_size=None):
if not quality: if not quality:
@ -227,11 +227,11 @@ class CommonAudioProcessor(MediaProcessor):
if not fft_size: if not fft_size:
fft_size = self.audio_config['spectrogram_fft_size'] fft_size = self.audio_config['spectrogram_fft_size']
spectrogram_filepath = create_pub_filepath( #spectrogram_filepath = create_pub_filepath(
self.entry, # self.entry,
'{original}-spectrogram.jpg'.format( # '{original}-spectrogram.jpg'.format(
original=os.path.splitext( # original=os.path.splitext(
self.orig_filename[-1])[0])) # self.orig_filename[-1])[0]))
wav_tmp = os.path.join(self.workbench.dir, self.name_builder.fill( wav_tmp = os.path.join(self.workbench.dir, self.name_builder.fill(
'{basename}.ogg')) '{basename}.ogg'))
@ -250,7 +250,7 @@ class CommonAudioProcessor(MediaProcessor):
_log.debug('Saving spectrogram...') _log.debug('Saving spectrogram...')
store_public(self.entry, 'spectrogram', self.spectrogram_tmp, store_public(self.entry, 'spectrogram', self.spectrogram_tmp,
spectrogram_filepath) self.name_builder.fill('{basename}.spectrogram.jpg'))
def generate_thumb(self, size=None): def generate_thumb(self, size=None):
if not size: if not size:
@ -266,13 +266,14 @@ class CommonAudioProcessor(MediaProcessor):
thumb_tmp, thumb_tmp,
size) size)
thumb_filepath = create_pub_filepath( #thumb_filepath = create_pub_filepath(
self.entry, # self.entry,
'{original}-thumbnail.jpg'.format( # '{original}-thumbnail.jpg'.format(
original=os.path.splitext( # original=os.path.splitext(
self.orig_filename[-1])[0])) # self.orig_filename[-1])[0]))
store_public(self.entry, 'thumb', thumb_tmp, thumb_filepath) store_public(self.entry, 'thumb', thumb_tmp,
self.name_builder.fill('{basename}.thumbnail.jpg'))
class InitialProcessor(CommonAudioProcessor): class InitialProcessor(CommonAudioProcessor):