import gflags
import httplib
import httplib2
-import logging
import os
import pprint
import sys
return ''
data = ''
- for locator, blocksize, segmentoffset, segmentsize in locators_and_ranges(self.segments, self._filepos, size):
- data += self._stream.readfrom(locator+segmentoffset, segmentsize)
+ available_chunks = locators_and_ranges(self.segments, self._filepos, size)
+ if available_chunks:
+ locator, blocksize, segmentoffset, segmentsize = available_chunks[0]
+ data = self._stream.readfrom(locator+segmentoffset, segmentsize)
+
self._filepos += len(data)
return data
self._data_locators = []
self._files = collections.OrderedDict()
- if keep != None:
- self._keep = keep
- else:
- self._keep = Keep.global_client_object()
+ if keep is None:
+ keep = KeepClient()
+ self._keep = keep
streamoffset = 0L