Tolerate failure to --write-link due to unknown URL

Closes #2724
This commit is contained in:
pukkandan 2022-02-18 17:53:09 +05:30
parent 8d93e69d67
commit 60f3e99592
No known key found for this signature in database
GPG key ID: 7EEE9E1E817D0A39

View file

@ -2908,9 +2908,11 @@ def process_info(self, info_dict):
# Write internet shortcut files # Write internet shortcut files
def _write_link_file(link_type): def _write_link_file(link_type):
if 'webpage_url' not in info_dict: url = try_get(info_dict['webpage_url'], iri_to_uri)
self.report_error('Cannot write internet shortcut file because the "webpage_url" field is missing in the media information') if not url:
return False self.report_warning(
f'Cannot write internet shortcut file because the actual URL of "{info_dict["webpage_url"]}" is unknown')
return True
linkfn = replace_extension(self.prepare_filename(info_dict, 'link'), link_type, info_dict.get('ext')) linkfn = replace_extension(self.prepare_filename(info_dict, 'link'), link_type, info_dict.get('ext'))
if not self._ensure_dir_exists(encodeFilename(linkfn)): if not self._ensure_dir_exists(encodeFilename(linkfn)):
return False return False
@ -2921,7 +2923,7 @@ def _write_link_file(link_type):
self.to_screen(f'[info] Writing internet shortcut (.{link_type}) to: {linkfn}') self.to_screen(f'[info] Writing internet shortcut (.{link_type}) to: {linkfn}')
with io.open(encodeFilename(to_high_limit_path(linkfn)), 'w', encoding='utf-8', with io.open(encodeFilename(to_high_limit_path(linkfn)), 'w', encoding='utf-8',
newline='\r\n' if link_type == 'url' else '\n') as linkfile: newline='\r\n' if link_type == 'url' else '\n') as linkfile:
template_vars = {'url': iri_to_uri(info_dict['webpage_url'])} template_vars = {'url': url}
if link_type == 'desktop': if link_type == 'desktop':
template_vars['filename'] = linkfn[:-(len(link_type) + 1)] template_vars['filename'] = linkfn[:-(len(link_type) + 1)]
linkfile.write(LINK_TEMPLATES[link_type] % template_vars) linkfile.write(LINK_TEMPLATES[link_type] % template_vars)