heckyel/mediagoblin
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Rename to FilenameBuilder, with a main method named fill.

Browse Source 
I think these names better convey what's actually going on.  I updated the
documentation a bit while I was at it.
This commit is contained in:
Brett Smith
2012-03-26 13:40:35 -04:00
parent 84725abd64
commit 28f364bd6d
4 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mediagoblin/media_types/image/processing.py
View File

@@ -19,7 +19,7 @@ import os
from mediagoblin import mg_globals as mgg
from mediagoblin.processing import BadMediaFail, \
create_pub_filepath, THUMB_SIZE, MEDIUM_SIZE, FilenameMunger
create_pub_filepath, THUMB_SIZE, MEDIUM_SIZE, FilenameBuilder
from mediagoblin.tools.exif import exif_fix_image_orientation, \
extract_exif, clean_exif, get_gps_data, get_useful
@@ -67,7 +67,7 @@ def process_image(entry):
queued_filename = workbench.localized_file(
mgg.queue_store, queued_filepath,
'source')
name_munger = FilenameMunger(queued_filename)
name_builder = FilenameBuilder(queued_filename)
# EXIF extraction
exif_tags = extract_exif(queued_filename)
@@ -75,7 +75,7 @@ def process_image(entry):
# Always create a small thumbnail
thumb_filepath = create_pub_filepath(
entry, name_munger.munge('{basename}.thumbnail{ext}'))
entry, name_builder.fill('{basename}.thumbnail{ext}'))
resize_image(entry, queued_filename, thumb_filepath,
exif_tags, conversions_subdir, THUMB_SIZE)
@@ -83,7 +83,7 @@ def process_image(entry):
# file, a `.medium.jpg` files is created and later associated with the media
# entry.
medium_filepath = create_pub_filepath(
entry, name_munger.munge('{basename}.medium{ext}'))
entry, name_builder.fill('{basename}.medium{ext}'))
resize_image(entry, queued_filename, medium_filepath,
exif_tags, conversions_subdir, MEDIUM_SIZE, MEDIUM_SIZE)
@@ -93,7 +93,7 @@ def process_image(entry):
with queued_file:
original_filepath = create_pub_filepath(
entry, name_munger.munge('{basename}{ext}') )
entry, name_builder.fill('{basename}{ext}') )
with mgg.public_store.get_file(original_filepath, 'wb') \
as original_file:

8
mediagoblin/media_types/video/processing.py
View File

@@ -20,7 +20,7 @@ import os
from mediagoblin import mg_globals as mgg
from mediagoblin.processing import mark_entry_failed, \
THUMB_SIZE, MEDIUM_SIZE, create_pub_filepath, FilenameMunger
THUMB_SIZE, MEDIUM_SIZE, create_pub_filepath, FilenameBuilder
from . import transcoders
logging.basicConfig()
@@ -49,13 +49,13 @@ def process_video(entry):
queued_filename = workbench.localized_file(
mgg.queue_store, queued_filepath,
'source')
name_munger = FilenameMunger(queued_filename)
name_builder = FilenameBuilder(queued_filename)
medium_filepath = create_pub_filepath(
entry, name_munger.munge('{basename}-640p.webm'))
entry, name_builder.fill('{basename}-640p.webm'))
thumbnail_filepath = create_pub_filepath(
entry, name_munger.munge('{basename}.thumbnail.jpg'))
entry, name_builder.fill('{basename}.thumbnail.jpg'))
# Create a temporary file for the video destination
tmp_dst = tempfile.NamedTemporaryFile()