Merge pull request #621 from Serene-Arc/bug_fix_616
This commit is contained in:
commit
2c93537aea
@ -111,6 +111,9 @@ class FileNameFormatter:
|
||||
if not resource.extension:
|
||||
raise BulkDownloaderException(f'Resource from {resource.url} has no extension')
|
||||
file_name = str(self._format_name(resource.source_submission, self.file_format_string))
|
||||
|
||||
file_name = re.sub(r'\n', ' ', file_name)
|
||||
|
||||
if not re.match(r'.*\.$', file_name) and not re.match(r'^\..*', resource.extension):
|
||||
ending = index + '.' + resource.extension
|
||||
else:
|
||||
|
@ -16,6 +16,7 @@ from bdfr.file_name_formatter import FileNameFormatter
|
||||
from bdfr.resource import Resource
|
||||
from bdfr.site_downloaders.base_downloader import BaseDownloader
|
||||
from bdfr.site_downloaders.fallback_downloaders.ytdlp_fallback import YtdlpFallback
|
||||
from bdfr.site_downloaders.self_post import SelfPost
|
||||
|
||||
|
||||
@pytest.fixture()
|
||||
@ -406,6 +407,8 @@ def test_windows_max_path(tmp_path: Path):
|
||||
@pytest.mark.parametrize(('test_reddit_id', 'test_downloader', 'expected_names'), (
|
||||
('gphmnr', YtdlpFallback, {'He has a lot to say today.mp4'}),
|
||||
('d0oir2', YtdlpFallback, {"Crunk's finest moment. Welcome to the new subreddit!.mp4"}),
|
||||
('jiecu', SelfPost, {'Reston, VA Some info regarding shelters in the area..txt'}),
|
||||
('gui1i', SelfPost, {'The "Beer and Ear offer for those who need help in the \'burbs of North Dallas....txt'}),
|
||||
))
|
||||
def test_name_submission(
|
||||
test_reddit_id: str,
|
||||
@ -418,4 +421,4 @@ def test_name_submission(
|
||||
test_formatter = FileNameFormatter('{TITLE}', '', '')
|
||||
results = test_formatter.format_resource_paths(test_resources, Path('.'))
|
||||
results = set([r[0].name for r in results])
|
||||
assert expected_names == results
|
||||
assert results == expected_names
|
||||
|
Loading…
Reference in New Issue
Block a user