From 57d42339a482540c55ffef70e78ad687049b2a19 Mon Sep 17 00:00:00 2001 From: Nick Sweeting Date: Mon, 31 Dec 2018 20:53:01 -0500 Subject: [PATCH] rename pip dir archive to archivebox --- Dockerfile | 14 +++++++------- {archiver => archivebox}/__init__.py | 0 {archiver => archivebox}/archive.py | 0 {archiver => archivebox}/archive_methods.py | 0 {archiver => archivebox}/config.py | 2 +- {archiver => archivebox}/index.py | 0 {archiver => archivebox}/links.py | 0 {archiver => archivebox}/parse.py | 0 {archiver => archivebox}/peekable.py | 0 {archiver => archivebox}/purge.py | 0 {archiver => archivebox}/requirements.txt | 0 {archiver => archivebox}/templates/index.html | 0 {archiver => archivebox}/templates/index_row.html | 0 .../templates/link_index.html | 0 .../templates/link_index_fancy.html | 0 .../templates/static/archive.png | Bin .../templates/static/external.png | Bin .../templates/static/jquery.dataTables.min.css | 0 .../templates/static/jquery.dataTables.min.js | 0 .../templates/static/jquery.min.js | 0 .../templates/static/sort_asc.png | Bin .../templates/static/sort_both.png | Bin .../templates/static/sort_desc.png | Bin .../templates/static/spinner.gif | Bin .../tests/firefox_export.html | 0 .../tests/pinboard_export.json | 0 {archiver => archivebox}/tests/pocket_export.html | 0 {archiver => archivebox}/tests/rss_export.xml | 0 {archiver => archivebox}/tests/tests.py | 0 {archiver => archivebox}/util.py | 2 +- 30 files changed, 9 insertions(+), 9 deletions(-) rename {archiver => archivebox}/__init__.py (100%) rename {archiver => archivebox}/archive.py (100%) rename {archiver => archivebox}/archive_methods.py (100%) rename {archiver => archivebox}/config.py (98%) rename {archiver => archivebox}/index.py (100%) rename {archiver => archivebox}/links.py (100%) rename {archiver => archivebox}/parse.py (100%) rename {archiver => archivebox}/peekable.py (100%) rename {archiver => archivebox}/purge.py (100%) rename {archiver => archivebox}/requirements.txt (100%) rename {archiver => archivebox}/templates/index.html (100%) rename {archiver => archivebox}/templates/index_row.html (100%) rename {archiver => archivebox}/templates/link_index.html (100%) rename {archiver => archivebox}/templates/link_index_fancy.html (100%) rename {archiver => archivebox}/templates/static/archive.png (100%) rename {archiver => archivebox}/templates/static/external.png (100%) rename {archiver => archivebox}/templates/static/jquery.dataTables.min.css (100%) rename {archiver => archivebox}/templates/static/jquery.dataTables.min.js (100%) rename {archiver => archivebox}/templates/static/jquery.min.js (100%) rename {archiver => archivebox}/templates/static/sort_asc.png (100%) rename {archiver => archivebox}/templates/static/sort_both.png (100%) rename {archiver => archivebox}/templates/static/sort_desc.png (100%) rename {archiver => archivebox}/templates/static/spinner.gif (100%) rename {archiver => archivebox}/tests/firefox_export.html (100%) rename {archiver => archivebox}/tests/pinboard_export.json (100%) rename {archiver => archivebox}/tests/pocket_export.html (100%) rename {archiver => archivebox}/tests/rss_export.xml (100%) rename {archiver => archivebox}/tests/tests.py (100%) rename {archiver => archivebox}/util.py (99%) diff --git a/Dockerfile b/Dockerfile index 19e2bd51..907c0d05 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM debian:stretch -LABEL maintainer="Nick Sweeting " +LABEL maintainer="Nick Sweeting " RUN apt-get update \ && apt-get install -qy git wget gnupg2 libgconf-2-4 python3 python3-pip \ @@ -21,22 +21,22 @@ RUN apt-get update && apt-get install -y curl --no-install-recommends \ # RUN chmod +x /usr/local/bin/dumb-init RUN git clone https://github.com/pirate/ArchiveBox /home/chromeuser/app \ - && pip3 install -r /home/chromeuser/app/archiver/requirements.txt + && pip3 install -r /home/chromeuser/app/archivebox/requirements.txt # Add user so we area strong, independent chrome that don't need --no-sandbox. RUN groupadd -r chromeuser && useradd -r -g chromeuser -G audio,video chromeuser \ - && mkdir -p /home/chromeuser/app/archiver/output \ - && chown -R chromeuser:chromeuser /home/chromeuser/app/archiver/output \ + && mkdir -p /home/chromeuser/app/archivebox/output \ + && chown -R chromeuser:chromeuser /home/chromeuser/app/archivebox/output \ && chown -R chromeuser:chromeuser /home/chromeuser -VOLUME /home/chromeuser/app/archiver/output +VOLUME /home/chromeuser/app/archivebox/output ENV LANG=en_US.UTF-8 \ LANGUAGE=en_US:en \ LC_ALL=en_US.UTF-8 \ PYTHONIOENCODING=UTF-8 \ CHROME_SANDBOX=False \ - OUTPUT_DIR=/home/chromeuser/app/archiver/output + OUTPUT_DIR=/home/chromeuser/app/archivebox/output # Run everything from here on out as non-privileged user USER chromeuser @@ -45,4 +45,4 @@ WORKDIR /home/chromeuser/app # ENTRYPOINT ["dumb-init", "--"] # CMD ["/home/chromeuser/app/archive"] -ENTRYPOINT ["python3", "-u", "/home/chromeuser/app/archiver/archive.py"] +ENTRYPOINT ["python3", "-u", "/home/chromeuser/app/archivebox/archive.py"] diff --git a/archiver/__init__.py b/archivebox/__init__.py similarity index 100% rename from archiver/__init__.py rename to archivebox/__init__.py diff --git a/archiver/archive.py b/archivebox/archive.py similarity index 100% rename from archiver/archive.py rename to archivebox/archive.py diff --git a/archiver/archive_methods.py b/archivebox/archive_methods.py similarity index 100% rename from archiver/archive_methods.py rename to archivebox/archive_methods.py diff --git a/archiver/config.py b/archivebox/config.py similarity index 98% rename from archiver/config.py rename to archivebox/config.py index a8a5f7c0..d13ac931 100644 --- a/archiver/config.py +++ b/archivebox/config.py @@ -40,7 +40,7 @@ OUTPUT_DIR = os.getenv('OUTPUT_DIR', os.path.join(REPO_DIR, 'output')) ARCHIVE_DIR = os.path.join(OUTPUT_DIR, 'archive') SOURCES_DIR = os.path.join(OUTPUT_DIR, 'sources') -PYTHON_PATH = os.path.join(REPO_DIR, 'archiver') +PYTHON_PATH = os.path.join(REPO_DIR, 'archivebox') TEMPLATES_DIR = os.path.join(PYTHON_PATH, 'templates') # ****************************************************************************** diff --git a/archiver/index.py b/archivebox/index.py similarity index 100% rename from archiver/index.py rename to archivebox/index.py diff --git a/archiver/links.py b/archivebox/links.py similarity index 100% rename from archiver/links.py rename to archivebox/links.py diff --git a/archiver/parse.py b/archivebox/parse.py similarity index 100% rename from archiver/parse.py rename to archivebox/parse.py diff --git a/archiver/peekable.py b/archivebox/peekable.py similarity index 100% rename from archiver/peekable.py rename to archivebox/peekable.py diff --git a/archiver/purge.py b/archivebox/purge.py similarity index 100% rename from archiver/purge.py rename to archivebox/purge.py diff --git a/archiver/requirements.txt b/archivebox/requirements.txt similarity index 100% rename from archiver/requirements.txt rename to archivebox/requirements.txt diff --git a/archiver/templates/index.html b/archivebox/templates/index.html similarity index 100% rename from archiver/templates/index.html rename to archivebox/templates/index.html diff --git a/archiver/templates/index_row.html b/archivebox/templates/index_row.html similarity index 100% rename from archiver/templates/index_row.html rename to archivebox/templates/index_row.html diff --git a/archiver/templates/link_index.html b/archivebox/templates/link_index.html similarity index 100% rename from archiver/templates/link_index.html rename to archivebox/templates/link_index.html diff --git a/archiver/templates/link_index_fancy.html b/archivebox/templates/link_index_fancy.html similarity index 100% rename from archiver/templates/link_index_fancy.html rename to archivebox/templates/link_index_fancy.html diff --git a/archiver/templates/static/archive.png b/archivebox/templates/static/archive.png similarity index 100% rename from archiver/templates/static/archive.png rename to archivebox/templates/static/archive.png diff --git a/archiver/templates/static/external.png b/archivebox/templates/static/external.png similarity index 100% rename from archiver/templates/static/external.png rename to archivebox/templates/static/external.png diff --git a/archiver/templates/static/jquery.dataTables.min.css b/archivebox/templates/static/jquery.dataTables.min.css similarity index 100% rename from archiver/templates/static/jquery.dataTables.min.css rename to archivebox/templates/static/jquery.dataTables.min.css diff --git a/archiver/templates/static/jquery.dataTables.min.js b/archivebox/templates/static/jquery.dataTables.min.js similarity index 100% rename from archiver/templates/static/jquery.dataTables.min.js rename to archivebox/templates/static/jquery.dataTables.min.js diff --git a/archiver/templates/static/jquery.min.js b/archivebox/templates/static/jquery.min.js similarity index 100% rename from archiver/templates/static/jquery.min.js rename to archivebox/templates/static/jquery.min.js diff --git a/archiver/templates/static/sort_asc.png b/archivebox/templates/static/sort_asc.png similarity index 100% rename from archiver/templates/static/sort_asc.png rename to archivebox/templates/static/sort_asc.png diff --git a/archiver/templates/static/sort_both.png b/archivebox/templates/static/sort_both.png similarity index 100% rename from archiver/templates/static/sort_both.png rename to archivebox/templates/static/sort_both.png diff --git a/archiver/templates/static/sort_desc.png b/archivebox/templates/static/sort_desc.png similarity index 100% rename from archiver/templates/static/sort_desc.png rename to archivebox/templates/static/sort_desc.png diff --git a/archiver/templates/static/spinner.gif b/archivebox/templates/static/spinner.gif similarity index 100% rename from archiver/templates/static/spinner.gif rename to archivebox/templates/static/spinner.gif diff --git a/archiver/tests/firefox_export.html b/archivebox/tests/firefox_export.html similarity index 100% rename from archiver/tests/firefox_export.html rename to archivebox/tests/firefox_export.html diff --git a/archiver/tests/pinboard_export.json b/archivebox/tests/pinboard_export.json similarity index 100% rename from archiver/tests/pinboard_export.json rename to archivebox/tests/pinboard_export.json diff --git a/archiver/tests/pocket_export.html b/archivebox/tests/pocket_export.html similarity index 100% rename from archiver/tests/pocket_export.html rename to archivebox/tests/pocket_export.html diff --git a/archiver/tests/rss_export.xml b/archivebox/tests/rss_export.xml similarity index 100% rename from archiver/tests/rss_export.xml rename to archivebox/tests/rss_export.xml diff --git a/archiver/tests/tests.py b/archivebox/tests/tests.py similarity index 100% rename from archiver/tests/tests.py rename to archivebox/tests/tests.py diff --git a/archiver/util.py b/archivebox/util.py similarity index 99% rename from archiver/util.py rename to archivebox/util.py index 5ad51a1e..11cc755f 100644 --- a/archiver/util.py +++ b/archivebox/util.py @@ -174,7 +174,7 @@ def progress(seconds=TIMEOUT, prefix=''): return end def pretty_path(path): - """convert paths like .../ArchiveBox/archiver/../output/abc into output/abc""" + """convert paths like .../ArchiveBox/archivebox/../output/abc into output/abc""" return path.replace(REPO_DIR + '/', '')