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

set up a SQLiteStorage object in Session

Browse source
This commit is contained in:
Jack Robison 2018-02-12 13:40:30 -05:00
parent 2d462acefc
commit db7061ce92
No known key found for this signature in database
GPG key ID: DF25C68FE0239BB2
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
lbrynet/core/Session.py
View file

@ -2,6 +2,7 @@ import logging
import miniupnpc import miniupnpc
from lbrynet.core.BlobManager import DiskBlobManager from lbrynet.core.BlobManager import DiskBlobManager
from lbrynet.dht import node from lbrynet.dht import node
from lbrynet.database.storage import SQLiteStorage
from lbrynet.core.PeerManager import PeerManager from lbrynet.core.PeerManager import PeerManager
from lbrynet.core.RateLimiter import RateLimiter from lbrynet.core.RateLimiter import RateLimiter
from lbrynet.core.client.DHTPeerFinder import DHTPeerFinder from lbrynet.core.client.DHTPeerFinder import DHTPeerFinder
@ -10,7 +11,7 @@ from lbrynet.core.server.DHTHashAnnouncer import DHTHashAnnouncer
from lbrynet.core.utils import generate_id from lbrynet.core.utils import generate_id
from lbrynet.core.PaymentRateManager import BasePaymentRateManager, NegotiatedPaymentRateManager from lbrynet.core.PaymentRateManager import BasePaymentRateManager, NegotiatedPaymentRateManager
from lbrynet.core.BlobAvailability import BlobAvailabilityTracker from lbrynet.core.BlobAvailability import BlobAvailabilityTracker
from twisted.internet import threads, defer from twisted.internet import threads, defer, reactor
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
@ -43,7 +44,7 @@ class Session(object):
blob_manager=None, peer_port=None, use_upnp=True, blob_manager=None, peer_port=None, use_upnp=True,
rate_limiter=None, wallet=None, rate_limiter=None, wallet=None,
dht_node_class=node.Node, blob_tracker_class=None, dht_node_class=node.Node, blob_tracker_class=None,
payment_rate_manager_class=None, is_generous=True, external_ip=None): payment_rate_manager_class=None, is_generous=True, external_ip=None, storage=None):
"""@param blob_data_payment_rate: The default payment rate for blob data """@param blob_data_payment_rate: The default payment rate for blob data
@param db_dir: The directory in which levelDB files should be stored @param db_dir: The directory in which levelDB files should be stored
@ -136,6 +137,7 @@ class Session(object):
self.payment_rate_manager = None self.payment_rate_manager = None
self.payment_rate_manager_class = payment_rate_manager_class or NegotiatedPaymentRateManager self.payment_rate_manager_class = payment_rate_manager_class or NegotiatedPaymentRateManager
self.is_generous = is_generous self.is_generous = is_generous
self.storage = storage or SQLiteStorage(self.db_dir)
def setup(self): def setup(self):
"""Create the blob directory and database if necessary, start all desired services""" """Create the blob directory and database if necessary, start all desired services"""
@ -313,9 +315,9 @@ class Session(object):
raise Exception( raise Exception(
"TempBlobManager is no longer supported, specify BlobManager or db_dir") "TempBlobManager is no longer supported, specify BlobManager or db_dir")
else: else:
self.blob_manager = DiskBlobManager(self.hash_announcer, self.blob_manager = DiskBlobManager(
self.blob_dir, self.hash_announcer, self.blob_dir, self.storage
self.db_dir) )
if self.blob_tracker is None: if self.blob_tracker is None:
self.blob_tracker = self.blob_tracker_class(self.blob_manager, self.blob_tracker = self.blob_tracker_class(self.blob_manager,
@ -328,12 +330,10 @@ class Session(object):
self.is_generous) self.is_generous)
self.rate_limiter.start() self.rate_limiter.start()
d1 = self.blob_manager.setup() d = self.storage.setup()
d2 = self.wallet.start() d.addCallback(lambda _: self.wallet.start())
d.addCallback(lambda _: self.blob_tracker.start())
dl = defer.DeferredList([d1, d2], fireOnOneErrback=True, consumeErrors=True) return d
dl.addCallback(lambda _: self.blob_tracker.start())
return dl
def _unset_upnp(self): def _unset_upnp(self):
log.info("Unsetting upnp for session") log.info("Unsetting upnp for session")