Merge lp:~marco-gallotta/ibid/ascii-501638 into lp:~ibid-core/ibid/old-trunk-1.6

[marcog]

[marcog (marco-gallotta)]

Made some minor improvements, such as error handling.

[Stefano Rivera (stefanor)]

ibid/plugins/ascii.py:6: 'socket' imported but unused
ibid/plugins/ascii.py:8: 'stderr' imported but unused
ibid/plugins/ascii.py:129: redefinition of unused 'stderr' from line 8
ibid/plugins/ascii.py:129: 'stderr' imported but unused

Also, "Sorry, that string is too long!". Can you make that "Sorry that's too long, nobody will be able to read it"

Users don't know about "strings" and they don't need the exclamation mark

review: Needs Fixing

[marcog (marco-gallotta)]

Fixed

> ibid/plugins/ascii.py:6: 'socket' imported but unused
> ibid/plugins/ascii.py:8: 'stderr' imported but unused
> ibid/plugins/ascii.py:129: redefinition of unused 'stderr' from line 8
> ibid/plugins/ascii.py:129: 'stderr' imported but unused
>
> Also, "Sorry, that string is too long!". Can you make that "Sorry that's too
> long, nobody will be able to read it"
>
> Users don't know about "strings" and they don't need the exclamation mark

review: Needs Resubmitting

[Stefano Rivera (stefanor)]

Looks good to go

review: Approve

[Michael Gorven (mgorven)]

 review approve
 status approved

review: Approve

=== modified file 'ibid/plugins/ascii.py'
--- ibid/plugins/ascii.py	2009-12-31 17:43:05 +0000
+++ ibid/plugins/ascii.py	2010-01-04 16:02:12 +0000
@@ -1,11 +1,12 @@
+from BaseHTTPServer import BaseHTTPRequestHandler
 from cStringIO import StringIO
 import Image
 from os import remove
 import os.path
 import subprocess
-from sys import stderr
 from tempfile import mkstemp
-from urllib2 import urlopen
+from urllib2 import HTTPError, URLError, urlopen
+from urlparse import urlparse
 from zipfile import ZipFile
 
 from aalib import AsciiScreen
@@ -43,24 +44,41 @@
 
     @match(r'^draw\s+(\S+\.\S+)(\s+in\s+colou?r)?(?:\s+w(?:idth)?\s+(\d+))?(?:\s+h(?:eight)\s+(\d+))?$')
     def draw(self, event, url, colour, width, height):
-        f = urlopen(url)
-
-        filesize = int(f.info().getheaders('Content-Length')[0])
-        if filesize > self.max_filesize * 1024:
-            event.addresponse(u'File too large (limit is %i KiB)', self.max_filesize)
-            return
-
+        if not urlparse(url).netloc:
+            url = 'http://' + url
+        if urlparse(url).scheme == 'file':
+            event.addresponse(u'Are you trying to haxor me?')
+            return
+        if not urlparse(url).path:
+            url += '/'
+
+        try:
+            f = urlopen(url)
+        except HTTPError, e:
+            event.addresponse(u'Sorry, error fetching URL: %s', BaseHTTPRequestHandler.responses[e.code][0])
+        except URLError:
+            event.addresponse(u'Sorry, error fetching URL')
+
+        content_length = f.info().getheaders('Content-Length')
+        if content_length and int(content_length[0]) > self.max_filesize * 1024:
+            event.addresponse(u'File too large (limit is %i KiB)', self.max_filesize)
+            return
+
+        buffer = f.read(self.max_filesize * 1024)
+        if f.read(1) != '':
+            event.addresponse(u'File too large (limit is %i KiB)', self.max_filesize)
+            return
         try:
             ext = os.path.splitext(url)[1]
             image = mkstemp(suffix=ext)[1]
             file = open(image, 'w')
-            file.write(f.read())
+            file.write(buffer)
             file.close()
 
             try:
                 img = Image.open(StringIO(open(image, 'r').read())).convert('L')
-            except:
-                event.addresponse(u'Cannot understand image format')
+            except IOError:
+                event.addresponse(u"Sorry, that doesn't look like an image")
                 return
             input_width, input_height = img.size[0], img.size[1]
 
@@ -100,8 +118,8 @@
     def draw_aa(self, event, image, width, height):
         try:
             image = Image.open(StringIO(open(image, 'r').read())).convert('L')
-        except:
-            event.addresponse(u'Cannot understand image format')
+        except IOError:
+            event.addresponse(u"Sorry, that doesn't look like an image")
             return
         screen = AsciiScreen(width=width, height=height)
         image = image.resize(screen.virtual_size)
@@ -109,7 +127,6 @@
         event.addresponse(unicode(screen.render()), address=False, conflate=False)
 
     def draw_caca(self, event, image, width, height):
-        from sys import stderr
         process = subprocess.Popen(
             [self.img2txt_bin, '-f', 'irc', '-W', str(width), '-H', str(height), image],
             shell=False, stdout=subprocess.PIPE)
@@ -118,14 +135,15 @@
         if code == 0:
             event.addresponse(unicode(response.replace('\r', '')), address=False, conflate=False)
         else:
-            event.addresponse(u'Sorry, cannot understand image format')
+            event.addresponse(u"Sorry, that doesn't look like an image")
 
 class WriteFiglet(Processor):
     u"""figlet <text> [in <font>]
     list figlet fonts [from <index>]"""
     feature = 'figlet'
 
-    fonts_zip = Option('fonts_zip', 'Zip file containing figlet fonts', 'data/figlet-fonts.zip')
+    max_width = IntOption('max_width', 'Maximum width for ascii output', 60)
+    fonts_zip = Option('fonts_zip', 'Zip file containing figlet fonts', 'ibid/data/figlet-fonts.zip')
 
     def __init__(self, name):
         Processor.__init__(self, name)
@@ -158,4 +176,7 @@
             del rendered[0]
         while rendered and rendered[-1].strip() == '':
             del rendered[-1]
+        if rendered and len(rendered[0]) > self.max_width:
+            event.addresponse(u"Sorry that's too long, nobody will be able to read it")
+            return
         event.addresponse(unicode('\n'.join(rendered)), address=False, conflate=False)