Madiator2011/lbry-sdk
1
0
Fork 0
forked from LBRYCommunity/lbry-sdk
Code Pull requests Activity

fix unavailable download directory

Browse source 
If an uploaded file had a directory that was removed, or if the old download directory doesn't exist, use the default.
This commit is contained in:
Thomas Zarebczan 2019-01-10 22:05:39 -05:00 • committed by Lex Berezhny
parent 248d1a18c7
commit 4c23add193
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lbrynet/extras/daemon/Daemon.py
View file

@ -834,7 +834,10 @@ class Daemon(metaclass=JSONRPCServerType):
async def _get_lbry_file_dict(self, lbry_file): async def _get_lbry_file_dict(self, lbry_file):
key = hexlify(lbry_file.key) if lbry_file.key else None key = hexlify(lbry_file.key) if lbry_file.key else None
full_path = os.path.join(lbry_file.download_directory, lbry_file.file_name) download_directory = lbry_file.download_directory
if not os.path.exists(download_directory):
download_directory = conf.settings.download_dir
full_path = os.path.join(download_directory, lbry_file.file_name)
mime_type = guess_media_type(lbry_file.file_name) mime_type = guess_media_type(lbry_file.file_name)
if os.path.isfile(full_path): if os.path.isfile(full_path):
with open(full_path) as written_file: with open(full_path) as written_file:
@ -852,7 +855,7 @@ class Daemon(metaclass=JSONRPCServerType):
return { return {
'completed': lbry_file.completed, 'completed': lbry_file.completed,
'file_name': lbry_file.file_name, 'file_name': lbry_file.file_name,
'download_directory': lbry_file.download_directory, 'download_directory': download_directory,
'points_paid': lbry_file.points_paid, 'points_paid': lbry_file.points_paid,
'stopped': lbry_file.stopped, 'stopped': lbry_file.stopped,
'stream_hash': lbry_file.stream_hash, 'stream_hash': lbry_file.stream_hash,