From e07c2f7bd8d7152a592b614c9ccbc6a2e48d5ae0 Mon Sep 17 00:00:00 2001 From: Kay Kurokawa Date: Mon, 2 Oct 2017 18:07:07 -0400 Subject: [PATCH] take read handle as argument instead of file path --- lbrynet/blob/blob_file.py | 3 ++- lbrynet/blob/reader.py | 7 +++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lbrynet/blob/blob_file.py b/lbrynet/blob/blob_file.py index 78cf974ad..0c4d2555c 100644 --- a/lbrynet/blob/blob_file.py +++ b/lbrynet/blob/blob_file.py @@ -78,7 +78,8 @@ class BlobFile(object): finished """ if self._verified is True: - reader = HashBlobReader(self.file_path, self.reader_finished) + f = open(self.file_path, 'rb') + reader = HashBlobReader(f, self.reader_finished) self.readers += 1 return reader return None diff --git a/lbrynet/blob/reader.py b/lbrynet/blob/reader.py index 4d1f51dff..745e62ef8 100644 --- a/lbrynet/blob/reader.py +++ b/lbrynet/blob/reader.py @@ -39,16 +39,15 @@ class HashBlobReader(object): This is a file like reader class that supports read(size) and close() """ - def __init__(self, file_path, finished_cb): - self.file_path = file_path + def __init__(self, read_handle, finished_cb): self.finished_cb = finished_cb self.finished_cb_d = None - self.read_handle = open(self.file_path, 'rb') + self.read_handle = read_handle def __del__(self): if self.finished_cb_d is None: log.warn("Garbage collection was called, but reader for %s was not closed yet", - self.file_path) + self.read_handle.name) self.close() def read(self, size=-1):