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

Switching the addmedia tool over to using the get_upload_file_limits tool also.

Browse Source 
This commit sponsored by Damien Radtke.  Thanks!
This commit is contained in:
Christopher Allan Webber 2013-11-14 11:09:18 -06:00
parent 860b380bb5
commit 210a6cebe0
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mediagoblin/gmg_commands/addmedia.py
View File

@ -18,7 +18,7 @@ import os
from mediagoblin.gmg_commands import util as commands_util from mediagoblin.gmg_commands import util as commands_util
from mediagoblin.submit.lib import ( from mediagoblin.submit.lib import (
submit_media, submit_media, get_upload_file_limits,
FileUploadLimit, UserUploadLimit, UserPastUploadLimit) FileUploadLimit, UserUploadLimit, UserPastUploadLimit)
from mediagoblin import mg_globals from mediagoblin import mg_globals
@ -78,12 +78,7 @@ def addmedia(args):
print "Can't find a file with filename '%s'" % args.filename print "Can't find a file with filename '%s'" % args.filename
return return
if user.upload_limit >= 0: upload_limit, max_file_size = get_upload_file_limits(user)
upload_limit = user.upload_limit
else:
upload_limit = mg_globals.app_config.get('upload_limit', None)
max_file_size = mg_globals.app_config.get('max_file_size', None)
def maybe_unicodeify(some_string): def maybe_unicodeify(some_string):
# this is kinda terrible # this is kinda terrible