Skip to content

Commit

Permalink
refactor: Remove get_empty_snapshot queryset function and generate it…
Browse files Browse the repository at this point in the history
… directly
  • Loading branch information
cdvv7788 committed Dec 11, 2020
1 parent 81d766a commit a28547c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 9 deletions.
9 changes: 2 additions & 7 deletions archivebox/index/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -243,12 +243,6 @@ def write_main_index(links: List[Link], out_dir: Path=OUTPUT_DIR) -> None:

log_indexing_process_finished()

@enforce_types
def get_empty_snapshot_queryset(out_dir: Path=OUTPUT_DIR):
setup_django(out_dir, check_db=True)
from core.models import Snapshot
return Snapshot.objects.none()

@enforce_types
def load_main_index(out_dir: Path=OUTPUT_DIR, warn: bool=True) -> List[Link]:
"""parse and load existing index with any new links from import_path merged in"""
Expand Down Expand Up @@ -390,8 +384,9 @@ def search_filter(snapshots: QuerySet, filter_patterns: List[str], filter_type:
color='red',
)
raise SystemExit(2)
from core.models import Snapshot

qsearch = get_empty_snapshot_queryset()
qsearch = Snapshot.objects.none()
for pattern in filter_patterns:
try:
qsearch |= query_search_index(pattern)
Expand Down
4 changes: 2 additions & 2 deletions archivebox/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
from .system import get_dir_size, dedupe_cron_jobs, CRON_COMMENT
from .index import (
load_main_index,
get_empty_snapshot_queryset,
parse_links_from_source,
dedupe_links,
write_main_index,
Expand Down Expand Up @@ -265,6 +264,7 @@ def run(subcommand: str,
@enforce_types
def init(force: bool=False, out_dir: Path=OUTPUT_DIR) -> None:
"""Initialize a new ArchiveBox collection in the current directory"""
from core.models import Snapshot
Path(out_dir).mkdir(exist_ok=True)
is_empty = not len(set(os.listdir(out_dir)) - ALLOWED_IN_OUTPUT_DIR)

Expand Down Expand Up @@ -335,7 +335,7 @@ def init(force: bool=False, out_dir: Path=OUTPUT_DIR) -> None:
print()
print('{green}[*] Collecting links from any existing indexes and archive folders...{reset}'.format(**ANSI))

all_links = get_empty_snapshot_queryset()
all_links = Snapshot.objects.none()
pending_links: Dict[str, Link] = {}

if existing_index:
Expand Down

0 comments on commit a28547c

Please sign in to comment.