Remove LBRY prefix from class and module names
This is the result of running: grep -RlI LBRY . | xargs sed -i 's/LBRY\([A-Z]\)/\1/g'
This commit is contained in:
parent
550fd185a3
commit
7dbeb1f2cf
28 changed files with 96 additions and 96 deletions
|
@ -7,12 +7,12 @@ from Crypto.Hash import SHA512
|
||||||
from Crypto.PublicKey import RSA
|
from Crypto.PublicKey import RSA
|
||||||
from lbrynet.core.client.ClientRequest import ClientRequest
|
from lbrynet.core.client.ClientRequest import ClientRequest
|
||||||
from lbrynet.core.Error import RequestCanceledError
|
from lbrynet.core.Error import RequestCanceledError
|
||||||
from lbrynet.interfaces import IRequestCreator, IQueryHandlerFactory, IQueryHandler, ILBRYWallet
|
from lbrynet.interfaces import IRequestCreator, IQueryHandlerFactory, IQueryHandler, IWallet
|
||||||
from lbrynet.pointtraderclient import pointtraderclient
|
from lbrynet.pointtraderclient import pointtraderclient
|
||||||
from twisted.internet import defer, threads
|
from twisted.internet import defer, threads
|
||||||
from zope.interface import implements
|
from zope.interface import implements
|
||||||
from twisted.python.failure import Failure
|
from twisted.python.failure import Failure
|
||||||
from lbrynet.core.LBRYWallet import ReservedPoints
|
from lbrynet.core.Wallet import ReservedPoints
|
||||||
|
|
||||||
|
|
||||||
log = logging.getLogger(__name__)
|
log = logging.getLogger(__name__)
|
||||||
|
@ -21,7 +21,7 @@ log = logging.getLogger(__name__)
|
||||||
class PTCWallet(object):
|
class PTCWallet(object):
|
||||||
"""This class sends payments to peers and also ensures that expected payments are received.
|
"""This class sends payments to peers and also ensures that expected payments are received.
|
||||||
This class is only intended to be used for testing."""
|
This class is only intended to be used for testing."""
|
||||||
implements(ILBRYWallet)
|
implements(IWallet)
|
||||||
|
|
||||||
def __init__(self, db_dir):
|
def __init__(self, db_dir):
|
||||||
self.db_dir = db_dir
|
self.db_dir = db_dir
|
||||||
|
|
|
@ -16,7 +16,7 @@ from twisted.internet import threads, defer
|
||||||
log = logging.getLogger(__name__)
|
log = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
class LBRYSession(object):
|
class Session(object):
|
||||||
"""This class manages all important services common to any application that uses the network:
|
"""This class manages all important services common to any application that uses the network:
|
||||||
the hash announcer, which informs other peers that this peer is associated with some hash. Usually,
|
the hash announcer, which informs other peers that this peer is associated with some hash. Usually,
|
||||||
this means this peer has a blob identified by the hash in question, but it can be used for other
|
this means this peer has a blob identified by the hash in question, but it can be used for other
|
||||||
|
|
|
@ -21,11 +21,11 @@ from lbryum.wallet import WalletStorage, Wallet
|
||||||
from lbryum.commands import known_commands, Commands
|
from lbryum.commands import known_commands, Commands
|
||||||
from lbryum.transaction import Transaction
|
from lbryum.transaction import Transaction
|
||||||
|
|
||||||
from lbrynet.interfaces import IRequestCreator, IQueryHandlerFactory, IQueryHandler, ILBRYWallet
|
from lbrynet.interfaces import IRequestCreator, IQueryHandlerFactory, IQueryHandler, IWallet
|
||||||
from lbrynet.core.client.ClientRequest import ClientRequest
|
from lbrynet.core.client.ClientRequest import ClientRequest
|
||||||
from lbrynet.core.Error import UnknownNameError, InvalidStreamInfoError, RequestCanceledError
|
from lbrynet.core.Error import UnknownNameError, InvalidStreamInfoError, RequestCanceledError
|
||||||
from lbrynet.core.Error import InsufficientFundsError
|
from lbrynet.core.Error import InsufficientFundsError
|
||||||
from lbrynet.metadata.LBRYMetadata import Metadata
|
from lbrynet.metadata.Metadata import Metadata
|
||||||
|
|
||||||
log = logging.getLogger(__name__)
|
log = logging.getLogger(__name__)
|
||||||
alert = logging.getLogger("lbryalert." + __name__)
|
alert = logging.getLogger("lbryalert." + __name__)
|
||||||
|
@ -47,9 +47,9 @@ def _catch_connection_error(f):
|
||||||
return w
|
return w
|
||||||
|
|
||||||
|
|
||||||
class LBRYWallet(object):
|
class Wallet(object):
|
||||||
"""This class implements the LBRYWallet interface for the LBRYcrd payment system"""
|
"""This class implements the Wallet interface for the LBRYcrd payment system"""
|
||||||
implements(ILBRYWallet)
|
implements(IWallet)
|
||||||
|
|
||||||
_FIRST_RUN_UNKNOWN = 0
|
_FIRST_RUN_UNKNOWN = 0
|
||||||
_FIRST_RUN_YES = 1
|
_FIRST_RUN_YES = 1
|
||||||
|
@ -762,9 +762,9 @@ class LBRYWallet(object):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
class LBRYcrdWallet(LBRYWallet):
|
class LBRYcrdWallet(Wallet):
|
||||||
def __init__(self, db_dir, wallet_dir=None, wallet_conf=None, lbrycrdd_path=None):
|
def __init__(self, db_dir, wallet_dir=None, wallet_conf=None, lbrycrdd_path=None):
|
||||||
LBRYWallet.__init__(self, db_dir)
|
Wallet.__init__(self, db_dir)
|
||||||
self.started_lbrycrdd = False
|
self.started_lbrycrdd = False
|
||||||
self.wallet_dir = wallet_dir
|
self.wallet_dir = wallet_dir
|
||||||
self.wallet_conf = wallet_conf
|
self.wallet_conf = wallet_conf
|
||||||
|
@ -1108,10 +1108,10 @@ class LBRYcrdWallet(LBRYWallet):
|
||||||
self.lbrycrdd.wait()
|
self.lbrycrdd.wait()
|
||||||
|
|
||||||
|
|
||||||
class LBRYumWallet(LBRYWallet):
|
class LBRYumWallet(Wallet):
|
||||||
|
|
||||||
def __init__(self, db_dir):
|
def __init__(self, db_dir):
|
||||||
LBRYWallet.__init__(self, db_dir)
|
Wallet.__init__(self, db_dir)
|
||||||
self.config = None
|
self.config = None
|
||||||
self.network = None
|
self.network = None
|
||||||
self.wallet = None
|
self.wallet = None
|
||||||
|
|
|
@ -82,7 +82,7 @@ def disable_noisy_loggers():
|
||||||
logging.getLogger('lbrynet.core.server').setLevel(logging.INFO)
|
logging.getLogger('lbrynet.core.server').setLevel(logging.INFO)
|
||||||
logging.getLogger('lbrynet.dht').setLevel(logging.INFO)
|
logging.getLogger('lbrynet.dht').setLevel(logging.INFO)
|
||||||
logging.getLogger('lbrynet.lbrynet_daemon').setLevel(logging.INFO)
|
logging.getLogger('lbrynet.lbrynet_daemon').setLevel(logging.INFO)
|
||||||
logging.getLogger('lbrynet.core.LBRYWallet').setLevel(logging.INFO)
|
logging.getLogger('lbrynet.core.Wallet').setLevel(logging.INFO)
|
||||||
logging.getLogger('lbrynet.lbryfile').setLevel(logging.INFO)
|
logging.getLogger('lbrynet.lbryfile').setLevel(logging.INFO)
|
||||||
logging.getLogger('lbrynet.lbryfilemanager').setLevel(logging.INFO)
|
logging.getLogger('lbrynet.lbryfilemanager').setLevel(logging.INFO)
|
||||||
|
|
||||||
|
|
|
@ -50,7 +50,7 @@ class CryptStreamDownloader(object):
|
||||||
|
|
||||||
@param payment_rate_manager: A PaymentRateManager object
|
@param payment_rate_manager: A PaymentRateManager object
|
||||||
|
|
||||||
@param wallet: An object which implements the ILBRYWallet interface
|
@param wallet: An object which implements the IWallet interface
|
||||||
|
|
||||||
@return:
|
@return:
|
||||||
"""
|
"""
|
||||||
|
|
|
@ -233,14 +233,14 @@
|
||||||
# " foreign key(stream_hash) references lbry_files(stream_hash)" +
|
# " foreign key(stream_hash) references lbry_files(stream_hash)" +
|
||||||
# ")")
|
# ")")
|
||||||
# new_db.commit()
|
# new_db.commit()
|
||||||
# LBRYFILE_STATUS = "t"
|
# FILE_STATUS = "t"
|
||||||
# LBRYFILE_OPTIONS = "o"
|
# FILE_OPTIONS = "o"
|
||||||
# c = new_db.cursor()
|
# c = new_db.cursor()
|
||||||
# for k, v in old_db.RangeIter():
|
# for k, v in old_db.RangeIter():
|
||||||
# key_type, stream_hash = json.loads(k)
|
# key_type, stream_hash = json.loads(k)
|
||||||
# if key_type == LBRYFILE_STATUS:
|
# if key_type == FILE_STATUS:
|
||||||
# try:
|
# try:
|
||||||
# rate = json.loads(old_db.Get(json.dumps((LBRYFILE_OPTIONS, stream_hash))))[0]
|
# rate = json.loads(old_db.Get(json.dumps((FILE_OPTIONS, stream_hash))))[0]
|
||||||
# except KeyError:
|
# except KeyError:
|
||||||
# rate = None
|
# rate = None
|
||||||
# c.execute("insert into lbry_file_options values (?, ?, ?)",
|
# c.execute("insert into lbry_file_options values (?, ?, ?)",
|
||||||
|
|
|
@ -548,13 +548,13 @@ class IStreamDescriptorValidator(Interface):
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
|
||||||
class ILBRYWallet(Interface):
|
class IWallet(Interface):
|
||||||
"""
|
"""
|
||||||
Send and receive payments.
|
Send and receive payments.
|
||||||
|
|
||||||
To send a payment, a payment reservation must be obtained first. This guarantees that a payment
|
To send a payment, a payment reservation must be obtained first. This guarantees that a payment
|
||||||
isn't promised if it can't be paid. When the service in question is rendered, the payment
|
isn't promised if it can't be paid. When the service in question is rendered, the payment
|
||||||
reservation must be given to the ILBRYWallet along with the final price. The reservation can also
|
reservation must be given to the IWallet along with the final price. The reservation can also
|
||||||
be canceled.
|
be canceled.
|
||||||
"""
|
"""
|
||||||
def stop(self):
|
def stop(self):
|
||||||
|
|
|
@ -93,8 +93,8 @@ def create_lbry_file(session, lbry_file_manager, file_name, file_handle, key=Non
|
||||||
into chunks and encrypted, and then a stream descriptor file with the stream parameters
|
into chunks and encrypted, and then a stream descriptor file with the stream parameters
|
||||||
and other metadata is written to disk.
|
and other metadata is written to disk.
|
||||||
|
|
||||||
@param session: An LBRYSession object.
|
@param session: An Session object.
|
||||||
@type session: LBRYSession
|
@type session: Session
|
||||||
|
|
||||||
@param lbry_file_manager: The EncryptedFileManager object this LBRY File will be added to.
|
@param lbry_file_manager: The EncryptedFileManager object this LBRY File will be added to.
|
||||||
@type lbry_file_manager: EncryptedFileManager
|
@type lbry_file_manager: EncryptedFileManager
|
||||||
|
|
|
@ -5,7 +5,7 @@ import logging
|
||||||
import sys
|
import sys
|
||||||
from lbrynet.lbrylive.LiveStreamCreator import StdOutLiveStreamCreator
|
from lbrynet.lbrylive.LiveStreamCreator import StdOutLiveStreamCreator
|
||||||
from lbrynet.core.BlobManager import TempBlobManager
|
from lbrynet.core.BlobManager import TempBlobManager
|
||||||
from lbrynet.core.Session import LBRYSession
|
from lbrynet.core.Session import Session
|
||||||
from lbrynet.core.server.BlobAvailabilityHandler import BlobAvailabilityHandlerFactory
|
from lbrynet.core.server.BlobAvailabilityHandler import BlobAvailabilityHandlerFactory
|
||||||
from lbrynet.core.server.BlobRequestHandler import BlobRequestHandlerFactory
|
from lbrynet.core.server.BlobRequestHandler import BlobRequestHandlerFactory
|
||||||
from lbrynet.core.server.ServerProtocol import ServerProtocolFactory
|
from lbrynet.core.server.ServerProtocol import ServerProtocolFactory
|
||||||
|
@ -16,7 +16,7 @@ from lbrynet.dht.node import Node
|
||||||
from twisted.internet import defer, task
|
from twisted.internet import defer, task
|
||||||
|
|
||||||
|
|
||||||
class LBRYStdinUploader():
|
class StdinUploader():
|
||||||
"""This class reads from standard in, creates a stream, and makes it available on the network."""
|
"""This class reads from standard in, creates a stream, and makes it available on the network."""
|
||||||
def __init__(self, peer_port, dht_node_port, known_dht_nodes,
|
def __init__(self, peer_port, dht_node_port, known_dht_nodes,
|
||||||
stream_info_manager_class=DBLiveStreamMetadataManager, blob_manager_class=TempBlobManager):
|
stream_info_manager_class=DBLiveStreamMetadataManager, blob_manager_class=TempBlobManager):
|
||||||
|
@ -29,7 +29,7 @@ class LBRYStdinUploader():
|
||||||
"""
|
"""
|
||||||
self.peer_port = peer_port
|
self.peer_port = peer_port
|
||||||
self.lbry_server_port = None
|
self.lbry_server_port = None
|
||||||
self.session = LBRYSession(blob_manager_class=blob_manager_class,
|
self.session = Session(blob_manager_class=blob_manager_class,
|
||||||
stream_info_manager_class=stream_info_manager_class,
|
stream_info_manager_class=stream_info_manager_class,
|
||||||
dht_node_class=Node, dht_node_port=dht_node_port,
|
dht_node_class=Node, dht_node_port=dht_node_port,
|
||||||
known_dht_nodes=known_dht_nodes, peer_port=self.peer_port,
|
known_dht_nodes=known_dht_nodes, peer_port=self.peer_port,
|
||||||
|
@ -99,9 +99,9 @@ def launch_stdin_uploader():
|
||||||
|
|
||||||
logging.basicConfig(level=logging.WARNING, filename="ul.log")
|
logging.basicConfig(level=logging.WARNING, filename="ul.log")
|
||||||
if len(sys.argv) == 4:
|
if len(sys.argv) == 4:
|
||||||
uploader = LBRYStdinUploader(int(sys.argv[2]), int(sys.argv[3]), [])
|
uploader = StdinUploader(int(sys.argv[2]), int(sys.argv[3]), [])
|
||||||
elif len(sys.argv) == 6:
|
elif len(sys.argv) == 6:
|
||||||
uploader = LBRYStdinUploader(int(sys.argv[2]), int(sys.argv[3]), [(sys.argv[4], int(sys.argv[5]))])
|
uploader = StdinUploader(int(sys.argv[2]), int(sys.argv[3]), [(sys.argv[4], int(sys.argv[5]))])
|
||||||
else:
|
else:
|
||||||
print "Usage: lbrynet-stdin-uploader <stream_name> <peer_port> <dht_node_port>" \
|
print "Usage: lbrynet-stdin-uploader <stream_name> <peer_port> <dht_node_port>" \
|
||||||
" [<dht_bootstrap_host> <dht_bootstrap port>]"
|
" [<dht_bootstrap_host> <dht_bootstrap port>]"
|
||||||
|
|
|
@ -4,9 +4,9 @@
|
||||||
import logging
|
import logging
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
from lbrynet.lbrylive.client.LiveStreamDownloader import LBRYLiveStreamDownloader
|
from lbrynet.lbrylive.client.LiveStreamDownloader import LiveStreamDownloader
|
||||||
from lbrynet.core.BlobManager import TempBlobManager
|
from lbrynet.core.BlobManager import TempBlobManager
|
||||||
from lbrynet.core.Session import LBRYSession
|
from lbrynet.core.Session import Session
|
||||||
from lbrynet.core.client.StandaloneBlobDownloader import StandaloneBlobDownloader
|
from lbrynet.core.client.StandaloneBlobDownloader import StandaloneBlobDownloader
|
||||||
from lbrynet.core.StreamDescriptor import BlobStreamDescriptorReader
|
from lbrynet.core.StreamDescriptor import BlobStreamDescriptorReader
|
||||||
from lbrynet.lbrylive.PaymentRateManager import BaseLiveStreamPaymentRateManager
|
from lbrynet.lbrylive.PaymentRateManager import BaseLiveStreamPaymentRateManager
|
||||||
|
@ -16,7 +16,7 @@ from lbrynet.dht.node import Node
|
||||||
from twisted.internet import task
|
from twisted.internet import task
|
||||||
|
|
||||||
|
|
||||||
class LBRYStdoutDownloader():
|
class StdoutDownloader():
|
||||||
"""This class downloads a live stream from the network and outputs it to standard out."""
|
"""This class downloads a live stream from the network and outputs it to standard out."""
|
||||||
def __init__(self, dht_node_port, known_dht_nodes,
|
def __init__(self, dht_node_port, known_dht_nodes,
|
||||||
stream_info_manager_class=DBLiveStreamMetadataManager, blob_manager_class=TempBlobManager):
|
stream_info_manager_class=DBLiveStreamMetadataManager, blob_manager_class=TempBlobManager):
|
||||||
|
@ -27,7 +27,7 @@ class LBRYStdoutDownloader():
|
||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
self.session = LBRYSession(blob_manager_class=blob_manager_class,
|
self.session = Session(blob_manager_class=blob_manager_class,
|
||||||
stream_info_manager_class=stream_info_manager_class,
|
stream_info_manager_class=stream_info_manager_class,
|
||||||
dht_node_class=Node, dht_node_port=dht_node_port, known_dht_nodes=known_dht_nodes,
|
dht_node_class=Node, dht_node_port=dht_node_port, known_dht_nodes=known_dht_nodes,
|
||||||
use_upnp=False)
|
use_upnp=False)
|
||||||
|
@ -55,7 +55,7 @@ class LBRYStdoutDownloader():
|
||||||
d.addCallbacks(self.read_sd_file)
|
d.addCallbacks(self.read_sd_file)
|
||||||
|
|
||||||
def start_stream(stream_hash):
|
def start_stream(stream_hash):
|
||||||
consumer = LBRYLiveStreamDownloader(stream_hash, self.session.peer_finder,
|
consumer = LiveStreamDownloader(stream_hash, self.session.peer_finder,
|
||||||
self.session.rate_limiter, self.session.blob_manager,
|
self.session.rate_limiter, self.session.blob_manager,
|
||||||
self.stream_info_manager, self.payment_rate_manager,
|
self.stream_info_manager, self.payment_rate_manager,
|
||||||
self.session.wallet)
|
self.session.wallet)
|
||||||
|
@ -76,9 +76,9 @@ def launch_stdout_downloader():
|
||||||
|
|
||||||
logging.basicConfig(level=logging.WARNING, filename="dl.log")
|
logging.basicConfig(level=logging.WARNING, filename="dl.log")
|
||||||
if len(sys.argv) == 3:
|
if len(sys.argv) == 3:
|
||||||
downloader = LBRYStdoutDownloader(int(sys.argv[2]), [])
|
downloader = StdoutDownloader(int(sys.argv[2]), [])
|
||||||
elif len(sys.argv) == 5:
|
elif len(sys.argv) == 5:
|
||||||
downloader = LBRYStdoutDownloader(int(sys.argv[2]), [(sys.argv[3], int(sys.argv[4]))])
|
downloader = StdoutDownloader(int(sys.argv[2]), [(sys.argv[3], int(sys.argv[4]))])
|
||||||
else:
|
else:
|
||||||
print "Usage: lbrynet-stdout-downloader <sd_hash> <peer_port> <dht_node_port>" \
|
print "Usage: lbrynet-stdout-downloader <sd_hash> <peer_port> <dht_node_port>" \
|
||||||
" [<dht_bootstrap_host> <dht_bootstrap port>]"
|
" [<dht_bootstrap_host> <dht_bootstrap port>]"
|
||||||
|
|
|
@ -84,7 +84,7 @@ def get_sd_info(stream_info_manager, stream_hash, include_blobs):
|
||||||
return d
|
return d
|
||||||
|
|
||||||
|
|
||||||
class LBRYLiveStreamDescriptorValidator(object):
|
class LiveStreamDescriptorValidator(object):
|
||||||
implements(IStreamDescriptorValidator)
|
implements(IStreamDescriptorValidator)
|
||||||
|
|
||||||
def __init__(self, raw_info):
|
def __init__(self, raw_info):
|
||||||
|
|
|
@ -39,7 +39,7 @@ class LiveStreamDownloader(CryptStreamDownloader):
|
||||||
return defer.succeed(True)
|
return defer.succeed(True)
|
||||||
|
|
||||||
|
|
||||||
class LBRYLiveStreamDownloader(LiveStreamDownloader):
|
class LiveStreamDownloader(LiveStreamDownloader):
|
||||||
def __init__(self, stream_hash, peer_finder, rate_limiter, blob_manager, stream_info_manager,
|
def __init__(self, stream_hash, peer_finder, rate_limiter, blob_manager, stream_info_manager,
|
||||||
payment_rate_manager, wallet, upload_allowed):
|
payment_rate_manager, wallet, upload_allowed):
|
||||||
LiveStreamDownloader.__init__(self, stream_hash, peer_finder, rate_limiter, blob_manager,
|
LiveStreamDownloader.__init__(self, stream_hash, peer_finder, rate_limiter, blob_manager,
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
from lbrynet.lbrylive.StreamDescriptor import LiveStreamType, LBRYLiveStreamDescriptorValidator
|
from lbrynet.lbrylive.StreamDescriptor import LiveStreamType, LiveStreamDescriptorValidator
|
||||||
from lbrynet.core.DownloadOption import DownloadOption, DownloadOptionChoice
|
from lbrynet.core.DownloadOption import DownloadOption, DownloadOptionChoice
|
||||||
|
|
||||||
|
|
||||||
def add_live_stream_to_sd_identifier(sd_identifier, base_live_stream_payment_rate_manager):
|
def add_live_stream_to_sd_identifier(sd_identifier, base_live_stream_payment_rate_manager):
|
||||||
sd_identifier.add_stream_type(LiveStreamType, LBRYLiveStreamDescriptorValidator,
|
sd_identifier.add_stream_type(LiveStreamType, LiveStreamDescriptorValidator,
|
||||||
LiveStreamOptions(base_live_stream_payment_rate_manager))
|
LiveStreamOptions(base_live_stream_payment_rate_manager))
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -12,9 +12,9 @@ from yapsy.PluginManager import PluginManager
|
||||||
from twisted.internet import defer, threads, stdio, task, error
|
from twisted.internet import defer, threads, stdio, task, error
|
||||||
from jsonrpc.proxy import JSONRPCProxy
|
from jsonrpc.proxy import JSONRPCProxy
|
||||||
|
|
||||||
from lbrynet.core.Session import LBRYSession
|
from lbrynet.core.Session import Session
|
||||||
from lbrynet.lbrynet_console.ConsoleControl import ConsoleControl
|
from lbrynet.lbrynet_console.ConsoleControl import ConsoleControl
|
||||||
from lbrynet.lbrynet_console.LBRYSettings import LBRYSettings
|
from lbrynet.lbrynet_console.Settings import Settings
|
||||||
from lbrynet.lbryfilemanager.EncryptedFileManager import EncryptedFileManager
|
from lbrynet.lbryfilemanager.EncryptedFileManager import EncryptedFileManager
|
||||||
from lbrynet.conf import MIN_BLOB_DATA_PAYMENT_RATE, API_CONNECTION_STRING # , MIN_BLOB_INFO_PAYMENT_RATE
|
from lbrynet.conf import MIN_BLOB_DATA_PAYMENT_RATE, API_CONNECTION_STRING # , MIN_BLOB_INFO_PAYMENT_RATE
|
||||||
from lbrynet.core.utils import generate_id
|
from lbrynet.core.utils import generate_id
|
||||||
|
@ -43,14 +43,14 @@ from lbrynet.lbrynet_console.ControlHandlers import ShowServerStatusFactory, Mod
|
||||||
from lbrynet.lbrynet_console.ControlHandlers import ModifyEncryptedFileOptionsChooserFactory, StatusFactory
|
from lbrynet.lbrynet_console.ControlHandlers import ModifyEncryptedFileOptionsChooserFactory, StatusFactory
|
||||||
from lbrynet.lbrynet_console.ControlHandlers import PeerStatsAndSettingsChooserFactory, PublishFactory
|
from lbrynet.lbrynet_console.ControlHandlers import PeerStatsAndSettingsChooserFactory, PublishFactory
|
||||||
from lbrynet.lbrynet_console.ControlHandlers import BlockchainStatusFactory
|
from lbrynet.lbrynet_console.ControlHandlers import BlockchainStatusFactory
|
||||||
from lbrynet.core.LBRYWallet import LBRYcrdWallet, LBRYumWallet
|
from lbrynet.core.Wallet import LBRYcrdWallet, LBRYumWallet
|
||||||
|
|
||||||
|
|
||||||
log = logging.getLogger(__name__)
|
log = logging.getLogger(__name__)
|
||||||
alert = logging.getLogger("lbryalert." + __name__)
|
alert = logging.getLogger("lbryalert." + __name__)
|
||||||
|
|
||||||
|
|
||||||
class LBRYConsole():
|
class Console():
|
||||||
"""A class which can upload and download file streams to and from the network"""
|
"""A class which can upload and download file streams to and from the network"""
|
||||||
def __init__(self, peer_port, dht_node_port, known_dht_nodes, fake_wallet,
|
def __init__(self, peer_port, dht_node_port, known_dht_nodes, fake_wallet,
|
||||||
lbrycrd_conf, lbrycrd_dir, use_upnp, data_dir, created_data_dir,
|
lbrycrd_conf, lbrycrd_dir, use_upnp, data_dir, created_data_dir,
|
||||||
|
@ -93,7 +93,7 @@ class LBRYConsole():
|
||||||
self.command_handlers = []
|
self.command_handlers = []
|
||||||
self.query_handlers = {}
|
self.query_handlers = {}
|
||||||
|
|
||||||
self.settings = LBRYSettings(self.db_dir)
|
self.settings = Settings(self.db_dir)
|
||||||
self.blob_request_payment_rate_manager = None
|
self.blob_request_payment_rate_manager = None
|
||||||
self.lbryid = None
|
self.lbryid = None
|
||||||
self.sd_identifier = StreamDescriptorIdentifier()
|
self.sd_identifier = StreamDescriptorIdentifier()
|
||||||
|
@ -239,7 +239,7 @@ class LBRYConsole():
|
||||||
|
|
||||||
alert.info("Databases loaded.")
|
alert.info("Databases loaded.")
|
||||||
|
|
||||||
self.session = LBRYSession(results['default_data_payment_rate'], db_dir=self.db_dir, lbryid=self.lbryid,
|
self.session = Session(results['default_data_payment_rate'], db_dir=self.db_dir, lbryid=self.lbryid,
|
||||||
blob_dir=self.blobfile_dir, dht_node_port=self.dht_node_port,
|
blob_dir=self.blobfile_dir, dht_node_port=self.dht_node_port,
|
||||||
known_dht_nodes=self.known_dht_nodes, peer_port=self.peer_port,
|
known_dht_nodes=self.known_dht_nodes, peer_port=self.peer_port,
|
||||||
use_upnp=self.use_upnp, wallet=results['wallet'])
|
use_upnp=self.use_upnp, wallet=results['wallet'])
|
||||||
|
@ -565,7 +565,7 @@ def launch_lbry_console():
|
||||||
logger.addHandler(file_handler)
|
logger.addHandler(file_handler)
|
||||||
|
|
||||||
|
|
||||||
console = LBRYConsole(peer_port, dht_node_port, bootstrap_nodes, fake_wallet=args.fake_wallet,
|
console = Console(peer_port, dht_node_port, bootstrap_nodes, fake_wallet=args.fake_wallet,
|
||||||
lbrycrd_conf=args.lbrycrd_wallet_conf, lbrycrd_dir=args.lbrycrd_wallet_dir,
|
lbrycrd_conf=args.lbrycrd_wallet_conf, lbrycrd_dir=args.lbrycrd_wallet_dir,
|
||||||
use_upnp=not args.disable_upnp, data_dir=data_dir,
|
use_upnp=not args.disable_upnp, data_dir=data_dir,
|
||||||
created_data_dir=created_data_dir, lbrycrdd_path=args.lbrycrdd_path)
|
created_data_dir=created_data_dir, lbrycrdd_path=args.lbrycrdd_path)
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
from yapsy.IPlugin import IPlugin
|
from yapsy.IPlugin import IPlugin
|
||||||
|
|
||||||
|
|
||||||
class LBRYPlugin(IPlugin):
|
class Plugin(IPlugin):
|
||||||
|
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
IPlugin.__init__(self)
|
IPlugin.__init__(self)
|
||||||
|
|
|
@ -18,7 +18,7 @@ def run_in_thread(fn):
|
||||||
return wrapped
|
return wrapped
|
||||||
|
|
||||||
|
|
||||||
class LBRYSettings(object):
|
class Settings(object):
|
||||||
NAME = "settings.db"
|
NAME = "settings.db"
|
||||||
def __init__(self, db_dir):
|
def __init__(self, db_dir):
|
||||||
self.db_dir = db_dir
|
self.db_dir = db_dir
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
from lbrynet.lbrynet_console import LBRYPlugin
|
from lbrynet.lbrynet_console import Plugin
|
||||||
from twisted.internet import defer
|
from twisted.internet import defer
|
||||||
from lbrynet.conf import MIN_VALUABLE_BLOB_HASH_PAYMENT_RATE, MIN_VALUABLE_BLOB_INFO_PAYMENT_RATE
|
from lbrynet.conf import MIN_VALUABLE_BLOB_HASH_PAYMENT_RATE, MIN_VALUABLE_BLOB_INFO_PAYMENT_RATE
|
||||||
from BlindRepeater import BlindRepeater
|
from BlindRepeater import BlindRepeater
|
||||||
|
@ -13,10 +13,10 @@ from ValuableBlobQueryHandler import ValuableBlobHashQueryHandlerFactory
|
||||||
from PaymentRateManager import BlindRepeaterPaymentRateManager
|
from PaymentRateManager import BlindRepeaterPaymentRateManager
|
||||||
|
|
||||||
|
|
||||||
class BlindRepeaterPlugin(LBRYPlugin.LBRYPlugin):
|
class BlindRepeaterPlugin(Plugin.Plugin):
|
||||||
|
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
LBRYPlugin.LBRYPlugin.__init__(self)
|
Plugin.Plugin.__init__(self)
|
||||||
self.enabled = False
|
self.enabled = False
|
||||||
self.blind_info_manager = None
|
self.blind_info_manager = None
|
||||||
self.valuable_blob_length_query_handler = None
|
self.valuable_blob_length_query_handler = None
|
||||||
|
|
|
@ -25,7 +25,7 @@ from txjsonrpc.web import jsonrpc
|
||||||
from txjsonrpc.web.jsonrpc import Handler
|
from txjsonrpc.web.jsonrpc import Handler
|
||||||
|
|
||||||
from lbrynet import __version__ as lbrynet_version
|
from lbrynet import __version__ as lbrynet_version
|
||||||
from lbryum.version import LBRYUM_VERSION as lbryum_version
|
from lbryum.version import UM_VERSION as lbryum_version
|
||||||
from lbrynet import analytics
|
from lbrynet import analytics
|
||||||
from lbrynet.core.PaymentRateManager import PaymentRateManager
|
from lbrynet.core.PaymentRateManager import PaymentRateManager
|
||||||
from lbrynet.core.server.BlobAvailabilityHandler import BlobAvailabilityHandlerFactory
|
from lbrynet.core.server.BlobAvailabilityHandler import BlobAvailabilityHandlerFactory
|
||||||
|
@ -35,16 +35,16 @@ from lbrynet.core.Error import UnknownNameError, InsufficientFundsError, Invalid
|
||||||
from lbrynet.lbryfile.StreamDescriptor import EncryptedFileStreamType
|
from lbrynet.lbryfile.StreamDescriptor import EncryptedFileStreamType
|
||||||
from lbrynet.lbryfile.client.EncryptedFileDownloader import EncryptedFileSaverFactory, EncryptedFileOpenerFactory
|
from lbrynet.lbryfile.client.EncryptedFileDownloader import EncryptedFileSaverFactory, EncryptedFileOpenerFactory
|
||||||
from lbrynet.lbryfile.client.EncryptedFileOptions import add_lbry_file_to_sd_identifier
|
from lbrynet.lbryfile.client.EncryptedFileOptions import add_lbry_file_to_sd_identifier
|
||||||
from lbrynet.lbrynet_daemon.LBRYUIManager import LBRYUIManager
|
from lbrynet.lbrynet_daemon.UIManager import UIManager
|
||||||
from lbrynet.lbrynet_daemon.LBRYDownloader import GetStream
|
from lbrynet.lbrynet_daemon.Downloader import GetStream
|
||||||
from lbrynet.lbrynet_daemon.LBRYPublisher import Publisher
|
from lbrynet.lbrynet_daemon.Publisher import Publisher
|
||||||
from lbrynet.lbrynet_daemon.LBRYExchangeRateManager import ExchangeRateManager
|
from lbrynet.lbrynet_daemon.ExchangeRateManager import ExchangeRateManager
|
||||||
from lbrynet.lbrynet_daemon.Lighthouse import LighthouseClient
|
from lbrynet.lbrynet_daemon.Lighthouse import LighthouseClient
|
||||||
from lbrynet.metadata.LBRYMetadata import Metadata, verify_name_characters
|
from lbrynet.metadata.Metadata import Metadata, verify_name_characters
|
||||||
from lbrynet.core import log_support
|
from lbrynet.core import log_support
|
||||||
from lbrynet.core import utils
|
from lbrynet.core import utils
|
||||||
from lbrynet.core.utils import generate_id
|
from lbrynet.core.utils import generate_id
|
||||||
from lbrynet.lbrynet_console.LBRYSettings import LBRYSettings
|
from lbrynet.lbrynet_console.Settings import Settings
|
||||||
from lbrynet.conf import MIN_BLOB_DATA_PAYMENT_RATE, DEFAULT_MAX_SEARCH_RESULTS, \
|
from lbrynet.conf import MIN_BLOB_DATA_PAYMENT_RATE, DEFAULT_MAX_SEARCH_RESULTS, \
|
||||||
KNOWN_DHT_NODES, DEFAULT_MAX_KEY_FEE, DEFAULT_WALLET, \
|
KNOWN_DHT_NODES, DEFAULT_MAX_KEY_FEE, DEFAULT_WALLET, \
|
||||||
DEFAULT_SEARCH_TIMEOUT, DEFAULT_CACHE_TIME, DEFAULT_UI_BRANCH, \
|
DEFAULT_SEARCH_TIMEOUT, DEFAULT_CACHE_TIME, DEFAULT_UI_BRANCH, \
|
||||||
|
@ -52,9 +52,9 @@ from lbrynet.conf import MIN_BLOB_DATA_PAYMENT_RATE, DEFAULT_MAX_SEARCH_RESULTS,
|
||||||
from lbrynet.conf import DEFAULT_SD_DOWNLOAD_TIMEOUT
|
from lbrynet.conf import DEFAULT_SD_DOWNLOAD_TIMEOUT
|
||||||
from lbrynet.conf import DEFAULT_TIMEOUT
|
from lbrynet.conf import DEFAULT_TIMEOUT
|
||||||
from lbrynet.core.StreamDescriptor import StreamDescriptorIdentifier, download_sd_blob, BlobStreamDescriptorReader
|
from lbrynet.core.StreamDescriptor import StreamDescriptorIdentifier, download_sd_blob, BlobStreamDescriptorReader
|
||||||
from lbrynet.core.Session import LBRYSession
|
from lbrynet.core.Session import Session
|
||||||
from lbrynet.core.PTCWallet import PTCWallet
|
from lbrynet.core.PTCWallet import PTCWallet
|
||||||
from lbrynet.core.LBRYWallet import LBRYcrdWallet, LBRYumWallet
|
from lbrynet.core.Wallet import LBRYcrdWallet, LBRYumWallet
|
||||||
from lbrynet.lbryfilemanager.EncryptedFileManager import EncryptedFileManager
|
from lbrynet.lbryfilemanager.EncryptedFileManager import EncryptedFileManager
|
||||||
from lbrynet.lbryfile.EncryptedFileMetadataManager import DBEncryptedFileMetadataManager, TempEncryptedFileMetadataManager
|
from lbrynet.lbryfile.EncryptedFileMetadataManager import DBEncryptedFileMetadataManager, TempEncryptedFileMetadataManager
|
||||||
from lbrynet import reflector
|
from lbrynet import reflector
|
||||||
|
@ -75,9 +75,9 @@ log = logging.getLogger(__name__)
|
||||||
|
|
||||||
if os.path.isfile(lbrynet_log):
|
if os.path.isfile(lbrynet_log):
|
||||||
with open(lbrynet_log, 'r') as f:
|
with open(lbrynet_log, 'r') as f:
|
||||||
PREVIOUS_LBRYNET_LOG = len(f.read())
|
PREVIOUS_NET_LOG = len(f.read())
|
||||||
else:
|
else:
|
||||||
PREVIOUS_LBRYNET_LOG = 0
|
PREVIOUS_NET_LOG = 0
|
||||||
|
|
||||||
INITIALIZING_CODE = 'initializing'
|
INITIALIZING_CODE = 'initializing'
|
||||||
LOADING_DB_CODE = 'loading_db'
|
LOADING_DB_CODE = 'loading_db'
|
||||||
|
@ -138,7 +138,7 @@ class Parameters(object):
|
||||||
self.__dict__.update(kwargs)
|
self.__dict__.update(kwargs)
|
||||||
|
|
||||||
|
|
||||||
class LBRYDaemon(jsonrpc.JSONRPC):
|
class Daemon(jsonrpc.JSONRPC):
|
||||||
"""
|
"""
|
||||||
LBRYnet daemon, a jsonrpc interface to lbry functions
|
LBRYnet daemon, a jsonrpc interface to lbry functions
|
||||||
"""
|
"""
|
||||||
|
@ -380,8 +380,8 @@ class LBRYDaemon(jsonrpc.JSONRPC):
|
||||||
|
|
||||||
self.sd_identifier = StreamDescriptorIdentifier()
|
self.sd_identifier = StreamDescriptorIdentifier()
|
||||||
self.stream_info_manager = TempEncryptedFileMetadataManager()
|
self.stream_info_manager = TempEncryptedFileMetadataManager()
|
||||||
self.settings = LBRYSettings(self.db_dir)
|
self.settings = Settings(self.db_dir)
|
||||||
self.lbry_ui_manager = LBRYUIManager(root)
|
self.lbry_ui_manager = UIManager(root)
|
||||||
self.blob_request_payment_rate_manager = None
|
self.blob_request_payment_rate_manager = None
|
||||||
self.lbry_file_metadata_manager = None
|
self.lbry_file_metadata_manager = None
|
||||||
self.lbry_file_manager = None
|
self.lbry_file_manager = None
|
||||||
|
@ -621,7 +621,7 @@ class LBRYDaemon(jsonrpc.JSONRPC):
|
||||||
try:
|
try:
|
||||||
r = urlopen("https://raw.githubusercontent.com/lbryio/lbryum/master/lib/version.py").read().split('\n')
|
r = urlopen("https://raw.githubusercontent.com/lbryio/lbryum/master/lib/version.py").read().split('\n')
|
||||||
version = next(line.split("=")[1].split("#")[0].replace(" ", "")
|
version = next(line.split("=")[1].split("#")[0].replace(" ", "")
|
||||||
for line in r if "LBRYUM_VERSION" in line)
|
for line in r if "UM_VERSION" in line)
|
||||||
version = version.replace("'", "")
|
version = version.replace("'", "")
|
||||||
log.info(
|
log.info(
|
||||||
"remote lbryum %s > local lbryum %s = %s",
|
"remote lbryum %s > local lbryum %s = %s",
|
||||||
|
@ -816,7 +816,7 @@ class LBRYDaemon(jsonrpc.JSONRPC):
|
||||||
if os.path.isfile(lp):
|
if os.path.isfile(lp):
|
||||||
if exclude_previous:
|
if exclude_previous:
|
||||||
f = open(lp, "r")
|
f = open(lp, "r")
|
||||||
f.seek(PREVIOUS_LBRYNET_LOG) # if lm == 'lbrynet' else PREVIOUS_LBRYUM_LOG)
|
f.seek(PREVIOUS_NET_LOG) # if lm == 'lbrynet' else PREVIOUS_UM_LOG)
|
||||||
log_contents = f.read()
|
log_contents = f.read()
|
||||||
f.close()
|
f.close()
|
||||||
else:
|
else:
|
||||||
|
@ -1073,7 +1073,7 @@ class LBRYDaemon(jsonrpc.JSONRPC):
|
||||||
return r
|
return r
|
||||||
|
|
||||||
def create_session(results):
|
def create_session(results):
|
||||||
self.session = LBRYSession(results['default_data_payment_rate'], db_dir=self.db_dir, lbryid=self.lbryid,
|
self.session = Session(results['default_data_payment_rate'], db_dir=self.db_dir, lbryid=self.lbryid,
|
||||||
blob_dir=self.blobfile_dir, dht_node_port=self.dht_node_port,
|
blob_dir=self.blobfile_dir, dht_node_port=self.dht_node_port,
|
||||||
known_dht_nodes=self.known_dht_nodes, peer_port=self.peer_port,
|
known_dht_nodes=self.known_dht_nodes, peer_port=self.peer_port,
|
||||||
use_upnp=self.use_upnp, wallet=results['wallet'])
|
use_upnp=self.use_upnp, wallet=results['wallet'])
|
||||||
|
|
|
@ -12,7 +12,7 @@ from twisted.internet import reactor, defer
|
||||||
from jsonrpc.proxy import JSONRPCProxy
|
from jsonrpc.proxy import JSONRPCProxy
|
||||||
|
|
||||||
from lbrynet.core import log_support
|
from lbrynet.core import log_support
|
||||||
from lbrynet.lbrynet_daemon.LBRYDaemonServer import LBRYDaemonServer, LBRYDaemonRequest
|
from lbrynet.lbrynet_daemon.DaemonServer import DaemonServer, DaemonRequest
|
||||||
from lbrynet.conf import API_CONNECTION_STRING, API_INTERFACE, API_PORT, \
|
from lbrynet.conf import API_CONNECTION_STRING, API_INTERFACE, API_PORT, \
|
||||||
UI_ADDRESS, DEFAULT_UI_BRANCH, LOG_FILE_NAME
|
UI_ADDRESS, DEFAULT_UI_BRANCH, LOG_FILE_NAME
|
||||||
|
|
||||||
|
@ -104,7 +104,7 @@ def start():
|
||||||
print "To quit press ctrl-c or call 'stop' via the API"
|
print "To quit press ctrl-c or call 'stop' via the API"
|
||||||
|
|
||||||
if test_internet_connection():
|
if test_internet_connection():
|
||||||
lbry = LBRYDaemonServer()
|
lbry = DaemonServer()
|
||||||
|
|
||||||
d = lbry.start(branch=args.branch if args.branch else DEFAULT_UI_BRANCH,
|
d = lbry.start(branch=args.branch if args.branch else DEFAULT_UI_BRANCH,
|
||||||
user_specified=args.ui,
|
user_specified=args.ui,
|
||||||
|
@ -114,7 +114,7 @@ def start():
|
||||||
d.addCallback(lambda _: webbrowser.open(UI_ADDRESS))
|
d.addCallback(lambda _: webbrowser.open(UI_ADDRESS))
|
||||||
|
|
||||||
lbrynet_server = server.Site(lbry.root)
|
lbrynet_server = server.Site(lbry.root)
|
||||||
lbrynet_server.requestFactory = LBRYDaemonRequest
|
lbrynet_server.requestFactory = DaemonRequest
|
||||||
reactor.listenTCP(API_PORT, lbrynet_server, interface=API_INTERFACE)
|
reactor.listenTCP(API_PORT, lbrynet_server, interface=API_INTERFACE)
|
||||||
reactor.run()
|
reactor.run()
|
||||||
|
|
||||||
|
|
|
@ -15,11 +15,11 @@ from twisted.internet import defer, interfaces, error, reactor, threads
|
||||||
|
|
||||||
from zope.interface import implements
|
from zope.interface import implements
|
||||||
|
|
||||||
from lbrynet.lbrynet_daemon.LBRYDaemon import LBRYDaemon
|
from lbrynet.lbrynet_daemon.Daemon import Daemon
|
||||||
from lbrynet.conf import API_ADDRESS, UI_ADDRESS, DEFAULT_UI_BRANCH, LOG_FILE_NAME
|
from lbrynet.conf import API_ADDRESS, UI_ADDRESS, DEFAULT_UI_BRANCH, LOG_FILE_NAME
|
||||||
|
|
||||||
|
|
||||||
# TODO: omg, this code is essentially duplicated in LBRYDaemon
|
# TODO: omg, this code is essentially duplicated in Daemon
|
||||||
if sys.platform != "darwin":
|
if sys.platform != "darwin":
|
||||||
data_dir = os.path.join(os.path.expanduser("~"), ".lbrynet")
|
data_dir = os.path.join(os.path.expanduser("~"), ".lbrynet")
|
||||||
else:
|
else:
|
||||||
|
@ -31,7 +31,7 @@ lbrynet_log = os.path.join(data_dir, LOG_FILE_NAME)
|
||||||
log = logging.getLogger(__name__)
|
log = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
class LBRYDaemonRequest(server.Request):
|
class DaemonRequest(server.Request):
|
||||||
"""
|
"""
|
||||||
For LBRY specific request functionality. Currently just provides
|
For LBRY specific request functionality. Currently just provides
|
||||||
handling for large multipart POST requests, taken from here:
|
handling for large multipart POST requests, taken from here:
|
||||||
|
@ -401,10 +401,10 @@ class EncryptedFileUpload(resource.Resource):
|
||||||
return json.dumps(newpath)
|
return json.dumps(newpath)
|
||||||
|
|
||||||
|
|
||||||
class LBRYDaemonServer(object):
|
class DaemonServer(object):
|
||||||
def _setup_server(self, wallet):
|
def _setup_server(self, wallet):
|
||||||
self.root = LBRYindex(os.path.join(os.path.join(data_dir, "lbry-ui"), "active"))
|
self.root = LBRYindex(os.path.join(os.path.join(data_dir, "lbry-ui"), "active"))
|
||||||
self._api = LBRYDaemon(self.root, wallet_type=wallet)
|
self._api = Daemon(self.root, wallet_type=wallet)
|
||||||
self.root.putChild("view", HostedEncryptedFile(self._api))
|
self.root.putChild("view", HostedEncryptedFile(self._api))
|
||||||
self.root.putChild("upload", EncryptedFileUpload(self._api))
|
self.root.putChild("upload", EncryptedFileUpload(self._api))
|
||||||
self.root.putChild(API_ADDRESS, self._api)
|
self.root.putChild(API_ADDRESS, self._api)
|
||||||
|
|
|
@ -11,7 +11,7 @@ from twisted.internet.task import LoopingCall
|
||||||
from lbrynet.core.Error import InsufficientFundsError, KeyFeeAboveMaxAllowed
|
from lbrynet.core.Error import InsufficientFundsError, KeyFeeAboveMaxAllowed
|
||||||
from lbrynet.core.PaymentRateManager import PaymentRateManager
|
from lbrynet.core.PaymentRateManager import PaymentRateManager
|
||||||
from lbrynet.core.StreamDescriptor import download_sd_blob
|
from lbrynet.core.StreamDescriptor import download_sd_blob
|
||||||
from lbrynet.metadata.LBRYFee import LBRYFeeValidator
|
from lbrynet.metadata.Fee import FeeValidator
|
||||||
from lbrynet.lbryfilemanager.EncryptedFileDownloader import ManagedEncryptedFileDownloaderFactory
|
from lbrynet.lbryfilemanager.EncryptedFileDownloader import ManagedEncryptedFileDownloaderFactory
|
||||||
from lbrynet.conf import DEFAULT_TIMEOUT, LOG_FILE_NAME
|
from lbrynet.conf import DEFAULT_TIMEOUT, LOG_FILE_NAME
|
||||||
|
|
||||||
|
@ -86,7 +86,7 @@ class GetStream(object):
|
||||||
|
|
||||||
def _convert_max_fee(self):
|
def _convert_max_fee(self):
|
||||||
if isinstance(self.max_key_fee, dict):
|
if isinstance(self.max_key_fee, dict):
|
||||||
max_fee = LBRYFeeValidator(self.max_key_fee)
|
max_fee = FeeValidator(self.max_key_fee)
|
||||||
if max_fee.currency_symbol == "LBC":
|
if max_fee.currency_symbol == "LBC":
|
||||||
return max_fee.amount
|
return max_fee.amount
|
||||||
return self.exchange_rate_manager.to_lbc(self.fee).amount
|
return self.exchange_rate_manager.to_lbc(self.fee).amount
|
||||||
|
@ -123,7 +123,7 @@ class GetStream(object):
|
||||||
self.stream_hash = self.stream_info['sources']['lbry_sd_hash']
|
self.stream_hash = self.stream_info['sources']['lbry_sd_hash']
|
||||||
|
|
||||||
if 'fee' in self.stream_info:
|
if 'fee' in self.stream_info:
|
||||||
self.fee = LBRYFeeValidator(self.stream_info['fee'])
|
self.fee = FeeValidator(self.stream_info['fee'])
|
||||||
max_key_fee = self._convert_max_fee()
|
max_key_fee = self._convert_max_fee()
|
||||||
if self.exchange_rate_manager.to_lbc(self.fee).amount > max_key_fee:
|
if self.exchange_rate_manager.to_lbc(self.fee).amount > max_key_fee:
|
||||||
log.info("Key fee %f above limit of %f didn't download lbry://%s" % (self.fee.amount,
|
log.info("Key fee %f above limit of %f didn't download lbry://%s" % (self.fee.amount,
|
||||||
|
|
|
@ -6,7 +6,7 @@ import googlefinance
|
||||||
from twisted.internet import defer, reactor
|
from twisted.internet import defer, reactor
|
||||||
from twisted.internet.task import LoopingCall
|
from twisted.internet.task import LoopingCall
|
||||||
|
|
||||||
from lbrynet.metadata.LBRYFee import LBRYFeeValidator
|
from lbrynet.metadata.Fee import FeeValidator
|
||||||
|
|
||||||
log = logging.getLogger(__name__)
|
log = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
@ -147,12 +147,12 @@ class ExchangeRateManager(object):
|
||||||
def to_lbc(self, fee):
|
def to_lbc(self, fee):
|
||||||
if fee is None:
|
if fee is None:
|
||||||
return None
|
return None
|
||||||
if not isinstance(fee, LBRYFeeValidator):
|
if not isinstance(fee, FeeValidator):
|
||||||
fee_in = LBRYFeeValidator(fee)
|
fee_in = FeeValidator(fee)
|
||||||
else:
|
else:
|
||||||
fee_in = fee
|
fee_in = fee
|
||||||
|
|
||||||
return LBRYFeeValidator({fee_in.currency_symbol:
|
return FeeValidator({fee_in.currency_symbol:
|
||||||
{
|
{
|
||||||
'amount': self.convert_currency(fee_in.currency_symbol, "LBC", fee_in.amount),
|
'amount': self.convert_currency(fee_in.currency_symbol, "LBC", fee_in.amount),
|
||||||
'address': fee_in.address
|
'address': fee_in.address
|
||||||
|
@ -202,12 +202,12 @@ class DummyExchangeRateManager(object):
|
||||||
def to_lbc(self, fee):
|
def to_lbc(self, fee):
|
||||||
if fee is None:
|
if fee is None:
|
||||||
return None
|
return None
|
||||||
if not isinstance(fee, LBRYFeeValidator):
|
if not isinstance(fee, FeeValidator):
|
||||||
fee_in = LBRYFeeValidator(fee)
|
fee_in = FeeValidator(fee)
|
||||||
else:
|
else:
|
||||||
fee_in = fee
|
fee_in = fee
|
||||||
|
|
||||||
return LBRYFeeValidator({fee_in.currency_symbol:
|
return FeeValidator({fee_in.currency_symbol:
|
||||||
{
|
{
|
||||||
'amount': self.convert_currency(fee_in.currency_symbol, "LBC", fee_in.amount),
|
'amount': self.convert_currency(fee_in.currency_symbol, "LBC", fee_in.amount),
|
||||||
'address': fee_in.address
|
'address': fee_in.address
|
||||||
|
|
|
@ -10,7 +10,7 @@ from lbrynet.core.Error import InsufficientFundsError
|
||||||
from lbrynet.lbryfilemanager.EncryptedFileCreator import create_lbry_file
|
from lbrynet.lbryfilemanager.EncryptedFileCreator import create_lbry_file
|
||||||
from lbrynet.lbryfile.StreamDescriptor import publish_sd_blob
|
from lbrynet.lbryfile.StreamDescriptor import publish_sd_blob
|
||||||
from lbrynet.core.PaymentRateManager import PaymentRateManager
|
from lbrynet.core.PaymentRateManager import PaymentRateManager
|
||||||
from lbrynet.metadata.LBRYMetadata import Metadata
|
from lbrynet.metadata.Metadata import Metadata
|
||||||
from lbrynet.lbryfilemanager.EncryptedFileDownloader import ManagedEncryptedFileDownloader
|
from lbrynet.lbryfilemanager.EncryptedFileDownloader import ManagedEncryptedFileDownloader
|
||||||
from lbrynet import reflector
|
from lbrynet import reflector
|
||||||
from lbrynet.conf import LOG_FILE_NAME, REFLECTOR_SERVERS
|
from lbrynet.conf import LOG_FILE_NAME, REFLECTOR_SERVERS
|
||||||
|
|
|
@ -11,7 +11,7 @@ from twisted.internet import defer
|
||||||
from twisted.internet.task import LoopingCall
|
from twisted.internet.task import LoopingCall
|
||||||
from lbrynet.conf import DEFAULT_UI_BRANCH, LOG_FILE_NAME
|
from lbrynet.conf import DEFAULT_UI_BRANCH, LOG_FILE_NAME
|
||||||
from lbrynet import __version__ as lbrynet_version
|
from lbrynet import __version__ as lbrynet_version
|
||||||
from lbryum.version import LBRYUM_VERSION as lbryum_version
|
from lbryum.version import UM_VERSION as lbryum_version
|
||||||
from zipfile import ZipFile
|
from zipfile import ZipFile
|
||||||
from appdirs import user_data_dir
|
from appdirs import user_data_dir
|
||||||
|
|
||||||
|
@ -27,7 +27,7 @@ lbrynet_log = os.path.join(log_dir, LOG_FILE_NAME)
|
||||||
log = logging.getLogger(__name__)
|
log = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
class LBRYUIManager(object):
|
class UIManager(object):
|
||||||
def __init__(self, root):
|
def __init__(self, root):
|
||||||
if sys.platform != "darwin":
|
if sys.platform != "darwin":
|
||||||
self.data_dir = os.path.join(os.path.expanduser("~"), '.lbrynet')
|
self.data_dir = os.path.join(os.path.expanduser("~"), '.lbrynet')
|
||||||
|
|
|
@ -80,7 +80,7 @@ class USDFeeValidator(Validator):
|
||||||
Validator.__init__(self, fee)
|
Validator.__init__(self, fee)
|
||||||
|
|
||||||
|
|
||||||
class LBRYFeeValidator(Validator):
|
class FeeValidator(Validator):
|
||||||
CV001 = "0.0.1"
|
CV001 = "0.0.1"
|
||||||
CURRENT_CURRENCY_VERSION = CV001
|
CURRENT_CURRENCY_VERSION = CV001
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
from lbrynet.metadata.Validator import Validator, skip_validate
|
from lbrynet.metadata.Validator import Validator, skip_validate
|
||||||
from lbrynet.metadata.LBRYFee import LBRYFeeValidator, verify_supported_currency
|
from lbrynet.metadata.Fee import FeeValidator, verify_supported_currency
|
||||||
from lbrynet.conf import SOURCE_TYPES
|
from lbrynet.conf import SOURCE_TYPES
|
||||||
|
|
||||||
log = logging.getLogger(__name__)
|
log = logging.getLogger(__name__)
|
||||||
|
@ -83,4 +83,4 @@ class Metadata(Validator):
|
||||||
|
|
||||||
def _load_fee(self):
|
def _load_fee(self):
|
||||||
if 'fee' in self:
|
if 'fee' in self:
|
||||||
self.update({'fee': LBRYFeeValidator(self['fee'])})
|
self.update({'fee': FeeValidator(self['fee'])})
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
from lbrynet.reflector.server.server import ReflectorServerFactory as ServerFactory
|
from lbrynet.reflector.server.server import ReflectorServerFactory as ServerFactory
|
||||||
from lbrynet.reflector.client.client import EncryptedFileReflectorClientFactory as ClientFactory
|
from lbrynet.reflector.client.client import EncryptedFileReflectorClientFactory as ClientFactory
|
||||||
from lbrynet.reflector.client.client import LBRYBlobReflectorClientFactory as BlobClientFactory
|
from lbrynet.reflector.client.client import BlobReflectorClientFactory as BlobClientFactory
|
||||||
|
|
|
@ -269,7 +269,7 @@ class EncryptedFileReflectorClientFactory(ClientFactory):
|
||||||
log.debug("connection failed: %s", reason)
|
log.debug("connection failed: %s", reason)
|
||||||
|
|
||||||
|
|
||||||
class LBRYBlobReflectorClient(Protocol):
|
class BlobReflectorClient(Protocol):
|
||||||
# Protocol stuff
|
# Protocol stuff
|
||||||
|
|
||||||
def connectionMade(self):
|
def connectionMade(self):
|
||||||
|
@ -424,8 +424,8 @@ class LBRYBlobReflectorClient(Protocol):
|
||||||
self.transport.loseConnection()
|
self.transport.loseConnection()
|
||||||
|
|
||||||
|
|
||||||
class LBRYBlobReflectorClientFactory(ClientFactory):
|
class BlobReflectorClientFactory(ClientFactory):
|
||||||
protocol = LBRYBlobReflectorClient
|
protocol = BlobReflectorClient
|
||||||
|
|
||||||
def __init__(self, blob_manager, blobs):
|
def __init__(self, blob_manager, blobs):
|
||||||
self.blob_manager = blob_manager
|
self.blob_manager = blob_manager
|
||||||
|
|
Loading…
Add table
Reference in a new issue