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

add no_source claim_search filter

Browse source
This commit is contained in:
Victor Shyba 2021-03-11 00:45:42 -03:00 committed by Lex Berezhny
parent 74660704e3
commit a54e9b64aa
3 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lbry/wallet/server/db/reader.py
View file

@ -53,7 +53,7 @@ SEARCH_PARAMS = {
'any_locations', 'all_locations', 'not_locations', 'any_locations', 'all_locations', 'not_locations',
'any_languages', 'all_languages', 'not_languages', 'any_languages', 'all_languages', 'not_languages',
'is_controlling', 'limit', 'offset', 'order_by', 'is_controlling', 'limit', 'offset', 'order_by',
'no_totals', 'no_totals', 'no_source'
} | INTEGER_PARAMS } | INTEGER_PARAMS

9
lbry/wallet/server/db/writer.py
View file

@ -55,6 +55,7 @@ class SQLDB:
description text, description text,
claim_type integer, claim_type integer,
no_source bool,
reposted integer default 0, reposted integer default 0,
-- streams -- streams
@ -354,6 +355,7 @@ class SQLDB:
'author': None, 'author': None,
'duration': None, 'duration': None,
'claim_type': None, 'claim_type': None,
'no_source': False,
'stream_type': None, 'stream_type': None,
'media_type': None, 'media_type': None,
'release_time': None, 'release_time': None,
@ -371,6 +373,7 @@ class SQLDB:
if claim.is_stream: if claim.is_stream:
claim_record['claim_type'] = CLAIM_TYPES['stream'] claim_record['claim_type'] = CLAIM_TYPES['stream']
claim_record['no_source'] = not claim.stream.has_source
claim_record['media_type'] = claim.stream.source.media_type claim_record['media_type'] = claim.stream.source.media_type
claim_record['stream_type'] = STREAM_TYPES[guess_stream_type(claim_record['media_type'])] claim_record['stream_type'] = STREAM_TYPES[guess_stream_type(claim_record['media_type'])]
claim_record['title'] = claim.stream.title claim_record['title'] = claim.stream.title
@ -421,12 +424,12 @@ class SQLDB:
self.executemany(""" self.executemany("""
INSERT OR IGNORE INTO claim ( INSERT OR IGNORE INTO claim (
claim_hash, claim_id, claim_name, normalized, txo_hash, tx_position, amount, claim_hash, claim_id, claim_name, normalized, txo_hash, tx_position, amount,
claim_type, media_type, stream_type, timestamp, creation_timestamp, claim_type, media_type, stream_type, timestamp, creation_timestamp, no_source,
fee_currency, fee_amount, title, description, author, duration, height, reposted_claim_hash, fee_currency, fee_amount, title, description, author, duration, height, reposted_claim_hash,
creation_height, release_time, activation_height, expiration_height, short_url) creation_height, release_time, activation_height, expiration_height, short_url)
VALUES ( VALUES (
:claim_hash, :claim_id, :claim_name, :normalized, :txo_hash, :tx_position, :amount, :claim_hash, :claim_id, :claim_name, :normalized, :txo_hash, :tx_position, :amount,
:claim_type, :media_type, :stream_type, :timestamp, :timestamp, :claim_type, :media_type, :stream_type, :timestamp, :timestamp, :no_source,
:fee_currency, :fee_amount, :title, :description, :author, :duration, :height, :reposted_claim_hash, :height, :fee_currency, :fee_amount, :title, :description, :author, :duration, :height, :reposted_claim_hash, :height,
CASE WHEN :release_time IS NOT NULL THEN :release_time ELSE :timestamp END, CASE WHEN :release_time IS NOT NULL THEN :release_time ELSE :timestamp END,
CASE WHEN :normalized NOT IN (SELECT normalized FROM claimtrie) THEN :height END, CASE WHEN :normalized NOT IN (SELECT normalized FROM claimtrie) THEN :height END,
@ -444,7 +447,7 @@ class SQLDB:
UPDATE claim SET UPDATE claim SET
txo_hash=:txo_hash, tx_position=:tx_position, amount=:amount, height=:height, txo_hash=:txo_hash, tx_position=:tx_position, amount=:amount, height=:height,
claim_type=:claim_type, media_type=:media_type, stream_type=:stream_type, claim_type=:claim_type, media_type=:media_type, stream_type=:stream_type,
timestamp=:timestamp, fee_amount=:fee_amount, fee_currency=:fee_currency, timestamp=:timestamp, fee_amount=:fee_amount, fee_currency=:fee_currency, no_source=:no_source
title=:title, duration=:duration, description=:description, author=:author, reposted_claim_hash=:reposted_claim_hash, title=:title, duration=:duration, description=:description, author=:author, reposted_claim_hash=:reposted_claim_hash,
release_time=CASE WHEN :release_time IS NOT NULL THEN :release_time ELSE release_time END release_time=CASE WHEN :release_time IS NOT NULL THEN :release_time ELSE release_time END
WHERE claim_hash=:claim_hash; WHERE claim_hash=:claim_hash;

7
tests/integration/blockchain/test_claim_commands.py
View file

@ -158,6 +158,13 @@ class ClaimSearchCommand(ClaimTestCase):
await self.stream_abandon(txid=signed2['txid'], nout=0) await self.stream_abandon(txid=signed2['txid'], nout=0)
await self.assertFindsClaims([], channel_ids=[channel_id2]) await self.assertFindsClaims([], channel_ids=[channel_id2])
async def test_source_filter(self):
# no source
no_source = await self.stream_create('no_source', data=None)
normal = await self.stream_create('normal', data=b'normal')
await self.assertFindsClaims([no_source], no_source=True)
await self.assertFindsClaims([normal], no_source=False)
async def test_pagination(self): async def test_pagination(self):
await self.create_channel() await self.create_channel()
await self.create_lots_of_streams() await self.create_lots_of_streams()