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

Simplify

Browse source
This commit is contained in:
Miroslav Kovar 2019-10-08 22:43:11 +02:00 committed by Lex Berezhny
parent 268f6447cb
commit f92b610a03
3 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
lbry/lbry/stream/descriptor.py
View file

@ -48,24 +48,24 @@ def file_reader(file_path: str):
def sanitize_file_name(dirty_name: str): def sanitize_file_name(dirty_name: str):
RE_IL_CHARS = re.compile(r'[<>:"/\\\|\?\*]') exprs = [
RE_DOTS_AT_END = re.compile(r'[ \t]*(\.)+[ \t]$') '[<>:"/\\\|\?\*]+', # Illegal characters
RE_LEAD_TRAIL_SPACE = re.compile(r'(^[ \t]+|[ \t]+$)') '[\\x00-\\x1F]+', # All characters in range 0-31
res_il_names = \ '[ \t]*(\.)+[ \t]*$', # Dots at the end
[re.compile(regex) for regex in (r'^CON$', r'^PRN$', r'^AUX$', r'^NUL$', r'^COM[1-9]$', r'^LPT[1-9]$')] '(^[ \t]+|[ \t]+$)', # Leading and trailing whitespace
'^CON$', '^PRN$', '^AUX$', # Illegal names
'^NUL$', '^COM[1-9]$', '^LPT[1-9]$']
file_name = re.sub(RE_IL_CHARS, '', dirty_name) RES = re.compile('(' + '|'.join((expr for expr in exprs)) + ')')
file_name, ext = os.path.splitext(file_name)
file_name = re.sub(RE_LEAD_TRAIL_SPACE, '', file_name)
file_name = re.sub(RE_DOTS_AT_END, '', file_name)
ext = re.sub(RE_LEAD_TRAIL_SPACE, '', ext)
if any((REGEX.match(file_name) for REGEX in res_il_names)):
file_name = ''
elif file_name and len(ext) > 1:
file_name += ext
if len(file_name) == 0: file_name, ext = os.path.splitext(dirty_name)
file_name = re.sub(RES, '', file_name)
ext = re.sub(RES, '', ext)
if not file_name:
log.warning('Unable to suggest a file name for %s', dirty_name) log.warning('Unable to suggest a file name for %s', dirty_name)
elif len(ext) > 1:
file_name += ext
return file_name return file_name

2
lbry/tests/unit/stream/test_managed_stream.py
View file

@ -46,7 +46,7 @@ class TestManagedStream(BlobExchangeTestBase):
self.stream = ManagedStream( self.stream = ManagedStream(
self.loop, self.client_config, self.client_blob_manager, self.sd_hash, self.client_dir self.loop, self.client_config, self.client_blob_manager, self.sd_hash, self.client_dir
) )
await self._test_transfer_stream(1, skip_setup=True) await self._test_transfer_stream(10, skip_setup=True)
self.assertTrue(self.stream.completed) self.assertTrue(self.stream.completed)
self.assertEqual(self.stream.file_name, 'tt_f') self.assertEqual(self.stream.file_name, 'tt_f')
self.assertTrue(self.stream.output_file_exists) self.assertTrue(self.stream.output_file_exists)

4
lbry/tests/unit/stream/test_stream_descriptor.py
View file

@ -79,8 +79,8 @@ class TestStreamDescriptor(AsyncioTestCase):
await self._test_invalid_sd() await self._test_invalid_sd()
async def test_sanitize_file_name(self): async def test_sanitize_file_name(self):
test_cases = [' t/-?t|.g.ext ', 'end_me .', '', '.file', 'test name.ext', 'COM8', 'LPT2'] test_cases = [' t/-?t|.g.ext ', 'end_dot .', '.file\0\0', 'test n\16ame.ext', 'COM8', 'LPT2', '']
expected = ['t-t.g.ext', 'end_me', '', '.file', 'test name.ext', '', ''] expected = ['t-t.g.ext', 'end_dot', '.file', 'test name.ext', '', '', '']
actual = [sanitize_file_name(tc) for tc in test_cases] actual = [sanitize_file_name(tc) for tc in test_cases]
self.assertListEqual(actual, expected) self.assertListEqual(actual, expected)