LBRYCommunity/lbry-sdk
1
0
Fork 1
Code Issues Pull requests Projects Releases 282 Packages Wiki Activity

if media type is not listed, default to a type that includes the file extension

Browse source
This commit is contained in:
Alex Grintsvayg 2019-01-08 15:27:13 -05:00 • committed by Lex Berezhny
parent 63a7271008
commit a930ca0631
3 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -23,7 +23,7 @@ from lbrynet.extras.daemon.Components import EXCHANGE_RATE_MANAGER_COMPONENT, PA
from lbrynet.extras.daemon.ComponentManager import RequiredCondition from lbrynet.extras.daemon.ComponentManager import RequiredCondition
from lbrynet.extras.daemon.Downloader import GetStream from lbrynet.extras.daemon.Downloader import GetStream
from lbrynet.extras.daemon.Publisher import Publisher from lbrynet.extras.daemon.Publisher import Publisher
from lbrynet.extras.daemon.mime_types import guess_mime_type from lbrynet.extras.daemon.mime_types import guess_media_type
from lbrynet.extras.wallet import LbryWalletManager from lbrynet.extras.wallet import LbryWalletManager
from lbrynet.extras.wallet.account import Account as LBCAccount from lbrynet.extras.wallet.account import Account as LBCAccount
from lbrynet.extras.wallet.dewies import dewies_to_lbc, lbc_to_dewies from lbrynet.extras.wallet.dewies import dewies_to_lbc, lbc_to_dewies
@ -817,7 +817,7 @@ 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) full_path = os.path.join(lbry_file.download_directory, lbry_file.file_name)
mime_type = guess_mime_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:
written_file.seek(0, os.SEEK_END) written_file.seek(0, os.SEEK_END)

4
lbrynet/extras/daemon/Publisher.py
View file

@ -3,7 +3,7 @@ import logging
import os import os
from lbrynet.blob.EncryptedFileCreator import create_lbry_file from lbrynet.blob.EncryptedFileCreator import create_lbry_file
from lbrynet.extras.daemon.mime_types import guess_mime_type from lbrynet.extras.daemon.mime_types import guess_media_type
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
@ -43,7 +43,7 @@ class Publisher:
claim_dict['stream']['source'] = {} claim_dict['stream']['source'] = {}
claim_dict['stream']['source']['source'] = self.lbry_file.sd_hash claim_dict['stream']['source']['source'] = self.lbry_file.sd_hash
claim_dict['stream']['source']['sourceType'] = 'lbry_sd_hash' claim_dict['stream']['source']['sourceType'] = 'lbry_sd_hash'
claim_dict['stream']['source']['contentType'] = guess_mime_type(file_path) claim_dict['stream']['source']['contentType'] = guess_media_type(file_path)
claim_dict['stream']['source']['version'] = "_0_0_1" # need current version here claim_dict['stream']['source']['version'] = "_0_0_1" # need current version here
tx = await self.wallet.claim_name( tx = await self.wallet.claim_name(
self.account, name, bid, claim_dict, self.certificate, holding_address self.account, name, bid, claim_dict, self.certificate, holding_address

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

@ -151,9 +151,6 @@ types_map = {
} }
fallback_mime_type = 'application/octet-stream' def guess_media_type(path):
def guess_mime_type(path):
_, ext = os.path.splitext(path) _, ext = os.path.splitext(path)
return types_map.get(ext, fallback_mime_type) return types_map.get(ext, f'application/x-ext-{ext}')