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

Allow administrators to disable keeping the original. That's the new default!

Browse Source
This commit is contained in:
Christopher Allan Webber 2011-12-12 08:10:10 -06:00
parent ed1840ee64
commit 23caf305f2
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mediagoblin/config_spec.ini
View File

@ -61,6 +61,11 @@ storage_class = string(default="mediagoblin.storage.filestorage:BasicFileStorage
base_dir = string(default="%(here)s/user_dev/media/queue") base_dir = string(default="%(here)s/user_dev/media/queue")
# Should we keep the original file?
[media_type:mediagoblin.media_types.video]
keep_original = boolean(default=False)
[beaker.cache] [beaker.cache]
type = string(default="file") type = string(default="file")
data_dir = string(default="%(here)s/user_dev/beaker/cache/data") data_dir = string(default="%(here)s/user_dev/beaker/cache/data")

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

@ -41,6 +41,8 @@ def process_video(entry):
and attaches callbacks to that child process, hopefully, the and attaches callbacks to that child process, hopefully, the
entry-complete callback will be called when the video is done. entry-complete callback will be called when the video is done.
""" """
video_config = mgg.global_config['media_type:mediagoblin.media_types.video']
workbench = mgg.workbench_manager.create_workbench() workbench = mgg.workbench_manager.create_workbench()
queued_filepath = entry['queued_media_file'] queued_filepath = entry['queued_media_file']
@ -94,25 +96,24 @@ def process_video(entry):
entry['media_files']['thumb'] = thumbnail_filepath entry['media_files']['thumb'] = thumbnail_filepath
if video_config['keep_original']:
# Push original file to public storage
queued_file = file(queued_filename, 'rb')
# Push original file to public storage with queued_file:
queued_file = file(queued_filename, 'rb') original_filepath = create_pub_filepath(
entry,
queued_filepath[-1])
with queued_file: with mgg.public_store.get_file(original_filepath, 'wb') as \
original_filepath = create_pub_filepath( original_file:
entry, _log.debug('Saving original...')
queued_filepath[-1]) original_file.write(queued_file.read())
_log.debug('Saved original')
with mgg.public_store.get_file(original_filepath, 'wb') as \ entry['media_files']['original'] = original_filepath
original_file:
_log.debug('Saving original...')
original_file.write(queued_file.read())
_log.debug('Saved original')
entry['media_files']['original'] = original_filepath
mgg.queue_store.delete_file(queued_filepath) mgg.queue_store.delete_file(queued_filepath)
# Save the MediaEntry # Save the MediaEntry
entry.save() entry.save()