From 6ccab8bcb88e8f7c037897fc920502205f3b0491 Mon Sep 17 00:00:00 2001
From: Jack Robison <jackrobison@lbry.io>
Date: Mon, 10 Apr 2017 13:26:47 -0400
Subject: [PATCH] get availability by uri

---
 CHANGELOG.md                     |  2 +-
 lbrynet/core/Wallet.py           |  4 +++-
 lbrynet/lbrynet_daemon/Daemon.py | 24 +++++++++++++++++++-----
 setup.py                         |  2 +-
 4 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b18a52a64..50db405b7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,7 +14,7 @@ at anytime.
   * Add an `error` field to to file responses if an error occurs
   
 ### Changed
-  *
+  * Use `uri` instead of `name` in `get_availability`
   *
   *
 
diff --git a/lbrynet/core/Wallet.py b/lbrynet/core/Wallet.py
index 8f65bc301..eda716816 100644
--- a/lbrynet/core/Wallet.py
+++ b/lbrynet/core/Wallet.py
@@ -534,7 +534,7 @@ class Wallet(object):
                     claim['value'] = claim_dict
                     defer.returnValue(claim)
             try:
-                decoded = ClaimDict.load_dict(claim['value'])
+                decoded = smart_decode(claim['value'])
                 claim_dict = decoded.claim_dict
                 outpoint = ClaimOutpoint(claim['txid'], claim['nout'])
                 name = claim['name']
@@ -593,6 +593,8 @@ class Wallet(object):
                 claims_for_return.append(formatted)
             resolve_results['claims_in_channel'] = claims_for_return
             result = resolve_results
+        elif 'error' in resolve_results:
+            raise Exception(resolve_results['error'])
         else:
             result = None
         defer.returnValue(result)
diff --git a/lbrynet/lbrynet_daemon/Daemon.py b/lbrynet/lbrynet_daemon/Daemon.py
index c6f809646..a1674051a 100644
--- a/lbrynet/lbrynet_daemon/Daemon.py
+++ b/lbrynet/lbrynet_daemon/Daemon.py
@@ -684,7 +684,10 @@ class Daemon(AuthJSONRPCServer):
         def eb():
             if not finished_d.called:
                 finished_d.errback(Exception("Blob (%s) download timed out" %
-                                             blob_hash[:SHORT_ID_LEN]))
+                                              blob_hash[:SHORT_ID_LEN]))
+
+        if not blob_hash:
+            raise Exception("Nothing to download")
 
         rate_manager = rate_manager or self.session.payment_rate_manager
         timeout = timeout or 30
@@ -2414,12 +2417,12 @@ class Daemon(AuthJSONRPCServer):
         return d
 
     @defer.inlineCallbacks
-    def jsonrpc_get_availability(self, name, sd_timeout=None, peer_timeout=None):
+    def jsonrpc_get_availability(self, uri, sd_timeout=None, peer_timeout=None):
         """
-        Get stream availability for a winning claim
+        Get stream availability for lbry uri
 
         Args:
-            'name' : (str) lbry name
+            'uri' : (str) lbry uri
             'sd_timeout' (optional): (int) sd blob download timeout
             'peer_timeout' (optional): (int) how long to look for peers
 
@@ -2443,7 +2446,16 @@ class Daemon(AuthJSONRPCServer):
             sd_blob.close_read_handle(sd_blob_file)
             return decoded_sd_blob
 
-        metadata = yield self._resolve_name(name)
+        try:
+            resolved = yield self.session.wallet.resolve_uri(uri)
+        except Exception:
+            defer.returnValue(None)
+
+        if resolved and 'claim' in resolved:
+            metadata = resolved['claim']['value']
+        else:
+            defer.returnValue(None)
+
         sd_hash = utils.get_sd_hash(metadata)
         sd_timeout = sd_timeout or conf.settings['sd_download_timeout']
         peer_timeout = peer_timeout or conf.settings['peer_search_timeout']
@@ -2455,6 +2467,7 @@ class Daemon(AuthJSONRPCServer):
         except NoSuchSDHash:
             need_sd_blob = True
             log.info("Need sd blob")
+
         blob_hashes = [blob.blob_hash for blob in blobs]
         if need_sd_blob:
             # we don't want to use self._download_descriptor here because it would create a stream
@@ -2462,6 +2475,7 @@ class Daemon(AuthJSONRPCServer):
                 sd_blob = yield self._download_blob(sd_hash, timeout=sd_timeout)
             except Exception as err:
                 response = yield self._render_response(0.0)
+                log.warning(err)
                 defer.returnValue(response)
             decoded = read_sd_blob(sd_blob)
             blob_hashes = [blob.get("blob_hash") for blob in decoded['blobs']
diff --git a/setup.py b/setup.py
index feb8ac500..97fafee2a 100644
--- a/setup.py
+++ b/setup.py
@@ -19,7 +19,7 @@ requires = [
     'envparse',
     'jsonrpc',
     'jsonschema',
-    'lbryum>=2.7.15',
+    'lbryum>=2.7.16',
     'lbryschema>=0.0.2',
     'miniupnpc',
     'pycrypto',