LBRYCommunity/lbry-sdk
1
0
Fork 1
Code Issues Pull requests Projects Releases 282 Packages Wiki Activity

refactor: name private/public variables

Browse source
This commit is contained in:
Job Evers-Meltzer 2016-12-29 21:48:12 -06:00
parent cc008766ec
commit ccfb1f3921
2 changed files with 21 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
lbrynet/lbrynet_daemon/Daemon.py
View file

@ -798,10 +798,10 @@ class Daemon(AuthJSONRPCServer):
d = self._resolve_name(name) d = self._resolve_name(name)
else: else:
d = defer.succeed(stream_info) d = defer.succeed(stream_info)
d.addCallback(helper._setup_stream) d.addCallback(helper.setup_stream)
d.addCallback(helper.wait_or_get_stream) d.addCallback(helper.wait_or_get_stream)
if not stream_info: if not stream_info:
d.addCallback(helper._remove_from_wait) d.addCallback(helper.remove_from_wait)
return d return d
def add_stream(self, name, timeout, download_directory, file_name, stream_info): def add_stream(self, name, timeout, download_directory, file_name, stream_info):
@ -2342,7 +2342,7 @@ class _DownloadNameHelper(object):
self.file_name = file_name self.file_name = file_name
self.wait_for_write = wait_for_write self.wait_for_write = wait_for_write
def _setup_stream(self, stream_info): def setup_stream(self, stream_info):
stream_hash = get_sd_hash(stream_info) stream_hash = get_sd_hash(stream_info)
d = self.daemon._get_lbry_file_by_sd_hash(stream_hash) d = self.daemon._get_lbry_file_by_sd_hash(stream_hash)
d.addCallback(self._prepend_stream_info, stream_info) d.addCallback(self._prepend_stream_info, stream_info)
@ -2383,7 +2383,7 @@ class _DownloadNameHelper(object):
if stream: if stream:
return stream.downloader return stream.downloader
else: else:
self._remove_from_wait("Timed out") self.remove_from_wait("Timed out")
return defer.fail(Exception("Timed out")) return defer.fail(Exception("Timed out"))
d.addCallback(lambda _: _get_stream_for_return()) d.addCallback(lambda _: _get_stream_for_return())
@ -2391,27 +2391,24 @@ class _DownloadNameHelper(object):
def _wait_for_write(self): def _wait_for_write(self):
d = defer.succeed(None) d = defer.succeed(None)
if not self.has_downloader_wrote(): if not self._has_downloader_wrote():
d.addCallback(lambda _: reactor.callLater(1, self._wait_for_write)) d.addCallback(lambda _: reactor.callLater(1, self._wait_for_write))
return d return d
def has_downloader_wrote(self): def _has_downloader_wrote(self):
stream = self.daemon.streams.get(self.name, False) stream = self.daemon.streams.get(self.name, False)
if stream: if stream:
downloader = stream.downloader return self._get_written_bytes(stream.downloader.file_name)
else: else:
downloader = False
if not downloader:
return False return False
return self.get_written_bytes(downloader.file_name)
def _wait_on_lbry_file(self, f): def _wait_on_lbry_file(self, f):
written_bytes = self.get_written_bytes(f.file_name) written_bytes = self._get_written_bytes(f.file_name)
if written_bytes: if written_bytes:
return defer.succeed(self._disp_file(f)) return defer.succeed(self._disp_file(f))
return task.deferLater(reactor, 1, self._wait_on_lbry_file, f) return task.deferLater(reactor, 1, self._wait_on_lbry_file, f)
def get_written_bytes(self, file_name): def _get_written_bytes(self, file_name):
"""Returns the number of bytes written to `file_name`. """Returns the number of bytes written to `file_name`.
Returns False if there were issues reading `file_name`. Returns False if there were issues reading `file_name`.
@ -2434,10 +2431,10 @@ class _DownloadNameHelper(object):
log.info("Already downloaded: %s --> %s", f.sd_hash, file_path) log.info("Already downloaded: %s --> %s", f.sd_hash, file_path)
return f return f
def _remove_from_wait(self, r): def remove_from_wait(self, reason):
if self.name in self.daemon.waiting_on: if self.name in self.daemon.waiting_on:
del self.daemon.waiting_on[self.name] del self.daemon.waiting_on[self.name]
return r return reason
class _ResolveNameHelper(object): class _ResolveNameHelper(object):

20
lbrynet/lbrynet_daemon/Downloader.py
View file

@ -50,7 +50,7 @@ class GetStream(object):
self.max_key_fee = max_key_fee self.max_key_fee = max_key_fee
self.stream_info = None self.stream_info = None
self.stream_info_manager = None self.stream_info_manager = None
self.d = defer.Deferred(None) self._d = defer.Deferred(None)
self.timeout = timeout self.timeout = timeout
self.timeout_counter = 0 self.timeout_counter = 0
self.download_directory = download_directory self.download_directory = download_directory
@ -71,7 +71,7 @@ class GetStream(object):
elif self.timeout_counter >= self.timeout: elif self.timeout_counter >= self.timeout:
log.info("Timeout downloading lbry://%s" % self.resolved_name) log.info("Timeout downloading lbry://%s" % self.resolved_name)
self.checker.stop() self.checker.stop()
self.d.cancel() self._d.cancel()
self.code = STREAM_STAGES[4] self.code = STREAM_STAGES[4]
self.finished.callback((False, None, None)) self.finished.callback((False, None, None))
@ -128,15 +128,15 @@ class GetStream(object):
self.checker.start(1) self.checker.start(1)
self.d.addCallback(lambda _: _set_status(None, DOWNLOAD_METADATA_CODE)) self._d.addCallback(lambda _: _set_status(None, DOWNLOAD_METADATA_CODE))
self.d.addCallback(lambda _: download_sd_blob( self._d.addCallback(lambda _: download_sd_blob(
self.session, self.stream_hash, self.payment_rate_manager)) self.session, self.stream_hash, self.payment_rate_manager))
self.d.addCallback(self.sd_identifier.get_metadata_for_sd_blob) self._d.addCallback(self.sd_identifier.get_metadata_for_sd_blob)
self.d.addCallback(lambda r: _set_status(r, DOWNLOAD_RUNNING_CODE)) self._d.addCallback(lambda r: _set_status(r, DOWNLOAD_RUNNING_CODE))
self.d.addCallback(get_downloader_factory) self._d.addCallback(get_downloader_factory)
self.d.addCallback(make_downloader) self._d.addCallback(make_downloader)
self.d.addCallbacks(self._start_download, _cause_timeout) self._d.addCallbacks(self._start_download, _cause_timeout)
self.d.callback(None) self._d.callback(None)
return self.finished return self.finished