Make metadata cache reading slightly more robust

This commit is contained in:
Charles Haley 2013-10-02 10:49:30 +02:00
parent e161df6fff
commit 563be26322

View File

@ -729,8 +729,8 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
self.known_uuids = defaultdict(dict) self.known_uuids = defaultdict(dict)
self.known_metadata = {} self.known_metadata = {}
with open(cache_file_name, mode='rb') as fd: with open(cache_file_name, mode='rb') as fd:
while True:
try: try:
while True:
rec_len = fd.readline() rec_len = fd.readline()
if len(rec_len) != 8: if len(rec_len) != 8:
break break
@ -751,16 +751,6 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
traceback.print_exc() traceback.print_exc()
def _write_metadata_cache(self): def _write_metadata_cache(self):
# cache_file_name = os.path.join(cache_dir(),
# 'device_drivers_' + self.__class__.__name__ +
# '_metadata_cache.pickle')
# json_metadata = defaultdict(dict)
# for uuid,book in self.known_uuids.iteritems():
# json_metadata[uuid]['book'] = self.json_codec.encode_book_metadata(book['book'])
# json_metadata[uuid]['last_used'] = book['last_used']
# with open(cache_file_name, mode='wb') as fd:
# cPickle.dump(json_metadata, fd, -1)
cache_file_name = os.path.join(cache_dir(), cache_file_name = os.path.join(cache_dir(),
'device_drivers_' + self.__class__.__name__ + 'device_drivers_' + self.__class__.__name__ +
'_metadata_cache.json') '_metadata_cache.json')