From f64ad6e169f6da5d29f59f45ff4834b6a2763e0e Mon Sep 17 00:00:00 2001 From: Alex Liebowitz Date: Mon, 10 Apr 2017 22:42:20 -0400 Subject: [PATCH 1/5] Fix merging error in FileActions --- ui/js/component/file-actions.js | 1 - 1 file changed, 1 deletion(-) diff --git a/ui/js/component/file-actions.js b/ui/js/component/file-actions.js index 314b2353b..1a535099a 100644 --- a/ui/js/component/file-actions.js +++ b/ui/js/component/file-actions.js @@ -261,7 +261,6 @@ export let FileActions = React.createClass({ componentDidMount: function() { this._isMounted = true; this._fileInfoSubscribeId = lbry.fileInfoSubscribe(this.props.outpoint, this.onFileInfoUpdate); - lbry.getStreamAvailability(this.props.uri, (availability) => { lbry.get_availability({uri: this.props.uri}, (availability) => { if (this._isMounted) { this.setState({ From c49d229eef308efe31506bb75b73a77aca3b0ff8 Mon Sep 17 00:00:00 2001 From: Alex Liebowitz Date: Tue, 11 Apr 2017 00:12:34 -0400 Subject: [PATCH 2/5] Publish: name resolution bugfixes --- ui/js/page/publish.js | 38 ++++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/ui/js/page/publish.js b/ui/js/page/publish.js index 8493dae1a..82ef6bdf8 100644 --- a/ui/js/page/publish.js +++ b/ui/js/page/publish.js @@ -171,44 +171,50 @@ var PublishPage = React.createClass({ }); const name = rawName.toLowerCase(); - lbry.resolve({uri: name}).then((info) => { + lbry.getMyClaim(name, (myClaimInfo) => { if (name != this.refs.name.getValue().toLowerCase()) { // A new name has been typed already, so bail return; } - lbry.getMyClaim(name, (myClaimInfo) => { - lbry.getClaimInfo(name, (claimInfo) => { - if (name != this.refs.name.getValue()) { - return; - } + lbry.resolve({uri: name}).then((claimInfo) => { + if (name != this.refs.name.getValue()) { + return; + } - const topClaimIsMine = (myClaimInfo && myClaimInfo.amount >= claimInfo.amount); + if (!claimInfo) { + this.setState({ + name: name, + nameResolved: false, + myClaimExists: false, + }); + } else { + const topClaimIsMine = (myClaimInfo && myClaimInfo.claim.amount >= claimInfo.claim.amount); const newState = { name: name, nameResolved: true, - topClaimValue: parseFloat(claimInfo.amount), + topClaimValue: parseFloat(claimInfo.claim.amount), myClaimExists: !!myClaimInfo, - myClaimValue: myClaimInfo ? parseFloat(myClaimInfo.amount) : null, + myClaimValue: myClaimInfo ? parseFloat(myClaimInfo.claim.amount) : null, myClaimMetadata: myClaimInfo ? myClaimInfo.value : null, topClaimIsMine: topClaimIsMine, }; if (topClaimIsMine) { - newState.bid = myClaimInfo.amount; + newState.bid = myClaimInfo.claim.amount; } else if (this.state.myClaimMetadata) { // Just changed away from a name we have a claim on, so clear pre-fill newState.bid = ''; } this.setState(newState); + } + }, () => { // Assume an error means the name is available + this.setState({ + name: name, + nameResolved: false, + myClaimExists: false, }); }); - }, () => { // Assume an error means the name is available - this.setState({ - name: name, - nameResolved: false, - myClaimExists: false, - }); }); }, handleBidChange: function(event) { From 5577b436d3531fe1ff1ad19468022bff598a2067 Mon Sep 17 00:00:00 2001 From: Alex Liebowitz Date: Tue, 11 Apr 2017 00:14:52 -0400 Subject: [PATCH 3/5] Use resolve API method on splash screen --- ui/js/component/splash.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/js/component/splash.js b/ui/js/component/splash.js index bba92e288..8de7e1bbf 100644 --- a/ui/js/component/splash.js +++ b/ui/js/component/splash.js @@ -27,8 +27,8 @@ var SplashScreen = React.createClass({ isLagging: false }); - lbry.resolveName('one', () => { - window.sessionStorage.setItem('loaded', 'y') + lbry.resolve({uri: 'lbry://one'}).then(() => { + window.sessionStorage.setItem('loaded', 'y') this.props.onLoadDone(); }); return; From d7644c03942fbf0457cfa8c06fb879da39453faf Mon Sep 17 00:00:00 2001 From: Alex Liebowitz Date: Tue, 11 Apr 2017 00:15:46 -0400 Subject: [PATCH 4/5] My Files: include channel names in URIs --- ui/js/page/file-list.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/ui/js/page/file-list.js b/ui/js/page/file-list.js index 561cc6106..2d2cfdb18 100644 --- a/ui/js/page/file-list.js +++ b/ui/js/page/file-list.js @@ -161,13 +161,19 @@ export let FileList = React.createClass({ seenUris = {}; const fileInfosSorted = this._sortFunctions[this.state.sortBy](this.props.fileInfos); - for (let {name, outpoint, metadata: {stream: {metadata}}, mime_type, claim_id} of fileInfosSorted) { + for (let {outpoint, name, channel_name, metadata: {stream: {metadata}}, mime_type, claim_id} of fileInfosSorted) { if (!metadata || seenUris[name]) { continue; } + let fileUri; + if (channel_name === undefined) { + fileUri = uri.buildLbryUri({name}); + } else { + fileUri = uri.buildLbryUri({name: channel_name, path: name}); + } seenUris[name] = true; - content.push(); } From a7050303c2ca523930023e397f8a9110e893510a Mon Sep 17 00:00:00 2001 From: Alex Liebowitz Date: Tue, 11 Apr 2017 00:21:02 -0400 Subject: [PATCH 5/5] My Files: pass signing info into file tiles --- ui/js/page/file-list.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ui/js/page/file-list.js b/ui/js/page/file-list.js index 2d2cfdb18..ba91835e7 100644 --- a/ui/js/page/file-list.js +++ b/ui/js/page/file-list.js @@ -161,7 +161,7 @@ export let FileList = React.createClass({ seenUris = {}; const fileInfosSorted = this._sortFunctions[this.state.sortBy](this.props.fileInfos); - for (let {outpoint, name, channel_name, metadata: {stream: {metadata}}, mime_type, claim_id} of fileInfosSorted) { + for (let {outpoint, name, channel_name, metadata: {stream: {metadata}}, mime_type, claim_id, has_signature, signature_is_valid} of fileInfosSorted) { if (!metadata || seenUris[name]) { continue; } @@ -174,7 +174,8 @@ export let FileList = React.createClass({ } seenUris[name] = true; content.push(); + hidePrice={this.props.hidePrices} metadata={metadata} contentType={mime_type} + hasSignature={has_signature} signatureIsValid={signature_is_valid} />); } return (