From 64da09e86a755e49832e3c324582c65d352632d4 Mon Sep 17 00:00:00 2001
From: Joar Wandborg <git@wandborg.com>
Date: Sat, 4 Feb 2012 20:51:05 +0100
Subject: ASCII media support - Fixes

- Added debug logging in
  - mediagoblin.processing
  - mediagoblin.media_types.ascii.processing
  - mediagoblin.media_types.ascii.asciitoimage
---
 mediagoblin/media_types/ascii/asciitoimage.py | 11 ++++++-----
 mediagoblin/media_types/ascii/processing.py   |  1 +
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'mediagoblin/media_types')

diff --git a/mediagoblin/media_types/ascii/asciitoimage.py b/mediagoblin/media_types/ascii/asciitoimage.py
index 186d8066..e1c4fb44 100644
--- a/mediagoblin/media_types/ascii/asciitoimage.py
+++ b/mediagoblin/media_types/ascii/asciitoimage.py
@@ -59,15 +59,15 @@ class AsciiToImage(object):
         if kw.get('font_size'):
             self._font_size = kw.get('font_size')
 
-        _log.info('Setting font to {0}, size {1}'.format(
-                self._font,
-                self._font_size))
-
         self._if = ImageFont.truetype(
             self._font,
             self._font_size,
             encoding='unic')
 
+        _log.info('Font set to {0}, size {1}'.format(
+                self._font,
+                self._font_size))
+
         #      ,-,-^-'-^'^-^'^-'^-.
         #     ( I am a wall socket )Oo,  ___
         #      `-.,.-.,.-.-.,.-.--'     '   `
@@ -92,6 +92,7 @@ class AsciiToImage(object):
         - Character set detection and decoding,
           http://pypi.python.org/pypi/chardet
         '''
+        _log.debug('Drawing image')
         # Convert the input from str to unicode
         text = text.decode('utf-8')
 
@@ -128,7 +129,7 @@ class AsciiToImage(object):
                 px_pos = self._px_pos(char_pos)
 
                 _log.debug('Writing character "{0}" at {1} (px pos {2})'.format(
-                        char,
+                        char.encode('ascii', 'replace'),
                         char_pos,
                         px_pos))
 
diff --git a/mediagoblin/media_types/ascii/processing.py b/mediagoblin/media_types/ascii/processing.py
index 96dfce80..837b9830 100644
--- a/mediagoblin/media_types/ascii/processing.py
+++ b/mediagoblin/media_types/ascii/processing.py
@@ -72,6 +72,7 @@ def process_ascii(entry):
             thumb.thumbnail(THUMB_SIZE, Image.ANTIALIAS)
             thumb.save(thumb_file)
 
+        _log.debug('Copying local file to public storage')
         mgg.public_store.copy_local_to_storage(
             tmp_thumb_filename, thumb_filepath)
 
-- 
cgit v1.2.3