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

Final step for non-force-conversion to jpeg

Browse Source
This commit is contained in:
Christopher Allan Webber 2011-11-12 15:12:39 -06:00
parent 0cf5b8ad24
commit d0504cfa87
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mediagoblin/process_media/__init__.py
View File

@ -14,8 +14,9 @@
# You should have received a copy of the GNU Affero General Public License # You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
import Image import os
import Image
from celery.task import Task from celery.task import Task
from celery import registry from celery import registry
@ -122,17 +123,16 @@ def process_image(entry):
mgg.queue_store, queued_filepath, mgg.queue_store, queued_filepath,
'source') 'source')
extension = os.path.splitext(queued_filename)[1]
try: try:
thumb = Image.open(queued_filename) thumb = Image.open(queued_filename)
except IOError: except IOError:
raise BadMediaFail() raise BadMediaFail()
thumb.thumbnail(THUMB_SIZE, Image.ANTIALIAS) thumb.thumbnail(THUMB_SIZE, Image.ANTIALIAS)
# ensure color mode is compatible with jpg
if thumb.mode != "RGB":
thumb = thumb.convert("RGB")
thumb_filepath = create_pub_filepath(entry, 'thumbnail.jpg') thumb_filepath = create_pub_filepath(entry, 'thumbnail' + extension)
thumb_file = mgg.public_store.get_file(thumb_filepath, 'w') thumb_file = mgg.public_store.get_file(thumb_filepath, 'w')
with thumb_file: with thumb_file:
@ -147,10 +147,7 @@ def process_image(entry):
if medium.size[0] > MEDIUM_SIZE[0] or medium.size[1] > MEDIUM_SIZE[1]: if medium.size[0] > MEDIUM_SIZE[0] or medium.size[1] > MEDIUM_SIZE[1]:
medium.thumbnail(MEDIUM_SIZE, Image.ANTIALIAS) medium.thumbnail(MEDIUM_SIZE, Image.ANTIALIAS)
if medium.mode != "RGB": medium_filepath = create_pub_filepath(entry, 'medium' + extension)
medium = medium.convert("RGB")
medium_filepath = create_pub_filepath(entry, 'medium.jpg')
medium_file = mgg.public_store.get_file(medium_filepath, 'w') medium_file = mgg.public_store.get_file(medium_filepath, 'w')
with medium_file: with medium_file: