Merge branch 'master' into development

dist/requirements.txt

@@ -1 +1 @@
-lbrynet>=0.5.0
+lbrynet>=0.8.4

js/component/file-actions.js

@@ -248,13 +248,13 @@ export let FileActions = React.createClass({
   componentDidMount: function() {
     this._isMounted = true;
     this._fileInfoSubscribeId = lbry.fileInfoSubscribe(this.props.sdHash, this.onFileInfoUpdate);
-    lbry.getPeersForBlobHash(this.props.sdHash, (peers) => {
+    lbry.getStreamAvailability(this.props.streamName, (availability) => {
       if (!this._isMounted) {
         return;
       }
 
       this.setState({
-        available: peers.length > 0,
+        available: availability > 0,
       });
     });
   },

js/lbry.js

@@ -207,6 +207,10 @@ lbry.getPeersForBlobHash = function(blobHash, callback) {
   });
 }
 
+lbry.getStreamAvailability = function(name, callback) {
+  lbry.call('get_availability', {name: name}, callback);
+}
+
 lbry.getCostInfoForName = function(name, callback, errorCallback) {
   /**
    * Takes a LBRY name; will first try and calculate a total cost using
@@ -260,8 +264,8 @@ lbry.getFeaturedDiscoverNames = function(callback) {
   });
 }
 
-lbry.getFileStatus = function(name, callback) {
-  lbry.call('get_lbry_file', { 'name': name }, callback);
+lbry.getFileStatus = function(name, callback, errorCallback) {
+  lbry.call('get_lbry_file', { 'name': name }, callback, errorCallback);
 }
 
 lbry.getFilesInfo = function(callback) {
@@ -311,22 +315,23 @@ lbry.revealFile = function(sdHash, callback) {
 }
 
 lbry.getFileInfoWhenListed = function(name, callback, timeoutCallback, tryNum=0) {
-  // Calls callback with file info when it appears in the list of files returned by lbry.getFilesInfo().
-  // If timeoutCallback is provided, it will be called if the file fails to appear.
-  lbry.getFilesInfo(function(fileInfos) {
-    for (var fileInfo of fileInfos) {
-      if (fileInfo.lbry_uri == name) {
-        callback(fileInfo);
-        return;
-      }
-    }
-
+  function scheduleNextCheckOrTimeout() {
     if (timeoutCallback && tryNum > 200) {
       timeoutCallback();
     } else {
-      setTimeout(function() { lbry.getFileInfoWhenListed(name, callback, timeoutCallback, tryNum + 1) }, 250);
+      setTimeout(() => lbry.getFileInfoWhenListed(name, callback, timeoutCallback, tryNum + 1), 250);
     }
-  });
+  }
+
+  // Calls callback with file info when it appears in the lbrynet file manager.
+  // If timeoutCallback is provided, it will be called if the file fails to appear.
+  lbry.getFileStatus(name, (fileInfo) => {
+    if (fileInfo) {
+      callback(fileInfo);
+    } else {
+      scheduleNextCheckOrTimeout();
+    }
+  }, () => scheduleNextCheckOrTimeout());
 }
 
 lbry.publish = function(params, fileListedCallback, publishedCallback, errorCallback) {