LBRYCommunity/hub
1
0
Fork 0
Code Issues 35 Pull requests 6 Projects Releases Packages Wiki Activity

Merge pull request #37 from lbryio/fix-resolve-duplicate-claims-in-channel

Browse source 
fix resolving duplicate names in a channel
This commit is contained in:
Jack Robison 2022-05-17 11:34:29 -04:00 committed by GitHub
commit 195bc7c69d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
scribe/db/db.py
View file

@ -276,17 +276,11 @@ class HubDB:
) )
return return
def _resolve_claim_in_channel(self, channel_hash: bytes, normalized_name: str): def _resolve_claim_in_channel(self, channel_hash: bytes, normalized_name: str, stream_claim_id: Optional[str] = None):
candidates = []
for key, stream in self.prefix_db.channel_to_claim.iterate(prefix=(channel_hash, normalized_name)): for key, stream in self.prefix_db.channel_to_claim.iterate(prefix=(channel_hash, normalized_name)):
effective_amount = self.get_effective_amount(stream.claim_hash) if stream_claim_id is not None and not stream.claim_hash.hex().startswith(stream_claim_id):
if not candidates or candidates[-1][-1] == effective_amount: continue
candidates.append((stream.claim_hash, key.tx_num, key.position, effective_amount)) return stream.claim_hash, key.tx_num, key.position, self.get_effective_amount(stream.claim_hash)
else:
break
if not candidates:
return
return list(sorted(candidates, key=lambda item: item[1]))[0]
def _resolve(self, url) -> ExpandedResolveResult: def _resolve(self, url) -> ExpandedResolveResult:
try: try:
@ -308,7 +302,7 @@ class HubDB:
return ExpandedResolveResult(None, LookupError(f'Could not find channel in "{url}".'), None, None) return ExpandedResolveResult(None, LookupError(f'Could not find channel in "{url}".'), None, None)
if stream: if stream:
if resolved_channel: if resolved_channel:
stream_claim = self._resolve_claim_in_channel(resolved_channel.claim_hash, stream.normalized) stream_claim = self._resolve_claim_in_channel(resolved_channel.claim_hash, stream.normalized, stream.claim_id)
if stream_claim: if stream_claim:
stream_claim_id, stream_tx_num, stream_tx_pos, effective_amount = stream_claim stream_claim_id, stream_tx_num, stream_tx_pos, effective_amount = stream_claim
resolved_stream = self._fs_get_claim_by_hash(stream_claim_id) resolved_stream = self._fs_get_claim_by_hash(stream_claim_id)