aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/submit/lib.py
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2013-11-13 19:39:18 -0600
committerChristopher Allan Webber <cwebber@dustycloud.org>2013-11-13 19:40:13 -0600
commit301da9cabad61c8968a6e70df673dc26f1fea102 (patch)
treeb9458b183d4cca9c4745bb3c35fa593738cbfecf /mediagoblin/submit/lib.py
parent5202924c91f987a025eba78eb9ca323600074495 (diff)
downloadmediagoblin-301da9cabad61c8968a6e70df673dc26f1fea102.tar.lz
mediagoblin-301da9cabad61c8968a6e70df673dc26f1fea102.tar.xz
mediagoblin-301da9cabad61c8968a6e70df673dc26f1fea102.zip
Generic'ifying the submit code to not rely on the werkzeug FileStorage datastructure
Important, because that only makes sense for wsgi! :) This commit sponsored by Geoff Lehr. Thank you!
Diffstat (limited to 'mediagoblin/submit/lib.py')
-rw-r--r--mediagoblin/submit/lib.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/mediagoblin/submit/lib.py b/mediagoblin/submit/lib.py
index 1df05978..848dd35c 100644
--- a/mediagoblin/submit/lib.py
+++ b/mediagoblin/submit/lib.py
@@ -115,7 +115,7 @@ def submit_media(mg_app, user, submitted_file, filename,
# Sniff the submitted media to determine which
# media plugin should handle processing
- media_type, media_manager = sniff_media(submitted_file)
+ media_type, media_manager = sniff_media(submitted_file, filename)
# create entry and save in database
entry = new_upload_entry(user)
@@ -135,7 +135,7 @@ def submit_media(mg_app, user, submitted_file, filename,
queue_file = prepare_queue_task(mg_app, entry, filename)
with queue_file:
- queue_file.write(submitted_file.stream.read())
+ queue_file.write(submitted_file.read())
# Get file size and round to 2 decimal places
file_size = mg_app.queue_store.get_file_size(