From 905274d6d4137507d49a0986bf466e456a8d5b0c Mon Sep 17 00:00:00 2001 From: Jack Date: Tue, 12 Jan 2016 13:40:51 -0500 Subject: [PATCH] Use same downloader for daemon as is used for console Use lbrynet.lbryfilemanager.LBRYFileDownloader.ManagedLBRYFileDownloaderFact ory instead of lbrynet.lbryfile.client.LBRYFileDownloader.LBRYFileSaverFactory --- lbrynet/lbrynet_daemon/LBRYDaemon.py | 2 +- lbrynet/lbrynet_daemon/LBRYDownloader.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lbrynet/lbrynet_daemon/LBRYDaemon.py b/lbrynet/lbrynet_daemon/LBRYDaemon.py index 1679be8d2..92a0e51d8 100644 --- a/lbrynet/lbrynet_daemon/LBRYDaemon.py +++ b/lbrynet/lbrynet_daemon/LBRYDaemon.py @@ -412,7 +412,7 @@ class LBRYDaemon(xmlrpc.XMLRPC): self.cur.execute("insert into history values (?, ?, ?)", vals) self.db.commit() else: - print 'Already downloaded', path['stream_hash'], '->', path['path'] + print 'Already downloaded', path['stream_hash'], '-->', path['path'] return path diff --git a/lbrynet/lbrynet_daemon/LBRYDownloader.py b/lbrynet/lbrynet_daemon/LBRYDownloader.py index 2ca70506c..15c5eafde 100644 --- a/lbrynet/lbrynet_daemon/LBRYDownloader.py +++ b/lbrynet/lbrynet_daemon/LBRYDownloader.py @@ -117,7 +117,7 @@ class GetStream(object): def _handle_metadata(self, metadata): self.metadata = metadata - self.factory = self.metadata.factories[0] + self.factory = self.metadata.factories[1] return defer.succeed(None) def _handle_download_error(self, err): @@ -134,9 +134,9 @@ class GetStream(object): self.downloader.file_name) return self.downloader - self.downloader = self.factory.make_downloader(self.metadata, [self.data_rate, True], self.payment_rate_manager) - self.downloader.addCallback(_set_downloader) - return defer.succeed(self.downloader) + downloader = self.factory.make_downloader(self.metadata, [self.data_rate, True], self.payment_rate_manager) + downloader.addCallback(_set_downloader) + return downloader class FetcherDaemon(object):