CodeMirror/ArchiveBox
1
0
Fork 0
mirror of synced 2024-06-28 11:00:35 +12:00
Code Issues Projects Releases Wiki Activity

refactor: favicon uses snapshot instead of link

Browse source
This commit is contained in:
Cristian 2020-12-29 14:07:15 -05:00
parent d1326c3660
commit eac29e3a7a
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
archivebox/extractors/favicon.py
View file

@ -4,6 +4,8 @@ from pathlib import Path
from typing import Optional from typing import Optional
from django.db.models import Model
from ..index.schema import Link, ArchiveResult, ArchiveOutput from ..index.schema import Link, ArchiveResult, ArchiveOutput
from ..system import chmod_file, run from ..system import chmod_file, run
from ..util import enforce_types, domain from ..util import enforce_types, domain
@ -20,18 +22,18 @@ from ..logging_util import TimedProgress
@enforce_types @enforce_types
def should_save_favicon(link: Link, out_dir: Optional[str]=None) -> bool: def should_save_favicon(snapshot: Model, out_dir: Optional[str]=None) -> bool:
out_dir = out_dir or link.link_dir out_dir = out_dir or snapshot.snapshot_dir
if (Path(out_dir) / 'favicon.ico').exists(): if (Path(out_dir) / 'favicon.ico').exists():
return False return False
return SAVE_FAVICON return SAVE_FAVICON
@enforce_types @enforce_types
def save_favicon(link: Link, out_dir: Optional[Path]=None, timeout: int=TIMEOUT) -> ArchiveResult: def save_favicon(snapshot: Model, out_dir: Optional[Path]=None, timeout: int=TIMEOUT) -> ArchiveResult:
"""download site favicon from google's favicon api""" """download site favicon from google's favicon api"""
out_dir = out_dir or link.link_dir out_dir = out_dir or snapshot.snapshot_dir
output: ArchiveOutput = 'favicon.ico' output: ArchiveOutput = 'favicon.ico'
cmd = [ cmd = [
CURL_BINARY, CURL_BINARY,
@ -40,7 +42,7 @@ def save_favicon(link: Link, out_dir: Optional[Path]=None, timeout: int=TIMEOUT)
'--output', str(output), '--output', str(output),
*(['--user-agent', '{}'.format(CURL_USER_AGENT)] if CURL_USER_AGENT else []), *(['--user-agent', '{}'.format(CURL_USER_AGENT)] if CURL_USER_AGENT else []),
*([] if CHECK_SSL_VALIDITY else ['--insecure']), *([] if CHECK_SSL_VALIDITY else ['--insecure']),
'https://www.google.com/s2/favicons?domain={}'.format(domain(link.url)), 'https://www.google.com/s2/favicons?domain={}'.format(domain(snapshot.url)),
] ]
status = 'pending' status = 'pending'
timer = TimedProgress(timeout, prefix=' ') timer = TimedProgress(timeout, prefix=' ')