commit 0608e5f4300e84c549c519900f32aed65655b134 · cduck.me/drawsvg

+33

drawSvg/drawing.py

···

       1
       1
        
       

     

       2
       2
        
       from io import StringIO

     

       3
       3
        
       import base64

     

       4
       4
       +
       import urllib.parse

     

       5
       5
       +
       import re

     

       4
       6
        
       

     

       5
       7
        
       from . import Raster

     

       6
       8
        
       from . import elements as elementsModule

     

       9
       9
       +
       

     

       10
       10
       +
       

     

       11
       11
       +
       STRIP_CHARS = ('\x00\x01\x02\x03\x04\x05\x06\x07\x08\x0b\x0c\x0e\x0f\x10\x11'

     

       12
       12
       +
                      '\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f')

     

       7
       13
        
       

     

       8
       14
        
       

     

       9
       15
        
       class Drawing:

     
···

       171
       177
        
               data = base64.b64encode(self.asSvg().encode())

     

       172
       178
        
               src = (prefix+data).decode()

     

       173
       179
        
               return '<img src="{}">'.format(src)

     

       180
       180
       +
           def asDataUri(self, strip_chars=STRIP_CHARS):

     

       181
       181
       +
               ''' Returns a data URI with base64 encoding. '''

     

       182
       182
       +
               data = self.asSvg()

     

       183
       183
       +
               search = re.compile('|'.join(strip_chars))

     

       184
       184
       +
               data_safe = search.sub(lambda m: '', data)

     

       185
       185
       +
               b64 = base64.b64encode(data_safe.encode())

     

       186
       186
       +
               return 'data:image/svg+xml;base64,' + b64.decode(encoding='ascii')

     

       187
       187
       +
           def asUtf8DataUri(self, unsafe_chars='"', strip_chars=STRIP_CHARS):

     

       188
       188
       +
               ''' Returns a data URI without base64 encoding.

     

       189
       189
       +
       

     

       190
       190
       +
                   The characters '#&%' are always escaped.  '#' and '&' break parsing

     

       191
       191
       +
                   of the data URI.  If '%' is not escaped, plain text like '%50' will

     

       192
       192
       +
                   be incorrectly decoded to 'P'.  The characters in `strip_chars`

     

       193
       193
       +
                   cause the SVG not to render even if they are escaped. '''

     

       194
       194
       +
               data = self.asSvg()

     

       195
       195
       +
               unsafe_chars = (unsafe_chars or '') + '#&%'

     

       196
       196
       +
               replacements = {

     

       197
       197
       +
                   char: urllib.parse.quote(char, safe='')

     

       198
       198
       +
                   for char in unsafe_chars

     

       199
       199
       +
               }

     

       200
       200
       +
               replacements.update({

     

       201
       201
       +
                   char: ''

     

       202
       202
       +
                   for char in strip_chars

     

       203
       203
       +
               })

     

       204
       204
       +
               search = re.compile('|'.join(map(re.escape, replacements.keys())))

     

       205
       205
       +
               data_safe = search.sub(lambda m: replacements[m.group(0)], data)

     

       206
       206
       +
               return 'data:image/svg+xml;utf8,' + data_safe

+13 -1

drawSvg/raster.py

···

       1
       1
        
       

     

       2
       2
       +
       import base64

     

       2
       3
        
       import io

     

       3
       4
        
       import warnings

     

       4
       5
        
       from .missing import MissingModule

     
···

       53
       54
        
                       return self.pngFile.read()

     

       54
       55
        
                   except io.UnsupportedOperation:

     

       55
       56
        
                       pass

     

       56
       56
       -
       

     

       57
       57
       +
           def asDataUri(self):

     

       58
       58
       +
               if self.pngData:

     

       59
       59
       +
                   data = self.pngData

     

       60
       60
       +
               else:

     

       61
       61
       +
                   try:

     

       62
       62
       +
                       with open(self.pngFile, 'rb') as f:

     

       63
       63
       +
                           data = f.read()

     

       64
       64
       +
                   except TypeError:

     

       65
       65
       +
                       self.pngFile.seek(0)

     

       66
       66
       +
                       data = self.pngFile.read()

     

       67
       67
       +
               b64 = base64.b64encode(data)

     

       68
       68
       +
               return 'data:image/png;base64,' + b64.decode(encoding='ascii')