Raise exception if lbry_file can't be found
This commit is contained in:
parent
5233dc303e
commit
6faee910de
1 changed files with 10 additions and 18 deletions
|
@ -1565,6 +1565,7 @@ class Daemon(AuthJSONRPCServer):
|
||||||
defer.returnValue(response)
|
defer.returnValue(response)
|
||||||
|
|
||||||
@AuthJSONRPCServer.auth_required
|
@AuthJSONRPCServer.auth_required
|
||||||
|
@defer.inlineCallbacks
|
||||||
def jsonrpc_stop_lbry_file(self, p):
|
def jsonrpc_stop_lbry_file(self, p):
|
||||||
"""
|
"""
|
||||||
Stop lbry file
|
Stop lbry file
|
||||||
|
@ -1576,25 +1577,16 @@ class Daemon(AuthJSONRPCServer):
|
||||||
Returns:
|
Returns:
|
||||||
confirmation message
|
confirmation message
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def _stop_file(f):
|
|
||||||
if f.stopped:
|
|
||||||
return "LBRY file wasn't running"
|
|
||||||
else:
|
|
||||||
d = self.lbry_file_manager.toggle_lbry_file_running(f)
|
|
||||||
d.addCallback(lambda _: "Stopped LBRY file")
|
|
||||||
return d
|
|
||||||
|
|
||||||
try:
|
|
||||||
searchtype, value = get_lbry_file_search_value(p)
|
searchtype, value = get_lbry_file_search_value(p)
|
||||||
except NoValidSearch:
|
lbry_file = yield self._get_lbry_file(searchtype, value, return_json=False)
|
||||||
d = defer.fail()
|
if not lbry_file:
|
||||||
|
raise Exception('Unable to find a file for {}:{}'.format(searchtype, value))
|
||||||
|
if lbry_file.stopped:
|
||||||
|
msg = "LBRY file wasn't running"
|
||||||
else:
|
else:
|
||||||
d = self._get_lbry_file(searchtype, value, return_json=False)
|
yield self.lbry_file_manager.toggle_lbry_file_running(lbry_file)
|
||||||
d.addCallback(_stop_file)
|
msg = "Stopped LBRY file"
|
||||||
|
defer.returnValue(self._render_response(msg, OK_CODE))
|
||||||
d.addCallback(lambda r: self._render_response(r, OK_CODE))
|
|
||||||
return d
|
|
||||||
|
|
||||||
@AuthJSONRPCServer.auth_required
|
@AuthJSONRPCServer.auth_required
|
||||||
def jsonrpc_start_lbry_file(self, p):
|
def jsonrpc_start_lbry_file(self, p):
|
||||||
|
|
Loading…
Reference in a new issue