diff --git a/archivebox/index/__init__.py b/archivebox/index/__init__.py index 890777c8..9e460dc7 100644 --- a/archivebox/index/__init__.py +++ b/archivebox/index/__init__.py @@ -221,7 +221,7 @@ def timed_index_update(out_path: Path): @enforce_types -def write_main_index(links: List[Link], out_dir: Path=OUTPUT_DIR, finished: bool=False) -> None: +def write_main_index(links: List[Link], out_dir: Path=OUTPUT_DIR) -> None: """Writes links to sqlite3 file for a given list of links""" log_indexing_process_started(len(links)) diff --git a/archivebox/index/html.py b/archivebox/index/html.py index 793a60af..8b37c142 100644 --- a/archivebox/index/html.py +++ b/archivebox/index/html.py @@ -49,27 +49,15 @@ def parse_html_main_index(out_dir: Path=OUTPUT_DIR) -> Iterator[str]: yield line.split('"')[1] return () -@enforce_types -def write_html_main_index(links: List[Link], out_dir: Path=OUTPUT_DIR, finished: bool=False) -> None: - """write the html link index to a given path""" - - copy_and_overwrite(str(Path(TEMPLATES_DIR) / FAVICON_FILENAME), str(out_dir / FAVICON_FILENAME)) - copy_and_overwrite(str(Path(TEMPLATES_DIR) / ROBOTS_TXT_FILENAME), str(out_dir / ROBOTS_TXT_FILENAME)) - copy_and_overwrite(str(Path(TEMPLATES_DIR) / STATIC_DIR_NAME), str(out_dir / STATIC_DIR_NAME)) - - rendered_html = main_index_template(links, finished=finished) - atomic_write(str(out_dir / HTML_INDEX_FILENAME), rendered_html) - @enforce_types -def main_index_template(links: List[Link], finished: bool=True, template: str=MAIN_INDEX_TEMPLATE) -> str: +def main_index_template(links: List[Link], template: str=MAIN_INDEX_TEMPLATE) -> str: """render the template for the entire main index""" return render_legacy_template(template, { 'version': VERSION, 'git_sha': GIT_SHA, 'num_links': str(len(links)), - 'status': 'finished' if finished else 'running', 'date_updated': datetime.now().strftime('%Y-%m-%d'), 'time_updated': datetime.now().strftime('%Y-%m-%d %H:%M'), 'rows': '\n'.join( diff --git a/archivebox/logging_util.py b/archivebox/logging_util.py index aa4659f0..8648e0a4 100644 --- a/archivebox/logging_util.py +++ b/archivebox/logging_util.py @@ -501,10 +501,10 @@ def printable_folders(folders: Dict[str, Optional["Link"]], elif html: from .index.html import main_index_template if with_headers: - output = main_index_template(links, True) + output = main_index_template(links) else: from .index.html import MINIMAL_INDEX_TEMPLATE - output = main_index_template(links, True, MINIMAL_INDEX_TEMPLATE) + output = main_index_template(links, template=MINIMAL_INDEX_TEMPLATE) return output elif csv: from .index.csv import links_to_csv diff --git a/archivebox/main.py b/archivebox/main.py index c3ffcc0b..94658a8f 100644 --- a/archivebox/main.py +++ b/archivebox/main.py @@ -376,7 +376,7 @@ def init(force: bool=False, out_dir: Path=OUTPUT_DIR) -> None: print(' archivebox list --status=invalid') - write_main_index(list(pending_links.values()), out_dir=out_dir, finished=True) + write_main_index(list(pending_links.values()), out_dir=out_dir) print('\n{green}------------------------------------------------------------------{reset}'.format(**ANSI)) if existing_index: @@ -565,7 +565,7 @@ def add(urls: Union[str, List[str]], imported_links = list({link.url: link for link in (new_links + new_links_depth)}.values()) new_links = dedupe_links(all_links, imported_links) - write_main_index(links=new_links, out_dir=out_dir, finished=not new_links) + write_main_index(links=new_links, out_dir=out_dir) all_links = load_main_index(out_dir=out_dir) if index_only: @@ -583,7 +583,7 @@ def add(urls: Union[str, List[str]], archive_links(imported_links, overwrite=True, **archive_kwargs) elif new_links: archive_links(new_links, overwrite=False, **archive_kwargs) - + return all_links @enforce_types diff --git a/archivebox/themes/default/base.html b/archivebox/themes/default/base.html index fe1fee08..84be962f 100644 --- a/archivebox/themes/default/base.html +++ b/archivebox/themes/default/base.html @@ -187,13 +187,6 @@ display: none; } - body[data-status~=finished] .files-spinner { - display: none; - } - - /*body[data-status~=running] .in-progress { - display: inline-block; - }*/ tr td a.favicon img { padding-left: 6px; padding-right: 12px; diff --git a/archivebox/themes/default/core/snapshot_list.html b/archivebox/themes/default/core/snapshot_list.html index a5beceb8..20d3cd66 100644 --- a/archivebox/themes/default/core/snapshot_list.html +++ b/archivebox/themes/default/core/snapshot_list.html @@ -2,63 +2,63 @@ {% load static %} {% block body %} -
-
- - - -
- - +
+ + + + + +
+ + + + + + + + + + {% for link in object_list %} - - - - + + + + - - - {% for link in object_list %} - - - - - - - {% endfor %} - -
BookmarkedSaved Link ({{num_links}})FilesOriginal URL
BookmarkedSaved Link ({{num_links}})FilesOriginal URL{{link.added}} + {% if link.is_archived %} + + {% else %} + + {% endif %} + + {{link.title|default:'Loading...'}} + {{link.tags_str}} + + + {{link.icons}} + + {{link.url}} +
{{link.added}} - {% if link.is_archived %} - - {% else %} - - {% endif %} - - {{link.title|default:'Loading...'}} - {{link.tags_str}} - - - 📄 - {{link.icons}} - - {{link.url}}
-
- - {% if page_obj.has_previous %} - « first - previous - {% endif %} - - - Page {{ page_obj.number }} of {{ page_obj.paginator.num_pages }}. - - - {% if page_obj.has_next %} - next - last » - {% endif %} + {% endfor %} + + +
+ + {% if page_obj.has_previous %} + « first + previous + {% endif %} + + + Page {{ page_obj.number }} of {{ page_obj.paginator.num_pages }}. -
+ + {% if page_obj.has_next %} + next + last » + {% endif %} + +
- {% endblock %} +{% endblock %} diff --git a/archivebox/themes/default/main_index.html b/archivebox/themes/default/main_index.html index d5135688..11c6a9a8 100644 --- a/archivebox/themes/default/main_index.html +++ b/archivebox/themes/default/main_index.html @@ -161,12 +161,6 @@ .in-progress { display: none; } - body[data-status~=finished] .files-spinner { - display: none; - } - /*body[data-status~=running] .in-progress { - display: inline-block; - }*/ tr td a.favicon img { padding-left: 6px; padding-right: 12px; @@ -210,7 +204,7 @@ }); - +
@@ -248,13 +242,13 @@ {% endif %} - {{link.title|default:'Loading...'}} + {{link.title|default:'Loading...'}} {{link.tags|default:''}} 📄 - {{link.num_outputs}} + {{link.num_outputs}} {{link.url}} diff --git a/archivebox/themes/default/static/admin.css b/archivebox/themes/default/static/admin.css index 2a8d7d0d..181c06de 100644 --- a/archivebox/themes/default/static/admin.css +++ b/archivebox/themes/default/static/admin.css @@ -91,6 +91,7 @@ body.model-snapshot.change-list #content .object-tools { padding: 0px; background: none; margin-right: 0px; + width: auto; } #content #changelist .actions .button { diff --git a/archivebox/themes/legacy/main_index.html b/archivebox/themes/legacy/main_index.html index 2ed6dfaa..e337c316 100644 --- a/archivebox/themes/legacy/main_index.html +++ b/archivebox/themes/legacy/main_index.html @@ -127,12 +127,6 @@ .in-progress { display: none; } - body[data-status~=finished] .files-spinner { - display: none; - } - /*body[data-status~=running] .in-progress { - display: inline-block; - }*/ tr td a.favicon img { padding-left: 6px; padding-right: 12px; @@ -176,7 +170,7 @@ }); - +
diff --git a/archivebox/themes/legacy/main_index_row.html b/archivebox/themes/legacy/main_index_row.html index a9037f83..9112eace 100644 --- a/archivebox/themes/legacy/main_index_row.html +++ b/archivebox/themes/legacy/main_index_row.html @@ -9,7 +9,7 @@ 📄 - $num_outputs + $num_outputs $url