forks/archivebox
1
0
Fork 0
Code Releases Activity

Merge branch 'dev'

Browse source
This commit is contained in:
Nick Sweeting 2021-01-08 15:26:49 +02:00
commit bfa5411a7c
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
archivebox/extractors/mercury.py
View file

@ -28,7 +28,7 @@ def ShellError(cmd: List[str], result: CompletedProcess, lines: int=20) -> Archi
# parse out last line of stderr # parse out last line of stderr
return ArchiveError( return ArchiveError(
f'Got {cmd[0]} response code: {result.returncode}).', f'Got {cmd[0]} response code: {result.returncode}).',
*( " ".join(
line.strip() line.strip()
for line in (result.stdout + result.stderr).decode().rsplit('\n', lines)[-lines:] for line in (result.stdout + result.stderr).decode().rsplit('\n', lines)[-lines:]
if line.strip() if line.strip()

4
archivebox/extractors/wget.py
View file

@ -180,5 +180,9 @@ def wget_output_path(link: Link) -> Optional[str]:
if str(search_dir) == link.link_dir: if str(search_dir) == link.link_dir:
break break
search_dir = Path(link.link_dir) / domain(link.url).replace(":", "+") / urldecode(full_path)
if not search_dir.is_dir():
return str(search_dir.relative_to(link.link_dir))
return None return None