fix infinite loops on unclaimed URLs (somewhat ugly)

This commit is contained in:
Jeremy Kauffman 2017-10-12 10:05:18 -04:00
parent 142b1eb529
commit a6b83a0b08
2 changed files with 15 additions and 8 deletions

View file

@ -45,11 +45,16 @@ export function doResolveUris(uris) {
let resolveInfo = {};
lbry.resolve({ uris: urisToResolve }).then(result => {
for (let [uri, uriResolveInfo] of Object.entries(result)) {
const { claim, certificate, claims_in_channel } = uriResolveInfo || {
claim: undefined,
claims_in_channel: undefined,
certificate: undefined,
const fallbackResolveInfo = {
claim: null,
claims_in_channel: null,
certificate: null,
};
const { claim, certificate, claims_in_channel } = uriResolveInfo &&
!uriResolveInfo.error
? uriResolveInfo
: fallbackResolveInfo;
resolveInfo[uri] = { claim, certificate, claims_in_channel };
}

View file

@ -6,15 +6,17 @@ import FilePage from "page/file";
class ShowPage extends React.PureComponent {
componentWillMount() {
const { resolveUri, uri } = this.props;
const { isResolvingUri, resolveUri, uri } = this.props;
resolveUri(uri);
if (!isResolvingUri) resolveUri(uri);
}
componentWillReceiveProps(nextProps) {
const { resolveUri, uri } = nextProps;
const { isResolvingUri, resolveUri, claim, uri } = nextProps;
resolveUri(uri);
if (!isResolvingUri && claim === undefined && uri) {
resolveUri(uri);
}
}
render() {