mirror of
https://github.com/ArchiveBox/ArchiveBox.git
synced 2026-04-03 06:17:53 +10:00
move logging_util into archivebox.misc subfolder
This commit is contained in:
@@ -5,8 +5,8 @@ from pathlib import Path
|
||||
from typing import Optional, List, Dict, Tuple
|
||||
from collections import defaultdict
|
||||
|
||||
from archivebox.logging_util import TimedProgress
|
||||
from archivebox.index.schema import Link, ArchiveResult, ArchiveOutput, ArchiveError
|
||||
from archivebox.misc.logging_util import TimedProgress
|
||||
from archivebox.misc.system import run, chmod_file
|
||||
from archivebox.misc.util import enforce_types, is_static_file, dedupe
|
||||
|
||||
|
||||
@@ -10,9 +10,9 @@ from abx_plugin_default_binproviders import env
|
||||
|
||||
from archivebox.config import CONSTANTS
|
||||
from archivebox.config.common import ARCHIVING_CONFIG, SHELL_CONFIG
|
||||
from archivebox.misc.logging import STDERR
|
||||
from archivebox.misc.util import dedupe
|
||||
from archivebox.logging_util import pretty_path
|
||||
from archivebox.misc.logging import STDERR
|
||||
from archivebox.misc.logging_util import pretty_path
|
||||
|
||||
|
||||
CHROMIUM_BINARY_NAMES_LINUX = [
|
||||
|
||||
@@ -5,11 +5,8 @@ from typing import Optional
|
||||
|
||||
from archivebox.index.schema import Link, ArchiveResult, ArchiveOutput, ArchiveError
|
||||
from archivebox.misc.system import run, chmod_file, atomic_write
|
||||
from archivebox.misc.util import (
|
||||
enforce_types,
|
||||
is_static_file,
|
||||
)
|
||||
from archivebox.logging_util import TimedProgress
|
||||
from archivebox.misc.util import enforce_types, is_static_file
|
||||
from archivebox.misc.logging_util import TimedProgress
|
||||
|
||||
from .config import CHROME_CONFIG
|
||||
from .binaries import CHROME_BINARY
|
||||
|
||||
@@ -4,12 +4,9 @@ from pathlib import Path
|
||||
from typing import Optional
|
||||
|
||||
from archivebox.misc.system import run, chmod_file
|
||||
from archivebox.misc.util import (
|
||||
enforce_types,
|
||||
is_static_file,
|
||||
)
|
||||
from archivebox.misc.util import enforce_types, is_static_file
|
||||
from archivebox.index.schema import Link, ArchiveResult, ArchiveOutput, ArchiveError
|
||||
from archivebox.logging_util import TimedProgress
|
||||
from archivebox.misc.logging_util import TimedProgress
|
||||
|
||||
from .config import CHROME_CONFIG
|
||||
from .binaries import CHROME_BINARY
|
||||
|
||||
@@ -5,8 +5,8 @@ from typing import Optional
|
||||
|
||||
from archivebox.misc.system import run, chmod_file
|
||||
from archivebox.misc.util import enforce_types, is_static_file
|
||||
from archivebox.misc.logging_util import TimedProgress
|
||||
from archivebox.index.schema import Link, ArchiveResult, ArchiveOutput, ArchiveError
|
||||
from archivebox.logging_util import TimedProgress
|
||||
|
||||
from .config import CHROME_CONFIG
|
||||
from .binaries import CHROME_BINARY
|
||||
|
||||
@@ -4,14 +4,10 @@ from pathlib import Path
|
||||
|
||||
from typing import Optional
|
||||
|
||||
from archivebox.logging_util import TimedProgress
|
||||
from archivebox.index.schema import Link, ArchiveResult, ArchiveOutput
|
||||
from archivebox.misc.system import atomic_write
|
||||
from archivebox.misc.util import (
|
||||
enforce_types,
|
||||
get_headers,
|
||||
dedupe,
|
||||
)
|
||||
from archivebox.misc.util import enforce_types, get_headers, dedupe
|
||||
from archivebox.misc.logging_util import TimedProgress
|
||||
|
||||
from .binaries import CURL_BINARY
|
||||
from .config import CURL_CONFIG
|
||||
|
||||
@@ -4,8 +4,8 @@ from pathlib import Path
|
||||
|
||||
from archivebox.misc.system import chmod_file, run
|
||||
from archivebox.misc.util import enforce_types, domain, dedupe
|
||||
from archivebox.misc.logging_util import TimedProgress
|
||||
from archivebox.index.schema import Link, ArchiveResult, ArchiveOutput
|
||||
from archivebox.logging_util import TimedProgress
|
||||
|
||||
from abx_plugin_curl.config import CURL_CONFIG
|
||||
from abx_plugin_curl.binaries import CURL_BINARY
|
||||
|
||||
@@ -13,7 +13,7 @@ from archivebox.misc.util import (
|
||||
without_query,
|
||||
without_fragment,
|
||||
)
|
||||
from archivebox.logging_util import TimedProgress
|
||||
from archivebox.misc.logging_util import TimedProgress
|
||||
from archivebox.index.schema import Link, ArchiveResult, ArchiveOutput, ArchiveError
|
||||
|
||||
from abx_plugin_git.config import GIT_CONFIG
|
||||
|
||||
@@ -9,7 +9,7 @@ from archivebox.config import VERSION
|
||||
from archivebox.config.common import ARCHIVING_CONFIG
|
||||
from archivebox.misc.system import atomic_write
|
||||
from archivebox.misc.util import enforce_types, is_static_file
|
||||
from archivebox.logging_util import TimedProgress
|
||||
from archivebox.misc.logging_util import TimedProgress
|
||||
from archivebox.index.schema import Link, ArchiveResult, ArchiveError
|
||||
|
||||
from abx_plugin_title.extractor import get_html
|
||||
|
||||
@@ -6,13 +6,10 @@ from subprocess import CompletedProcess
|
||||
from typing import Optional, List
|
||||
import json
|
||||
|
||||
from archivebox.logging_util import TimedProgress
|
||||
from archivebox.misc.logging_util import TimedProgress
|
||||
from archivebox.index.schema import Link, ArchiveResult, ArchiveError
|
||||
from archivebox.misc.system import run, atomic_write
|
||||
from archivebox.misc.util import (
|
||||
enforce_types,
|
||||
is_static_file,
|
||||
)
|
||||
from archivebox.misc.util import enforce_types, is_static_file
|
||||
from .config import MERCURY_CONFIG
|
||||
from .binaries import MERCURY_BINARY
|
||||
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
__package__ = 'abx_plugin_readability'
|
||||
|
||||
import json
|
||||
from pathlib import Path
|
||||
from tempfile import NamedTemporaryFile
|
||||
|
||||
from typing import Optional
|
||||
import json
|
||||
|
||||
from archivebox.misc.system import run, atomic_write
|
||||
from archivebox.misc.util import enforce_types, is_static_file
|
||||
from archivebox.index.schema import Link, ArchiveResult, ArchiveError
|
||||
from archivebox.logging_util import TimedProgress
|
||||
from archivebox.misc.logging_util import TimedProgress
|
||||
|
||||
from abx_plugin_title.extractor import get_html
|
||||
|
||||
from .config import READABILITY_CONFIG
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
__package__ = 'abx_plugin_singlefile'
|
||||
|
||||
from pathlib import Path
|
||||
|
||||
from typing import Optional
|
||||
import json
|
||||
from pathlib import Path
|
||||
from typing import Optional
|
||||
|
||||
from archivebox.index.schema import Link, ArchiveResult, ArchiveError
|
||||
from archivebox.misc.system import run, chmod_file
|
||||
from archivebox.misc.util import enforce_types, is_static_file, dedupe
|
||||
from archivebox.logging_util import TimedProgress
|
||||
from archivebox.misc.logging_util import TimedProgress
|
||||
|
||||
from abx_plugin_chrome.config import CHROME_CONFIG
|
||||
from abx_plugin_chrome.binaries import CHROME_BINARY
|
||||
|
||||
from .config import SINGLEFILE_CONFIG
|
||||
from .binaries import SINGLEFILE_BINARY
|
||||
|
||||
|
||||
@@ -6,13 +6,9 @@ from pathlib import Path
|
||||
from typing import Optional
|
||||
|
||||
from archivebox.index.schema import Link, ArchiveResult, ArchiveOutput, ArchiveError
|
||||
from archivebox.logging_util import TimedProgress
|
||||
from archivebox.misc.util import (
|
||||
enforce_types,
|
||||
download_url,
|
||||
htmldecode,
|
||||
dedupe,
|
||||
)
|
||||
from archivebox.misc.logging_util import TimedProgress
|
||||
from archivebox.misc.util import enforce_types, download_url, htmldecode, dedupe)
|
||||
|
||||
from abx_plugin_curl.config import CURL_CONFIG
|
||||
from abx_plugin_curl.binaries import CURL_BINARY
|
||||
|
||||
|
||||
@@ -2,13 +2,12 @@ __package__ = 'abx_plugin_wget'
|
||||
|
||||
import re
|
||||
import os
|
||||
from pathlib import Path
|
||||
|
||||
from typing import Optional
|
||||
from pathlib import Path
|
||||
from datetime import datetime, timezone
|
||||
|
||||
from archivebox.logging_util import TimedProgress
|
||||
from archivebox.index.schema import Link, ArchiveResult, ArchiveOutput, ArchiveError
|
||||
from archivebox.misc.logging_util import TimedProgress
|
||||
from archivebox.misc.system import run, chmod_file
|
||||
from archivebox.misc.util import (
|
||||
enforce_types,
|
||||
@@ -19,6 +18,7 @@ from archivebox.misc.util import (
|
||||
urldecode,
|
||||
dedupe,
|
||||
)
|
||||
|
||||
from .config import WGET_CONFIG
|
||||
from .binaries import WGET_BINARY
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@ from typing import Optional
|
||||
from archivebox.misc.system import run, chmod_file
|
||||
from archivebox.misc.util import enforce_types, is_static_file, dedupe
|
||||
from archivebox.index.schema import Link, ArchiveResult, ArchiveOutput, ArchiveError
|
||||
from archivebox.logging_util import TimedProgress
|
||||
from archivebox.misc.logging_util import TimedProgress
|
||||
|
||||
from .config import YTDLP_CONFIG
|
||||
from .binaries import YTDLP_BINARY
|
||||
|
||||
Reference in New Issue
Block a user