python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-02-04 13:40:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

support file-like object

Browse Source 
fix #8
This commit is contained in:
mete0r sarangbang 2012-07-16 05:58:01 +09:00 committed by Martin Panter
parent eaeb12f695
commit bbee2b5b8a
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
PIL/OleFileIO.py
View File

@ -443,7 +443,7 @@ class _OleStream(StringIO.StringIO):
# the fat chain, and load new sectors on demand instead of # the fat chain, and load new sectors on demand instead of
# loading it all in one go. # loading it all in one go.
def __init__(self, fp, sect, size, offset, sectorsize, fat): def __init__(self, fp, sect, size, offset, sectorsize, fat, filesize):
""" """
Constructor for _OleStream class. Constructor for _OleStream class.
@ -458,11 +458,6 @@ class _OleStream(StringIO.StringIO):
debug('_OleStream.__init__:') debug('_OleStream.__init__:')
debug(' sect=%d (%X), size=%d, offset=%d, sectorsize=%d, len(fat)=%d, fp=%s' debug(' sect=%d (%X), size=%d, offset=%d, sectorsize=%d, len(fat)=%d, fp=%s'
%(sect,sect,size,offset,sectorsize,len(fat), repr(fp))) %(sect,sect,size,offset,sectorsize,len(fat), repr(fp)))
# for debugging messages, size of file where stream is read:
if isinstance(fp, StringIO.StringIO):
filesize = len(fp.getvalue()) # file in MiniFAT
else:
filesize = os.path.getsize(fp.name) # file on disk
#[PL] To detect malformed documents with FAT loops, we compute the #[PL] To detect malformed documents with FAT loops, we compute the
# expected number of sectors in the stream: # expected number of sectors in the stream:
unknown_size = False unknown_size = False
@ -855,6 +850,12 @@ class OleFileIO:
# self.fp = open(filename, "rb") # self.fp = open(filename, "rb")
#else: #else:
# self.fp = filename # self.fp = filename
self.fp.seek(0, 2)
try:
filesize = self.fp.tell()
finally:
self.fp.seek(0)
self._filesize = filesize
# lists of streams in FAT and MiniFAT, to detect duplicate references # lists of streams in FAT and MiniFAT, to detect duplicate references
# (list of indexes of first sectors of each stream) # (list of indexes of first sectors of each stream)
@ -976,7 +977,6 @@ class OleFileIO:
# calculate the number of sectors in the file # calculate the number of sectors in the file
# (-1 because header doesn't count) # (-1 because header doesn't count)
filesize = os.path.getsize(filename)
self.nb_sect = ( (filesize + self.SectorSize-1) / self.SectorSize) - 1 self.nb_sect = ( (filesize + self.SectorSize-1) / self.SectorSize) - 1
debug( "Number of sectors in the file: %d" % self.nb_sect ) debug( "Number of sectors in the file: %d" % self.nb_sect )
@ -1258,7 +1258,7 @@ class OleFileIO:
self.fp.seek(self.sectorsize * (sect+1)) self.fp.seek(self.sectorsize * (sect+1))
except: except:
debug('getsect(): sect=%X, seek=%d, filesize=%d' % debug('getsect(): sect=%X, seek=%d, filesize=%d' %
(sect, self.sectorsize*(sect+1), os.path.getsize(self.fp.name))) (sect, self.sectorsize*(sect+1), self._filesize))
self._raise_defect(DEFECT_FATAL, 'OLE sector index out of range') self._raise_defect(DEFECT_FATAL, 'OLE sector index out of range')
sector = self.fp.read(self.sectorsize) sector = self.fp.read(self.sectorsize)
if len(sector) != self.sectorsize: if len(sector) != self.sectorsize:
@ -1360,11 +1360,12 @@ class OleFileIO:
self.ministream = self._open(self.root.isectStart, self.ministream = self._open(self.root.isectStart,
size_ministream, force_FAT=True) size_ministream, force_FAT=True)
return _OleStream(self.ministream, start, size, 0, return _OleStream(self.ministream, start, size, 0,
self.minisectorsize, self.minifat) self.minisectorsize, self.minifat,
self.ministream.size)
else: else:
# standard stream # standard stream
return _OleStream(self.fp, start, size, 512, return _OleStream(self.fp, start, size, 512,
self.sectorsize, self.fat) self.sectorsize, self.fat, self._filesize)
def _list(self, files, prefix, node): def _list(self, files, prefix, node):