Madiator2011/lbry-sdk
1
0
Fork 0
forked from LBRYCommunity/lbry-sdk
Code Pull requests Activity

lint storage

Browse source
This commit is contained in:
Victor Shyba 2020-01-03 02:52:28 -03:00 committed by Lex Berezhny
parent 1b25f2c531
commit 4490caa4f7
1 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
lbry/extras/daemon/storage.py
View file

@ -5,6 +5,7 @@ import typing
import asyncio import asyncio
import binascii import binascii
import time import time
from typing import Optional
from lbry.wallet import SQLiteMixin from lbry.wallet import SQLiteMixin
from lbry.conf import Config from lbry.conf import Config
from lbry.wallet.dewies import dewies_to_lbc, lbc_to_dewies from lbry.wallet.dewies import dewies_to_lbc, lbc_to_dewies
@ -18,8 +19,6 @@ if typing.TYPE_CHECKING:
from lbry.stream.descriptor import StreamDescriptor from lbry.stream.descriptor import StreamDescriptor
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
opt_str = typing.Optional[str]
opt_int = typing.Optional[int]
def calculate_effective_amount(amount: str, supports: typing.Optional[typing.List[typing.Dict]] = None) -> str: def calculate_effective_amount(amount: str, supports: typing.Optional[typing.List[typing.Dict]] = None) -> str:
@ -29,10 +28,10 @@ def calculate_effective_amount(amount: str, supports: typing.Optional[typing.Lis
class StoredContentClaim: class StoredContentClaim:
def __init__(self, outpoint: opt_str = None, claim_id: opt_str = None, name: opt_str = None, def __init__(self, outpoint: Optional[str] = None, claim_id: Optional[str] = None, name: Optional[str] = None,
amount: opt_int = None, height: opt_int = None, serialized: opt_str = None, amount: Optional[int] = None, height: Optional[int] = None, serialized: Optional[str] = None,
channel_claim_id: opt_str = None, address: opt_str = None, claim_sequence: opt_int = None, channel_claim_id: Optional[str] = None, address: Optional[str] = None,
channel_name: opt_str = None): claim_sequence: Optional[int] = None, channel_name: Optional[str] = None):
self.claim_id = claim_id self.claim_id = claim_id
self.outpoint = outpoint self.outpoint = outpoint
self.claim_name = name self.claim_name = name
@ -141,14 +140,14 @@ def get_all_lbry_files(transaction: sqlite3.Connection) -> typing.List[typing.Di
stream_hashes = tuple( stream_hashes = tuple(
stream_hash for stream_hash, _ in stream_hashes_and_bt_infohashes if stream_hash is not None stream_hash for stream_hash, _ in stream_hashes_and_bt_infohashes if stream_hash is not None
) )
for (rowid, stream_hash, bt_infohash, file_name, download_dir, data_rate, status, saved_file, raw_content_fee, for (rowid, stream_hash, _, file_name, download_dir, data_rate, status, saved_file, raw_content_fee,
added_on, _, sd_hash, stream_key, stream_name, suggested_file_name, *claim_args) in _batched_select( added_on, _, sd_hash, stream_key, stream_name, suggested_file_name, *claim_args) in _batched_select(
transaction, "select file.rowid, file.*, stream.*, c.* " transaction, "select file.rowid, file.*, stream.*, c.* "
"from file inner join stream on file.stream_hash=stream.stream_hash " "from file inner join stream on file.stream_hash=stream.stream_hash "
"inner join content_claim cc on file.stream_hash=cc.stream_hash " "inner join content_claim cc on file.stream_hash=cc.stream_hash "
"inner join claim c on cc.claim_outpoint=c.claim_outpoint " "inner join claim c on cc.claim_outpoint=c.claim_outpoint "
"where file.stream_hash in {} " "where file.stream_hash in {} "
"order by c.rowid desc", stream_hashes): "order by c.rowid desc", stream_hashes):
claim = StoredContentClaim(*claim_args) claim = StoredContentClaim(*claim_args)
if claim.channel_claim_id: if claim.channel_claim_id:
if claim.channel_claim_id not in signed_claims: if claim.channel_claim_id not in signed_claims: