Merge branch 'master' into tags

.github/CONTRIBUTING.md

@@ -19,22 +19,18 @@
 ```bash
 git clone https://github.com/pirate/ArchiveBox
 cd ArchiveBox
-# Optionally create a virtualenv
-pip install -r requirements.txt
-pip install -e .
+# Ideally do this in a virtualenv
+pip install -e '.[dev]'  # or use: pipenv install --dev
 ```
 
 ### Running Tests
 
 ```bash
-./bin/archive tests/*
-# look for errors in stdout/stderr
-# then confirm output html looks right
-
-# if on >v0.4 run the django test suite:
-archivebox manage test
+./bin/lint.sh
+./bin/test.sh
+./bin/build.sh
 ```
 
 ### Getting Help
 
-Open issues on Github or contact me https://sweeting.me/#contact.
+Open issues on Github or message me https://sweeting.me/#contact.

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,10 +1,12 @@
-**IMPORTANT: Do not submit PRs with only formatting / PEP8 / line length changes, I will close them with great prejudice.  The PEP8 checks I don't follow are intentional. PRs for minor bugfixes, typos, etc are fine.**
+<!-- IMPORTANT: Do not submit PRs with only formatting / PEP8 / line length changes. -->
 
 # Summary
 
-e.g. This PR fixes ABC or adds the ability to do XYZ...
+<!--e.g. This PR fixes ABC or adds the ability to do XYZ...-->
 
-**Related issues: #XYZ** (delete this line if there are no related issues)
+# Related issues
+
+<!-- e.g. #123 or Roadmap goal # https://github.com/pirate/ArchiveBox/wiki/Roadmap -->
 
 # Changes these areas
 
@@ -13,9 +15,4 @@ e.g. This PR fixes ABC or adds the ability to do XYZ...
 - [ ] Command line interface
 - [ ] Configuration options
 - [ ] Internal architecture
-- [ ] Archived data layout on disk
-
-# Roadmap Goals
-
-This PR helps us move towards xyz roadmap goal, as outlined here: https://github.com/pirate/ArchiveBox/wiki/Roadmap
-(delete this section if it's just a bugfix / simple PR)
+- [ ] Snapshot data layout on disk

.github/workflows/test.yml

@@ -115,7 +115,7 @@ jobs:
         with:
           fetch-depth: 1
 
-      - uses: satackey/[email protected].4
+      - uses: satackey/[email protected].8
 
       - name: Build image
         run: |
@@ -137,7 +137,7 @@ jobs:
 
       - name: Add stdin link
         run: |
-          echo "http://www.test-nginx-2.local" | docker run -i -v "$PWD"/data:/data "$DOCKER_IMAGE" add
+          echo "http://www.test-nginx-2.local" | docker run -i --network host -v "$PWD"/data:/data archivebox add
 
       - name: List links
         run: |

README.md

@@ -26,31 +26,52 @@
 <hr/>
 </div>
 
-**ArchiveBox takes a list of website URLs you want to archive, and creates a local, static, browsable HTML clone of the content from those websites (it saves HTML, JS, media files, PDFs, images and more).**
+ArchiveBox is a powerful self-hosted internet archiving solution written in Python 3. You feed it URLs of pages you want to archive, and it saves them to disk in a varitety of formats depending on the configuration and the content it detects. ArchiveBox can be installed via [Docker](https://docs.docker.com/get-docker/) or [`pip3`](https://wiki.python.org/moin/BeginnersGuide/Download).
 
-You can use it to preserve access to websites you care about by storing them locally offline. ArchiveBox imports lists of URLs, renders the pages in a headless, authenticated, user-scriptable browser, and then archives the content in multiple redundant common formats (HTML, PDF, PNG, WARC) that will last long after the originals disappear off the internet. It automatically extracts assets and media from pages and saves them in easily-accessible folders, with out-of-the-box support for extracting git repositories, audio, video, subtitles, images, PDFs, and more.
+Once installed, URLs can be added via the command line `archivebox add` or the built-in Web UI `archivebox server`. It can ingest bookmarks from a service like Pocket/Pinboard, your entire browsing history, RSS feeds, or URLs one at a time.
 
-#### How does it work?
+The main index is a self-contained `data/index.sqlite3` file, and each snapshot is stored as a folder `data/archive/<timestamp>/`, with an easy-to-read `index.html` and `index.json` within. For each page, ArchiveBox auto-extracts many types of assets/media and saves them in standard formats, with out-of-the-box support for: 3 types of HTML snapshots (wget, Chrome headless, singlefile), a PDF snapshot, a screenshot, a WARC archive, git repositories, images, audio, video, subtitles, article text, and more. The snapshots are browseable and managable offline through the filesystem, the built-in webserver, or the Python API.
+
+
+#### Quickstart
 
 ```bash
-pip install archivebox
-mkdir data && cd data
-archivebox init
+docker run -d -it -v ~/archivebox:/data -p 8000:8000 nikisweeting/archivebox server --init 0.0.0.0:8000
+docker run -v ~/archivebox:/data -it nikisweeting/archivebox manage createsuperuser
+docker run -v ~/archivebox:/data -it nikisweeting/archivebox add 'https://example.com'
+
+open http://127.0.0.1:8000/admin/login/  # then click "Add" in the navbar
+```
 
-archivebox add 'https://example.com'
-archivebox add --depth=1 'https://example.com/table-of-contents.html'
-echo 'any text with https://example.com URLs in it' | archivebox add
+<div align="center">
+<img src="https://i.imgur.com/lUuicew.png" width="400px">
+<br/>
+
+[DEMO: archivebox.zervice.io/](https://archivebox.zervice.io)  
+For more information, see the [full Quickstart guide](https://github.com/pirate/ArchiveBox/wiki/Quickstart), [Usage](https://github.com/pirate/ArchiveBox/wiki/Usage), and [Configuration](https://github.com/pirate/ArchiveBox/wiki/Configuration) docs.
+</div>
 
-# open the static data/index.html, or use the interactive web GUI:
+---
+
+
+# Overview
+
+ArchiveBox is a command line tool, self-hostable web-archiving server, and Python library all-in-one. It's available as a Python3 package or a Docker image, both methods provide the same CLI, Web UI, and on-disk data format.
+
+It works on Docker, macOS, and Linux/BSD. Windows is not officially supported, but users have reported getting it working using the WSL2 + Docker.
+
+To use ArchiveBox you start by creating a folder for your data to live in (it can be anywhere on your system), and running `archivebox init` inside of it. That will create a sqlite3 index and an `ArchiveBox.conf` file. After that, you can continue to add/remove/search/import/export/manage/config/etc using the CLI `archivebox help`, or you can run the Web UI (recommended):
+```bash
+archivebox manage createsuperuser
 archivebox server 0.0.0.0:8000
+open http://127.0.0.1:8000
 ```
 
-After installing archivebox, just pass some new links to the `archivebox add` command to start your collection.
+The CLI is considered "stable", and the ArchiveBox Python API and REST APIs are in "beta".
 
-ArchiveBox is written in Python 3.7 and uses wget, Chrome headless, youtube-dl, pywb, and other common UNIX tools to save each page you add in multiple redundant formats. It doesn't require a constantly running server or backend (though it does include an optional one), just open the generated `data/index.html` in a browser to view the archive or run `archivebox server` to use the interactive Web UI. It can import and export links as JSON (among other formats), so it's easy to script or hook up to other APIs. If you run it on a schedule and import from browser history or bookmarks regularly, you can sleep soundly knowing that the slice of the internet you care about will be automatically preserved in multiple, durable long-term formats that will be accessible for decades (or longer).
+At the end of the day, the goal is to sleep soundly knowing that the part of the internet you care about will be automatically preserved in multiple, durable long-term formats that will be accessible for decades (or longer). You can also self-host your archivebox server on a public domain to provide archive.org-style public access to your site snapshots.
 
 <div align="center">
-
 <img src="https://i.imgur.com/3tBL7PU.png" width="22%" alt="CLI Screenshot" align="top">
 <img src="https://i.imgur.com/viklZNG.png" width="22%" alt="Desktop index screenshot" align="top">
 <img src="https://i.imgur.com/RefWsXB.jpg" width="22%" alt="Desktop details page Screenshot"/>
@@ -60,10 +81,87 @@ ArchiveBox is written in Python 3.7 and uses wget, Chrome headless, youtube-dl,
 <sub>. . . . . . . . . . . . . . . . . . . . . . . . . . . .</sub>
 </div><br/>
 
-## Quickstart
 
-ArchiveBox is written in `python3.7` and has [4 main binary dependencies](https://github.com/pirate/ArchiveBox/wiki/Install#dependencies): `wget`, `chromium`, `youtube-dl` and `nodejs`.
-To get started, you can [install them manually](https://github.com/pirate/ArchiveBox/wiki/Install) using your system's package manager, use the [automated helper script](https://github.com/pirate/ArchiveBox/wiki/Quickstart), or use the official [Docker](https://github.com/pirate/ArchiveBox/wiki/Docker) container. These dependencies are optional if [disabled](https://github.com/pirate/ArchiveBox/wiki/Configuration#archive-method-toggles) in settings.
+## Key Features
+
+- [**Free & open source**](https://github.com/pirate/ArchiveBox/blob/master/LICENSE), doesn't require signing up for anything, stores all data locally
+- [**Few dependencies**](https://github.com/pirate/ArchiveBox/wiki/Install#dependencies) and [simple command line interface](https://github.com/pirate/ArchiveBox/wiki/Usage#CLI-Usage)
+- [**Comprehensive documentation**](https://github.com/pirate/ArchiveBox/wiki), [active development](https://github.com/pirate/ArchiveBox/wiki/Roadmap), and [rich community](https://github.com/pirate/ArchiveBox/wiki/Web-Archiving-Community)
+- Easy to set up **[scheduled importing](https://github.com/pirate/ArchiveBox/wiki/Scheduled-Archiving) from multiple sources**
+- Uses common, **durable, [long-term formats](#saves-lots-of-useful-stuff-for-each-imported-link)** like HTML, JSON, PDF, PNG, and WARC
+- ~~**Suitable for paywalled / [authenticated content](https://github.com/pirate/ArchiveBox/wiki/Configuration#chrome_user_data_dir)** (can use your cookies)~~ (do not do this until v0.5 is released with some security fixes)
+- **Doesn't require a constantly-running daemon**, proxy, or native app
+- Provides a CLI, Python API, self-hosted web UI, and REST API (WIP)
+- Architected to be able to run [**many varieties of scripts during archiving**](https://github.com/pirate/ArchiveBox/issues/51), e.g. to extract media, summarize articles, [scroll pages](https://github.com/pirate/ArchiveBox/issues/80), [close modals](https://github.com/pirate/ArchiveBox/issues/175), expand comment threads, etc.
+- Can also [**mirror content to 3rd-party archiving services**](https://github.com/pirate/ArchiveBox/wiki/Configuration#submit_archive_dot_org) automatically for redundancy
+
+## Input formats
+
+ArchiveBox supports many input formats for URLs, including Pocket & Pinboard exports, Browser bookmarks, Browser history, plain text, HTML, markdown, and more!
+
+```bash
+echo 'http://example.com' | archivebox add
+archivebox add 'https://example.com/some/page'
+archivebox add < ~/Downloads/firefox_bookmarks_export.html
+archivebox add < any_text_with_urls_in_it.txt
+archivebox add --depth=1 'https://example.com/some/downloads.html'
+archivebox add --depth=1 'https://news.ycombinator.com#2020-12-12'
+```
+
+- <img src="https://nicksweeting.com/images/bookmarks.png" height="22px"/> Browser history or bookmarks exports (Chrome, Firefox, Safari, IE, Opera, and more)
+- <img src="https://nicksweeting.com/images/rss.svg" height="22px"/> RSS, XML, JSON, CSV, SQL, HTML, Markdown, TXT, or any other text-based format
+- <img src="https://getpocket.com/favicon.ico" height="22px"/> Pocket, Pinboard, Instapaper, Shaarli, Delicious, Reddit Saved Posts, Wallabag, Unmark.it, OneTab, and more
+
+See the [Usage: CLI](https://github.com/pirate/ArchiveBox/wiki/Usage#CLI-Usage) page for documentation and examples.
+
+It also includes a built-in scheduled import feature and browser bookmarklet, so you can ingest URLs from RSS feeds, websites, or the filesystem regularly.
+
+## Output formats
+
+All of ArchiveBox's state (including the index, snapshot data, and config file) is stored in a single folder called the "ArchiveBox data folder". All `archivebox` CLI commands must be run from inside this folder, and you first create it by running `archivebox init`.
+
+The on-disk layout is optimized to be easy to browse by hand and durable long-term. The main index is a standard sqlite3 database (it can also be exported as static JSON/HTML), and the archive snapshots are organized by date-added timestamp in the `archive/` subfolder. Each snapshot subfolder includes a static JSON and HTML index describing its contents, and the snapshot extrator outputs are plain files within the folder (e.g. `media/example.mp4`, `git/somerepo.git`, `static/someimage.png`, etc.)
+
+```bash
+ ls ./archive/<timestamp>/
+```
+
+- **Index:** `index.html` & `index.json` HTML and JSON index files containing metadata and details
+- **Title:** `title` title of the site
+- **Favicon:** `favicon.ico` favicon of the site
+- **WGET Clone:** `example.com/page-name.html` wget clone of the site, with .html appended if not present
+- **WARC:** `warc/<timestamp>.gz` gzipped WARC of all the resources fetched while archiving
+- **PDF:** `output.pdf` Printed PDF of site using headless chrome
+- **Screenshot:** `screenshot.png` 1440x900 screenshot of site using headless chrome
+- **DOM Dump:** `output.html` DOM Dump of the HTML after rendering using headless chrome
+- **URL to Archive.org:** `archive.org.txt` A link to the saved site on archive.org
+- **Audio & Video:** `media/` all audio/video files + playlists, including subtitles & metadata with youtube-dl
+- **Source Code:** `git/` clone of any repository found on github, bitbucket, or gitlab links
+- _More coming soon! See the [Roadmap](https://github.com/pirate/ArchiveBox/wiki/Roadmap)..._
+
+It does everything out-of-the-box by default, but you can disable or tweak [individual archive methods](https://github.com/pirate/ArchiveBox/wiki/Configuration) via environment variables or config file.
+
+## Dependencies
+
+You don't need to install all the dependencies, ArchiveBox will automatically enable the relevant modules based on whatever you have available, but it's recommended to use the official [Docker image](https://github.com/pirate/ArchiveBox/wiki/Docker) with everything preinstalled.
+
+If you so choose, you can also install ArchiveBox and its dependencies directly on any Linux or macOS systems using the [automated setup script](https://github.com/pirate/ArchiveBox/wiki/Quickstart) or the [system package manager](https://github.com/pirate/ArchiveBox/wiki/Install).
+
+ArchiveBox is written in Python 3 so it requires `python3` and `pip3` available on your system. It also uses a set of optional, but highly recommended external dependencies for archiving sites: `wget` (for plain HTML, static files, and WARC saving), `chromium` (for screenshots, PDFs, JS execution, and more), `youtube-dl` (for audio and video), `git` (for cloning git repos), and `nodejs` (for readability and singlefile), and more.
+
+## Caveats
+
+If you're importing URLs containing secret slugs or pages with private content (e.g Google Docs, CodiMD notepads, etc), you may want to disable some of the extractor modules to avoid leaking private URLs to 3rd party APIs during the archiving process.
+
+Be aware that malicious archived JS can also read the contents of other pages in your archive due to snapshot CSRF and XSS protections being imperfect. See the [Security Overview](https://github.com/pirate/ArchiveBox/wiki/Security-Overview#stealth-mode) page for more details.
+
+Support for saving multiple snapshots of each site over time will be [added soon](https://github.com/pirate/ArchiveBox/issues/179) (along with the ability to view diffs of the changes between runs). For now ArchiveBox is designed to only archive each URL with each extractor type once.
+
+---
+
+# Setup
+
+## Docker
 
 ```bash
 # Docker
@@ -72,6 +170,7 @@ docker run -v $PWD:/data -it nikisweeting/archivebox init
 docker run -v $PWD:/data -it nikisweeting/archivebox add 'https://example.com'
 docker run -v $PWD:/data -it nikisweeting/archivebox manage createsuperuser
 docker run -v $PWD:/data -it -p 8000:8000 nikisweeting/archivebox server 0.0.0.0:8000
+
 open http://127.0.0.1:8000
 ```
 
@@ -85,6 +184,7 @@ docker-compose up
 open http://127.0.0.1:8000
 ```
 
+## Bare Metal
 ```bash
 # Bare Metal
 # Use apt on Ubuntu/Debian, brew on mac, or pkg on BSD
@@ -94,22 +194,22 @@ apt install python3 python3-pip python3-dev git curl wget youtube-dl chromium-br
 # Install Node + NPM
 curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
   && echo 'deb https://deb.nodesource.com/node_14.x $(lsb_release -cs) main' >> /etc/apt/sources.list \
-  && apt-get update -qq \
-  && apt-get install -qq -y --no-install-recommends nodejs
+  && apt-get update \
+  && apt-get install --no-install-recommends nodejs
 
 # Make a directory to hold your collection
-mkdir data && cd data       # (doesn't have to be called data)
+mkdir data && cd data    # (can be anywhere, doesn't have to be called data)
 
 # Install python package (or do this in a .venv if you want)
 pip install --upgrade archivebox
 
 # Install node packages (needed for SingleFile, Readability, and Puppeteer)
-npm install --prefix data 'git+https://github.com/pirate/ArchiveBox.git' 
+npm install --prefix . 'git+https://github.com/pirate/ArchiveBox.git' 
 
 archivebox init
-archivebox add 'https://example.com'  # add URLs via args or stdin
+archivebox add 'https://example.com'  # add URLs as args pipe them in via stdin
 
-# or import an RSS/JSON/XML/TXT feed/list of links
+# it can injest links from many formats, including RSS/JSON/XML/MD/TXT and more
 curl https://getpocket.com/users/USERNAME/feed/all | archivebox add
 archivebox add --depth=1 https://example.com/table-of-contents.html
 ```
@@ -125,8 +225,6 @@ archivebox server
 
 You can visit `http://127.0.0.1:8000` in your browser to access it.
 
-[DEMO: archivebox.zervice.io/](https://archivebox.zervice.io)  
-For more information, see the [full Quickstart guide](https://github.com/pirate/ArchiveBox/wiki/Quickstart), [Usage](https://github.com/pirate/ArchiveBox/wiki/Usage), and [Configuration](https://github.com/pirate/ArchiveBox/wiki/Configuration) docs.
 
 ---
 
@@ -134,73 +232,9 @@ For more information, see the [full Quickstart guide](https://github.com/pirate/
 <img src="https://i.imgur.com/PVO88AZ.png" width="80%"/>
 </div>
 
-# Overview
-
-Because modern websites are complicated and often rely on dynamic content,
-ArchiveBox archives the sites in **several different formats** beyond what public
-archiving services like Archive.org and Archive.is are capable of saving. Using multiple
-methods and the market-dominant browser to execute JS ensures we can save even the most
-complex, finicky websites in at least a few high-quality, long-term data formats.
-
-ArchiveBox imports a list of URLs from stdin, remote URL, or file, then adds the pages to a local archive folder using wget to create a browsable HTML clone, youtube-dl to extract media, and a full instance of Chrome headless for PDF, Screenshot, and DOM dumps, and more...
-
-Running `archivebox add` adds only new, unique links into your collection on each run. Because it will ignore duplicates and only archive each link the first time you add it, you can schedule it to [run on a timer](https://github.com/pirate/ArchiveBox/wiki/Scheduled-Archiving) and re-import all your feeds multiple times a day. It will run quickly even if the feeds are large, because it's only archiving the newest links since the last run. For each link, it runs through all the archive methods. Methods that fail will save `None` and be automatically retried on the next run, methods that succeed save their output into the data folder and are never retried/overwritten by subsequent runs. Support for saving multiple snapshots of each site over time will be [added soon](https://github.com/pirate/ArchiveBox/issues/179) (along with the ability to view diffs of the changes between runs).
-
-All the archived links are stored by date bookmarked in `./archive/<timestamp>`, and everything is indexed nicely with JSON & HTML files. The intent is for all the content to be viewable with common software in 50 - 100 years without needing to run ArchiveBox in a VM.
-
-#### Can import links from many formats:
-
-```bash
-echo 'http://example.com' | archivebox add
-archivebox add 'https://example.com/some/page'
-archivebox add < ~/Downloads/firefox_bookmarks_export.html
-archivebox add < any_text_with_urls_in_it.txt
-archivebox add --depth=1 'https://example.com/some/downloads.html'
-archivebox add --depth=1 'https://news.ycombinator.com#2020-12-12'
-```
-
-- <img src="https://nicksweeting.com/images/bookmarks.png" height="22px"/> Browser history or bookmarks exports (Chrome, Firefox, Safari, IE, Opera, and more)
-- <img src="https://nicksweeting.com/images/rss.svg" height="22px"/> RSS, XML, JSON, CSV, SQL, HTML, Markdown, TXT, or any other text-based format
-- <img src="https://getpocket.com/favicon.ico" height="22px"/> Pocket, Pinboard, Instapaper, Shaarli, Delicious, Reddit Saved Posts, Wallabag, Unmark.it, OneTab, and more
-
-See the [Usage: CLI](https://github.com/pirate/ArchiveBox/wiki/Usage#CLI-Usage) page for documentation and examples.
-
-#### Saves lots of useful stuff for each imported link:
-
-```bash
- ls ./archive/<timestamp>/
-```
-
-- **Index:** `index.html` & `index.json` HTML and JSON index files containing metadata and details
-- **Title:** `title` title of the site
-- **Favicon:** `favicon.ico` favicon of the site
-- **WGET Clone:** `example.com/page-name.html` wget clone of the site, with .html appended if not present
-- **WARC:** `warc/<timestamp>.gz` gzipped WARC of all the resources fetched while archiving
-- **PDF:** `output.pdf` Printed PDF of site using headless chrome
-- **Screenshot:** `screenshot.png` 1440x900 screenshot of site using headless chrome
-- **DOM Dump:** `output.html` DOM Dump of the HTML after rendering using headless chrome
-- **URL to Archive.org:** `archive.org.txt` A link to the saved site on archive.org
-- **Audio & Video:** `media/` all audio/video files + playlists, including subtitles & metadata with youtube-dl
-- **Source Code:** `git/` clone of any repository found on github, bitbucket, or gitlab links
-- _More coming soon! See the [Roadmap](https://github.com/pirate/ArchiveBox/wiki/Roadmap)..._
-
-It does everything out-of-the-box by default, but you can disable or tweak [individual archive methods](https://github.com/pirate/ArchiveBox/wiki/Configuration) via environment variables or config file.
-
-If you're importing URLs with secret tokens in them (e.g Google Docs, CodiMD notepads, etc), you may want to disable some of these methods to avoid leaking private URLs to 3rd party APIs during the archiving process. See the [Security Overview](https://github.com/pirate/ArchiveBox/wiki/Security-Overview#stealth-mode) page for more details.
-
-## Key Features
-
-- [**Free & open source**](https://github.com/pirate/ArchiveBox/blob/master/LICENSE), doesn't require signing up for anything, stores all data locally
-- [**Few dependencies**](https://github.com/pirate/ArchiveBox/wiki/Install#dependencies) and [simple command line interface](https://github.com/pirate/ArchiveBox/wiki/Usage#CLI-Usage)
-- [**Comprehensive documentation**](https://github.com/pirate/ArchiveBox/wiki), [active development](https://github.com/pirate/ArchiveBox/wiki/Roadmap), and [rich community](https://github.com/pirate/ArchiveBox/wiki/Web-Archiving-Community)
-- **Doesn't require a constantly-running server**, proxy, or native app
-- Easy to set up **[scheduled importing](https://github.com/pirate/ArchiveBox/wiki/Scheduled-Archiving) from multiple sources**
-- Uses common, **durable, [long-term formats](#saves-lots-of-useful-stuff-for-each-imported-link)** like HTML, JSON, PDF, PNG, and WARC
-- ~~**Suitable for paywalled / [authenticated content](https://github.com/pirate/ArchiveBox/wiki/Configuration#chrome_user_data_dir)** (can use your cookies)~~ (do not do this until v0.5 is released with some security fixes)
-- Can [**run scripts during archiving**](https://github.com/pirate/ArchiveBox/issues/51) to [scroll pages](https://github.com/pirate/ArchiveBox/issues/80), [close modals](https://github.com/pirate/ArchiveBox/issues/175), expand comment threads, etc.
-- Can also [**mirror content to 3rd-party archiving services**](https://github.com/pirate/ArchiveBox/wiki/Configuration#submit_archive_dot_org) automatically for redundancy
+---
 
-## Background & Motivation
+# Background & Motivation
 
 Vast treasure troves of knowledge are lost every day on the internet to link rot. As a society, we have an imperative to preserve some important parts of that treasure, just like we preserve our books, paintings, and music in physical libraries long after the originals go out of print or fade into obscurity.
 
@@ -216,6 +250,11 @@ archive internet content enables to you save the stuff you care most about befor
 The balance between the permanence and ephemeral nature of content on the internet is part of what makes it beautiful.
 I don't think everything should be preserved in an automated fashion, making all content permanent and never removable, but I do think people should be able to decide for themselves and effectively archive specific content that they care about.
 
+Because modern websites are complicated and often rely on dynamic content,
+ArchiveBox archives the sites in **several different formats** beyond what public archiving services like Archive.org and Archive.is are capable of saving. Using multiple methods and the market-dominant browser to execute JS ensures we can save even the most complex, finicky websites in at least a few high-quality, long-term data formats.
+
+All the archived links are stored by date bookmarked in `./archive/<timestamp>`, and everything is indexed nicely with JSON & HTML files. The intent is for all the content to be viewable with common software in 50 - 100 years without needing to run ArchiveBox in a VM.
+
 ## Comparison to Other Projects
 
 ▶ **Check out our [community page](https://github.com/pirate/ArchiveBox/wiki/Web-Archiving-Community) for an index of web archiving initiatives and projects.**
@@ -236,8 +275,6 @@ Because ArchiveBox is designed to ingest a firehose of browser history and bookm
 
 ## Learn more
 
-<!--▶ **Join out our [community chat](http://webchat.freenode.net?channels=ArchiveBox&uio=d4) hosted on IRC freenode.net:`#ArchiveBox`!**-->
-
 Whether you want to learn which organizations are the big players in the web archiving space, want to find a specific open-source tool for your web archiving need, or just want to see where archivists hang out online, our Community Wiki page serves as an index of the broader web archiving community. Check it out to learn about some of the coolest web archiving projects and communities on the web!
 
 <img src="https://i.imgur.com/0ZOmOvN.png" width="14%" align="right"/>
@@ -261,21 +298,10 @@ Whether you want to learn which organizations are the big players in the web arc
 
 <img src="https://read-the-docs-guidelines.readthedocs-hosted.com/_images/logo-dark.png" width="13%" align="right"/>
 
-We use the [Github wiki system](https://github.com/pirate/ArchiveBox/wiki) and [Read the Docs](https://archivebox.readthedocs.io/en/latest/) for documentation.
+We use the [Github wiki system](https://github.com/pirate/ArchiveBox/wiki) and [Read the Docs](https://archivebox.readthedocs.io/en/latest/) (WIP) for documentation.
 
 You can also access the docs locally by looking in the [`ArchiveBox/docs/`](https://github.com/pirate/ArchiveBox/wiki/Home) folder.
 
-You can build the docs by running:
-
-```python
-cd ArchiveBox
-pipenv install --dev
-sphinx-apidoc -o docs archivebox
-cd docs/
-make html
-# then open docs/_build/html/index.html
-```
-
 ## Getting Started
 
 - [Quickstart](https://github.com/pirate/ArchiveBox/wiki/Quickstart)
@@ -293,15 +319,82 @@ make html
 - [Chromium Install](https://github.com/pirate/ArchiveBox/wiki/Install-Chromium)
 - [Security Overview](https://github.com/pirate/ArchiveBox/wiki/Security-Overview)
 - [Troubleshooting](https://github.com/pirate/ArchiveBox/wiki/Troubleshooting)
+- [Python API](https://docs.archivebox.io/en/latest/modules.html)
+- REST API (coming soon...)
 
 ## More Info
 
+- [Tickets](https://github.com/pirate/ArchiveBox/issues)
 - [Roadmap](https://github.com/pirate/ArchiveBox/wiki/Roadmap)
 - [Changelog](https://github.com/pirate/ArchiveBox/wiki/Changelog)
 - [Donations](https://github.com/pirate/ArchiveBox/wiki/Donations)
 - [Background & Motivation](https://github.com/pirate/ArchiveBox#background--motivation)
 - [Web Archiving Community](https://github.com/pirate/ArchiveBox/wiki/Web-Archiving-Community)
 
+---
+
+# ArchiveBox Development
+
+All contributions to ArchiveBox are welcomed! Check our [issues](https://github.com/pirate/ArchiveBox/issues) and [Roadmap](https://github.com/pirate/ArchiveBox/wiki/Roadmap) for things to work on, and please open an issue to discuss your proposed implementation before working on things! Otherwise we may have to close your PR if it doesn't align with our roadmap.
+
+### Setup the dev environment
+
+```python3
+git clone https://github.com/pirate/ArchiveBox
+cd ArchiveBox
+git checkout master  # or the branch you want to test
+git pull
+
+# Install ArchiveBox + python dependencies
+python3 -m venv .venv && source .venv/bin/activate && pip install -e .[dev]
+# or
+pipenv install --dev && pipenv shell
+
+# Install node dependencies
+npm install
+
+# Optional: install the extractor dependencies
+./bin/setup.sh
+```
+
+### Common development tasks
+
+See the `./bin/` folder and read the source of the bash scripts within.
+You can also run all these in Docker. For more examples see the Github Actions CI/CD tests that are run: `.github/workflows/*.yaml`.
+
+#### Run the linters
+
+```bash
+./bin/lint.sh
+```
+(uses `flake8` and `mypy`)
+
+#### Run the integration tests
+
+```bash
+./bin/test.sh
+```
+(uses `pytest -s`)
+
+#### Build the docs, pip package, and docker image
+
+```bash
+./bin/build.sh
+
+# or individually:
+./bin/build_docs.sh
+./bin/build_pip.sh
+./bin/build_docker.sh
+```
+
+#### Roll a release
+
+```bash
+./bin/release.sh
+```
+(bumps the version, builds, and pushes a release to PyPI, Docker Hub, and Github Packages)
+
+
 ---
 
 <div align="center">

archivebox.egg-info/PKG-INFO

@@ -41,26 +41,50 @@ Description: <div align="center">
         <hr/>
         </div>
         
-        **ArchiveBox takes a list of website URLs you want to archive, and creates a local, static, browsable HTML clone of the content from those websites (it saves HTML, JS, media files, PDFs, images and more).**
+        ArchiveBox is an internet archiving tool that preserves URLs you give it in several different formats. You use it by installing ArchiveBox via [Docker](https://docs.docker.com/get-docker/) or [`pip3`](https://wiki.python.org/moin/BeginnersGuide/Download), and adding URLs via the command line or the built-in Web UI.
         
-        You can use it to preserve access to websites you care about by storing them locally offline. ArchiveBox imports lists of URLs, renders the pages in a headless, authenticated, user-scriptable browser, and then archives the content in multiple redundant common formats (HTML, PDF, PNG, WARC) that will last long after the originals disappear off the internet. It automatically extracts assets and media from pages and saves them in easily-accessible folders, with out-of-the-box support for extracting git repositories, audio, video, subtitles, images, PDFs, and more.
+        It archives each site and stores them as plain HTML in folders on your hard drive, with easy-to-read HTML, SQL, JSON indexes. The snapshots are then browseabale and managable offline through the filesystem, the built-in web UI, or the Python API.
         
-        #### How does it work?
+        It automatically extracts many types of assets and media from pages and saves them in standard formats, with out-of-the-box support for saving HTML (with dynamic JS), a PDF, a screenshot, a WARC archive, git repositories, audio, video, subtitles, images, PDFs, and more.
+        
+        #### Quickstart
         
         ```bash
-        mkdir data && cd data
-        archivebox init
-        archivebox add 'https://example.com'
-        archivebox add 'https://getpocket.com/users/USERNAME/feed/all' --depth=1
-        archivebox server
+        docker run -d -it -v ~/archivebox:/data -p 8000:8000 nikisweeting/archivebox server --init 0.0.0.0:8000
+        docker run -v ~/archivebox:/data -it nikisweeting/archivebox manage createsuperuser
+        
+        open http://127.0.0.1:8000/admin/login/  # then click "Add" in the navbar
         ```
         
-        After installing archivebox, just pass some new links to the `archivebox add` command to start your collection.
+        <div align="center">
+        <img src="https://i.imgur.com/lUuicew.png" width="400px">
+        <br/>
         
-        ArchiveBox is written in Python 3.7 and uses wget, Chrome headless, youtube-dl, pywb, and other common UNIX tools to save each page you add in multiple redundant formats. It doesn't require a constantly running server or backend (though it does include an optional one), just open the generated `data/index.html` in a browser to view the archive or run `archivebox server` to use the interactive Web UI. It can import and export links as JSON (among other formats), so it's easy to script or hook up to other APIs. If you run it on a schedule and import from browser history or bookmarks regularly, you can sleep soundly knowing that the slice of the internet you care about will be automatically preserved in multiple, durable long-term formats that will be accessible for decades (or longer).
+        [DEMO: archivebox.zervice.io/](https://archivebox.zervice.io)  
+        For more information, see the [full Quickstart guide](https://github.com/pirate/ArchiveBox/wiki/Quickstart), [Usage](https://github.com/pirate/ArchiveBox/wiki/Usage), and [Configuration](https://github.com/pirate/ArchiveBox/wiki/Configuration) docs.
+        </div>
         
-        <div align="center">
+        ---
+        
+        
+        # Overview
+        
+        ArchiveBox is a command line tool, self-hostable web-archiving server, and Python library all-in-one. It's available as a Python3 package or a Docker image, both methods provide the same CLI, Web UI, and on-disk data format.
+        
+        It works on Docker, macOS, and Linux/BSD. Windows is not officially supported, but users have reported getting it working using the WSL2 + Docker.
+        
+        To use ArchiveBox you start by creating a folder for your data to live in (it can be anywhere on your system), and running `archivebox init` inside of it. That will create a sqlite3 index and an `ArchiveBox.conf` file. After that, you can continue to add/remove/search/import/export/manage/config/etc using the CLI `archivebox help`, or you can run the Web UI (recommended):
+        ```bash
+        archivebox manage createsuperuser
+        archivebox server 0.0.0.0:8000
+        open http://127.0.0.1:8000
+        ```
+        
+        The CLI is considered "stable", and the ArchiveBox Python API and REST APIs are in "beta".
+        
+        At the end of the day, the goal is to sleep soundly knowing that the part of the internet you care about will be automatically preserved in multiple, durable long-term formats that will be accessible for decades (or longer). You can also self-host your archivebox server on a public domain to provide archive.org-style public access to your site snapshots.
         
+        <div align="center">
         <img src="https://i.imgur.com/3tBL7PU.png" width="22%" alt="CLI Screenshot" align="top">
         <img src="https://i.imgur.com/viklZNG.png" width="22%" alt="Desktop index screenshot" align="top">
         <img src="https://i.imgur.com/RefWsXB.jpg" width="22%" alt="Desktop details page Screenshot"/>
@@ -70,10 +94,86 @@ Description: <div align="center">
         <sub>. . . . . . . . . . . . . . . . . . . . . . . . . . . .</sub>
         </div><br/>
         
-        ## Quickstart
         
-        ArchiveBox is written in `python3.7` and has [4 main binary dependencies](https://github.com/pirate/ArchiveBox/wiki/Install#dependencies): `wget`, `chromium`, `youtube-dl` and `nodejs`.
-        To get started, you can [install them manually](https://github.com/pirate/ArchiveBox/wiki/Install) using your system's package manager, use the [automated helper script](https://github.com/pirate/ArchiveBox/wiki/Quickstart), or use the official [Docker](https://github.com/pirate/ArchiveBox/wiki/Docker) container. These dependencies are optional if [disabled](https://github.com/pirate/ArchiveBox/wiki/Configuration#archive-method-toggles) in settings.
+        ## Key Features
+        
+        - [**Free & open source**](https://github.com/pirate/ArchiveBox/blob/master/LICENSE), doesn't require signing up for anything, stores all data locally
+        - [**Few dependencies**](https://github.com/pirate/ArchiveBox/wiki/Install#dependencies) and [simple command line interface](https://github.com/pirate/ArchiveBox/wiki/Usage#CLI-Usage)
+        - [**Comprehensive documentation**](https://github.com/pirate/ArchiveBox/wiki), [active development](https://github.com/pirate/ArchiveBox/wiki/Roadmap), and [rich community](https://github.com/pirate/ArchiveBox/wiki/Web-Archiving-Community)
+        - **Doesn't require a constantly-running server**, proxy, or native app
+        - Easy to set up **[scheduled importing](https://github.com/pirate/ArchiveBox/wiki/Scheduled-Archiving) from multiple sources**
+        - Uses common, **durable, [long-term formats](#saves-lots-of-useful-stuff-for-each-imported-link)** like HTML, JSON, PDF, PNG, and WARC
+        - ~~**Suitable for paywalled / [authenticated content](https://github.com/pirate/ArchiveBox/wiki/Configuration#chrome_user_data_dir)** (can use your cookies)~~ (do not do this until v0.5 is released with some security fixes)
+        - Can [**run scripts during archiving**](https://github.com/pirate/ArchiveBox/issues/51) to [scroll pages](https://github.com/pirate/ArchiveBox/issues/80), [close modals](https://github.com/pirate/ArchiveBox/issues/175), expand comment threads, etc.
+        - Can also [**mirror content to 3rd-party archiving services**](https://github.com/pirate/ArchiveBox/wiki/Configuration#submit_archive_dot_org) automatically for redundancy
+        
+        ## Input formats
+        
+        ArchiveBox supports many input formats for URLs, including Pocket & Pinboard exports, Browser bookmarks, Browser history, plain text, HTML, markdown, and more!
+        
+        ```bash
+        echo 'http://example.com' | archivebox add
+        archivebox add 'https://example.com/some/page'
+        archivebox add < ~/Downloads/firefox_bookmarks_export.html
+        archivebox add < any_text_with_urls_in_it.txt
+        archivebox add --depth=1 'https://example.com/some/downloads.html'
+        archivebox add --depth=1 'https://news.ycombinator.com#2020-12-12'
+        ```
+        
+        - <img src="https://nicksweeting.com/images/bookmarks.png" height="22px"/> Browser history or bookmarks exports (Chrome, Firefox, Safari, IE, Opera, and more)
+        - <img src="https://nicksweeting.com/images/rss.svg" height="22px"/> RSS, XML, JSON, CSV, SQL, HTML, Markdown, TXT, or any other text-based format
+        - <img src="https://getpocket.com/favicon.ico" height="22px"/> Pocket, Pinboard, Instapaper, Shaarli, Delicious, Reddit Saved Posts, Wallabag, Unmark.it, OneTab, and more
+        
+        See the [Usage: CLI](https://github.com/pirate/ArchiveBox/wiki/Usage#CLI-Usage) page for documentation and examples.
+        
+        It also includes a built-in scheduled import feature and browser bookmarklet, so you can ingest URLs from RSS feeds, websites, or the filesystem regularly.
+        
+        ## Output formats
+        
+        All of ArchiveBox's state (including the index, snapshot data, and config file) is stored in a single folder called the "ArchiveBox data folder". All `archivebox` CLI commands must be run from inside this folder, and you first create it by running `archivebox init`.
+        
+        The on-disk layout is optimized to be easy to browse by hand and durable long-term. The main index is a standard sqlite3 database (it can also be exported as static JSON/HTML), and the archive snapshots are organized by date-added timestamp in the `archive/` subfolder. Each snapshot subfolder includes a static JSON and HTML index describing its contents, and the snapshot extrator outputs are plain files within the folder (e.g. `media/example.mp4`, `git/somerepo.git`, `static/someimage.png`, etc.)
+        
+        ```bash
+         ls ./archive/<timestamp>/
+        ```
+        
+        - **Index:** `index.html` & `index.json` HTML and JSON index files containing metadata and details
+        - **Title:** `title` title of the site
+        - **Favicon:** `favicon.ico` favicon of the site
+        - **WGET Clone:** `example.com/page-name.html` wget clone of the site, with .html appended if not present
+        - **WARC:** `warc/<timestamp>.gz` gzipped WARC of all the resources fetched while archiving
+        - **PDF:** `output.pdf` Printed PDF of site using headless chrome
+        - **Screenshot:** `screenshot.png` 1440x900 screenshot of site using headless chrome
+        - **DOM Dump:** `output.html` DOM Dump of the HTML after rendering using headless chrome
+        - **URL to Archive.org:** `archive.org.txt` A link to the saved site on archive.org
+        - **Audio & Video:** `media/` all audio/video files + playlists, including subtitles & metadata with youtube-dl
+        - **Source Code:** `git/` clone of any repository found on github, bitbucket, or gitlab links
+        - _More coming soon! See the [Roadmap](https://github.com/pirate/ArchiveBox/wiki/Roadmap)..._
+        
+        It does everything out-of-the-box by default, but you can disable or tweak [individual archive methods](https://github.com/pirate/ArchiveBox/wiki/Configuration) via environment variables or config file.
+        
+        ## Dependencies
+        
+        You don't need to install all the dependencies, ArchiveBox will automatically enable the relevant modules based on whatever you have available, but it's recommended to use the official [Docker image](https://github.com/pirate/ArchiveBox/wiki/Docker) with everything preinstalled.
+        
+        If you so choose, you can also install ArchiveBox and its dependencies directly on any Linux or macOS systems using the [automated setup script](https://github.com/pirate/ArchiveBox/wiki/Quickstart) or the [system package manager](https://github.com/pirate/ArchiveBox/wiki/Install).
+        
+        ArchiveBox is written in Python 3 so it requires `python3` and `pip3` available on your system. It also uses a set of optional, but highly recommended external dependencies for archiving sites: `wget` (for plain HTML, static files, and WARC saving), `chromium` (for screenshots, PDFs, JS execution, and more), `youtube-dl` (for audio and video), `git` (for cloning git repos), and `nodejs` (for readability and singlefile), and more.
+        
+        ## Caveats
+        
+        If you're importing URLs containing secret slugs or pages with private content (e.g Google Docs, CodiMD notepads, etc), you may want to disable some of the extractor modules to avoid leaking private URLs to 3rd party APIs during the archiving process.
+        
+        Be aware that malicious archived JS can also read the contents of other pages in your archive due to snapshot CSRF and XSS protections being imperfect. See the [Security Overview](https://github.com/pirate/ArchiveBox/wiki/Security-Overview#stealth-mode) page for more details.
+        
+        Support for saving multiple snapshots of each site over time will be [added soon](https://github.com/pirate/ArchiveBox/issues/179) (along with the ability to view diffs of the changes between runs). For now ArchiveBox is designed to only archive each URL with each extractor type once.
+        
+        ---
+        
+        # Setup
+        
+        ## Docker
         
         ```bash
         # Docker
@@ -82,6 +182,7 @@ Description: <div align="center">
         docker run -v $PWD:/data -it nikisweeting/archivebox add 'https://example.com'
         docker run -v $PWD:/data -it nikisweeting/archivebox manage createsuperuser
         docker run -v $PWD:/data -it -p 8000:8000 nikisweeting/archivebox server 0.0.0.0:8000
+        
         open http://127.0.0.1:8000
         ```
         
@@ -95,26 +196,34 @@ Description: <div align="center">
         open http://127.0.0.1:8000
         ```
         
+        ## Bare Metal
         ```bash
         # Bare Metal
         # Use apt on Ubuntu/Debian, brew on mac, or pkg on BSD
         # You may need to add a ppa with a more recent version of nodejs
-        apt install python3 python3-pip git curl wget youtube-dl chromium-browser
+        apt install python3 python3-pip python3-dev git curl wget youtube-dl chromium-browser
         
+        # Install Node + NPM
         curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
           && echo 'deb https://deb.nodesource.com/node_14.x $(lsb_release -cs) main' >> /etc/apt/sources.list \
           && apt-get update -qq \
           && apt-get install -qq -y --no-install-recommends nodejs
         
-        pip install archivebox      # install archivebox
-        npm install -g 'git+https://github.com/pirate/ArchiveBox.git'
-        
+        # Make a directory to hold your collection
         mkdir data && cd data       # (doesn't have to be called data)
+        
+        # Install python package (or do this in a .venv if you want)
+        pip install --upgrade archivebox
+        
+        # Install node packages (needed for SingleFile, Readability, and Puppeteer)
+        npm install --prefix data 'git+https://github.com/pirate/ArchiveBox.git' 
+        
         archivebox init
         archivebox add 'https://example.com'  # add URLs via args or stdin
         
         # or import an RSS/JSON/XML/TXT feed/list of links
-        archivebox add https://getpocket.com/users/USERNAME/feed/all --depth=1
+        curl https://getpocket.com/users/USERNAME/feed/all | archivebox add
+        archivebox add --depth=1 https://example.com/table-of-contents.html
         ```
         
         Once you've added your first links, open `data/index.html` in a browser to view the static archive.
@@ -128,8 +237,6 @@ Description: <div align="center">
         
         You can visit `http://127.0.0.1:8000` in your browser to access it.
         
-        [DEMO: archivebox.zervice.io/](https://archivebox.zervice.io)  
-        For more information, see the [full Quickstart guide](https://github.com/pirate/ArchiveBox/wiki/Quickstart), [Usage](https://github.com/pirate/ArchiveBox/wiki/Usage), and [Configuration](https://github.com/pirate/ArchiveBox/wiki/Configuration) docs.
         
         ---
         
@@ -137,72 +244,9 @@ Description: <div align="center">
         <img src="https://i.imgur.com/PVO88AZ.png" width="80%"/>
         </div>
         
-        # Overview
-        
-        Because modern websites are complicated and often rely on dynamic content,
-        ArchiveBox archives the sites in **several different formats** beyond what public
-        archiving services like Archive.org and Archive.is are capable of saving. Using multiple
-        methods and the market-dominant browser to execute JS ensures we can save even the most
-        complex, finicky websites in at least a few high-quality, long-term data formats.
-        
-        ArchiveBox imports a list of URLs from stdin, remote URL, or file, then adds the pages to a local archive folder using wget to create a browsable HTML clone, youtube-dl to extract media, and a full instance of Chrome headless for PDF, Screenshot, and DOM dumps, and more...
-        
-        Running `archivebox add` adds only new, unique links into your collection on each run. Because it will ignore duplicates and only archive each link the first time you add it, you can schedule it to [run on a timer](https://github.com/pirate/ArchiveBox/wiki/Scheduled-Archiving) and re-import all your feeds multiple times a day. It will run quickly even if the feeds are large, because it's only archiving the newest links since the last run. For each link, it runs through all the archive methods. Methods that fail will save `None` and be automatically retried on the next run, methods that succeed save their output into the data folder and are never retried/overwritten by subsequent runs. Support for saving multiple snapshots of each site over time will be [added soon](https://github.com/pirate/ArchiveBox/issues/179) (along with the ability to view diffs of the changes between runs).
-        
-        All the archived links are stored by date bookmarked in `./archive/<timestamp>`, and everything is indexed nicely with JSON & HTML files. The intent is for all the content to be viewable with common software in 50 - 100 years without needing to run ArchiveBox in a VM.
-        
-        #### Can import links from many formats:
-        
-        ```bash
-        echo 'http://example.com' | archivebox add
-        archivebox add 'https://example.com/some/page'
-        archivebox add < ~/Downloads/firefox_bookmarks_export.html
-        archivebox add --depth=1 'https://example.com/some/rss/feed.xml'
-        archivebox add --depth=1 'https://news.ycombinator.com#2020-12-12'
-        ```
-        
-        - <img src="https://nicksweeting.com/images/bookmarks.png" height="22px"/> Browser history or bookmarks exports (Chrome, Firefox, Safari, IE, Opera, and more)
-        - <img src="https://nicksweeting.com/images/rss.svg" height="22px"/> RSS, XML, JSON, CSV, SQL, HTML, Markdown, TXT, or any other text-based format
-        - <img src="https://getpocket.com/favicon.ico" height="22px"/> Pocket, Pinboard, Instapaper, Shaarli, Delicious, Reddit Saved Posts, Wallabag, Unmark.it, OneTab, and more
-        
-        See the [Usage: CLI](https://github.com/pirate/ArchiveBox/wiki/Usage#CLI-Usage) page for documentation and examples.
-        
-        #### Saves lots of useful stuff for each imported link:
-        
-        ```bash
-         ls ./archive/<timestamp>/
-        ```
-        
-        - **Index:** `index.html` & `index.json` HTML and JSON index files containing metadata and details
-        - **Title:** `title` title of the site
-        - **Favicon:** `favicon.ico` favicon of the site
-        - **WGET Clone:** `example.com/page-name.html` wget clone of the site, with .html appended if not present
-        - **WARC:** `warc/<timestamp>.gz` gzipped WARC of all the resources fetched while archiving
-        - **PDF:** `output.pdf` Printed PDF of site using headless chrome
-        - **Screenshot:** `screenshot.png` 1440x900 screenshot of site using headless chrome
-        - **DOM Dump:** `output.html` DOM Dump of the HTML after rendering using headless chrome
-        - **URL to Archive.org:** `archive.org.txt` A link to the saved site on archive.org
-        - **Audio & Video:** `media/` all audio/video files + playlists, including subtitles & metadata with youtube-dl
-        - **Source Code:** `git/` clone of any repository found on github, bitbucket, or gitlab links
-        - _More coming soon! See the [Roadmap](https://github.com/pirate/ArchiveBox/wiki/Roadmap)..._
-        
-        It does everything out-of-the-box by default, but you can disable or tweak [individual archive methods](https://github.com/pirate/ArchiveBox/wiki/Configuration) via environment variables or config file.
-        
-        If you're importing URLs with secret tokens in them (e.g Google Docs, CodiMD notepads, etc), you may want to disable some of these methods to avoid leaking private URLs to 3rd party APIs during the archiving process. See the [Security Overview](https://github.com/pirate/ArchiveBox/wiki/Security-Overview#stealth-mode) page for more details.
-        
-        ## Key Features
-        
-        - [**Free & open source**](https://github.com/pirate/ArchiveBox/blob/master/LICENSE), doesn't require signing up for anything, stores all data locally
-        - [**Few dependencies**](https://github.com/pirate/ArchiveBox/wiki/Install#dependencies) and [simple command line interface](https://github.com/pirate/ArchiveBox/wiki/Usage#CLI-Usage)
-        - [**Comprehensive documentation**](https://github.com/pirate/ArchiveBox/wiki), [active development](https://github.com/pirate/ArchiveBox/wiki/Roadmap), and [rich community](https://github.com/pirate/ArchiveBox/wiki/Web-Archiving-Community)
-        - **Doesn't require a constantly-running server**, proxy, or native app
-        - Easy to set up **[scheduled importing](https://github.com/pirate/ArchiveBox/wiki/Scheduled-Archiving) from multiple sources**
-        - Uses common, **durable, [long-term formats](#saves-lots-of-useful-stuff-for-each-imported-link)** like HTML, JSON, PDF, PNG, and WARC
-        - ~~**Suitable for paywalled / [authenticated content](https://github.com/pirate/ArchiveBox/wiki/Configuration#chrome_user_data_dir)** (can use your cookies)~~ (do not do this until v0.5 is released with some security fixes)
-        - Can [**run scripts during archiving**](https://github.com/pirate/ArchiveBox/issues/51) to [scroll pages](https://github.com/pirate/ArchiveBox/issues/80), [close modals](https://github.com/pirate/ArchiveBox/issues/175), expand comment threads, etc.
-        - Can also [**mirror content to 3rd-party archiving services**](https://github.com/pirate/ArchiveBox/wiki/Configuration#submit_archive_dot_org) automatically for redundancy
+        ---
         
-        ## Background & Motivation
+        # Background & Motivation
         
         Vast treasure troves of knowledge are lost every day on the internet to link rot. As a society, we have an imperative to preserve some important parts of that treasure, just like we preserve our books, paintings, and music in physical libraries long after the originals go out of print or fade into obscurity.
         
@@ -218,6 +262,11 @@ Description: <div align="center">
         The balance between the permanence and ephemeral nature of content on the internet is part of what makes it beautiful.
         I don't think everything should be preserved in an automated fashion, making all content permanent and never removable, but I do think people should be able to decide for themselves and effectively archive specific content that they care about.
         
+        Because modern websites are complicated and often rely on dynamic content,
+        ArchiveBox archives the sites in **several different formats** beyond what public archiving services like Archive.org and Archive.is are capable of saving. Using multiple methods and the market-dominant browser to execute JS ensures we can save even the most complex, finicky websites in at least a few high-quality, long-term data formats.
+        
+        All the archived links are stored by date bookmarked in `./archive/<timestamp>`, and everything is indexed nicely with JSON & HTML files. The intent is for all the content to be viewable with common software in 50 - 100 years without needing to run ArchiveBox in a VM.
+        
         ## Comparison to Other Projects
         
         ▶ **Check out our [community page](https://github.com/pirate/ArchiveBox/wiki/Web-Archiving-Community) for an index of web archiving initiatives and projects.**
@@ -238,8 +287,6 @@ Description: <div align="center">
         
         ## Learn more
         
-        <!--▶ **Join out our [community chat](http://webchat.freenode.net?channels=ArchiveBox&uio=d4) hosted on IRC freenode.net:`#ArchiveBox`!**-->
-        
         Whether you want to learn which organizations are the big players in the web archiving space, want to find a specific open-source tool for your web archiving need, or just want to see where archivists hang out online, our Community Wiki page serves as an index of the broader web archiving community. Check it out to learn about some of the coolest web archiving projects and communities on the web!
         
         <img src="https://i.imgur.com/0ZOmOvN.png" width="14%" align="right"/>
@@ -263,21 +310,10 @@ Description: <div align="center">
         
         <img src="https://read-the-docs-guidelines.readthedocs-hosted.com/_images/logo-dark.png" width="13%" align="right"/>
         
-        We use the [Github wiki system](https://github.com/pirate/ArchiveBox/wiki) and [Read the Docs](https://archivebox.readthedocs.io/en/latest/) for documentation.
+        We use the [Github wiki system](https://github.com/pirate/ArchiveBox/wiki) and [Read the Docs](https://archivebox.readthedocs.io/en/latest/) (WIP) for documentation.
         
         You can also access the docs locally by looking in the [`ArchiveBox/docs/`](https://github.com/pirate/ArchiveBox/wiki/Home) folder.
         
-        You can build the docs by running:
-        
-        ```python
-        cd ArchiveBox
-        pipenv install --dev
-        sphinx-apidoc -o docs archivebox
-        cd docs/
-        make html
-        # then open docs/_build/html/index.html
-        ```
-        
         ## Getting Started
         
         - [Quickstart](https://github.com/pirate/ArchiveBox/wiki/Quickstart)
@@ -295,15 +331,82 @@ Description: <div align="center">
         - [Chromium Install](https://github.com/pirate/ArchiveBox/wiki/Install-Chromium)
         - [Security Overview](https://github.com/pirate/ArchiveBox/wiki/Security-Overview)
         - [Troubleshooting](https://github.com/pirate/ArchiveBox/wiki/Troubleshooting)
+        - [Python API](https://docs.archivebox.io/en/latest/modules.html)
+        - REST API (coming soon...)
         
         ## More Info
         
+        - [Tickets](https://github.com/pirate/ArchiveBox/issues)
         - [Roadmap](https://github.com/pirate/ArchiveBox/wiki/Roadmap)
         - [Changelog](https://github.com/pirate/ArchiveBox/wiki/Changelog)
         - [Donations](https://github.com/pirate/ArchiveBox/wiki/Donations)
         - [Background & Motivation](https://github.com/pirate/ArchiveBox#background--motivation)
         - [Web Archiving Community](https://github.com/pirate/ArchiveBox/wiki/Web-Archiving-Community)
         
+        ---
+        
+        # ArchiveBox Development
+        
+        All contributions to ArchiveBox are welcomed! Check our [issues](https://github.com/pirate/ArchiveBox/issues) and [Roadmap](https://github.com/pirate/ArchiveBox/wiki/Roadmap) for things to work on, and please open an issue to discuss your proposed implementation before working on things! Otherwise we may have to close your PR if it doesn't align with our roadmap.
+        
+        ### Setup the dev environment
+        
+        ```python3
+        git clone https://github.com/pirate/ArchiveBox
+        cd ArchiveBox
+        git checkout master  # or the branch you want to test
+        git pull
+        
+        # Install ArchiveBox + python dependencies
+        python3 -m venv .venv && source .venv/bin/activate && pip install -e .[dev]
+        # or
+        pipenv install --dev && pipenv shell
+        
+        # Install node dependencies
+        npm install
+        
+        # Optional: install the extractor dependencies
+        ./bin/setup.sh
+        ```
+        
+        ### Common development tasks
+        
+        See the `./bin/` folder and read the source of the bash scripts within.
+        You can also run all these in Docker. For more examples see the Github Actions CI/CD tests that are run: `.github/workflows/*.yaml`.
+        
+        #### Run the linters
+        
+        ```bash
+        ./bin/lint.sh
+        ```
+        (uses `flake8` and `mypy`)
+        
+        #### Run the integration tests
+        
+        ```bash
+        ./bin/test.sh
+        ```
+        (uses `pytest -s`)
+        
+        #### Build the docs, pip package, and docker image
+        
+        ```bash
+        ./bin/build.sh
+        
+        # or individually:
+        ./bin/build_docs.sh
+        ./bin/build_pip.sh
+        ./bin/build_docker.sh
+        ```
+        
+        #### Roll a release
+        
+        ```bash
+        ./bin/release.sh
+        ```
+        (bumps the version, builds, and pushes a release to PyPI, Docker Hub, and Github Packages)
+        
+        
         ---
         
         <div align="center">

archivebox.egg-info/SOURCES.txt

@@ -45,6 +45,7 @@ archivebox/core/models.py
 archivebox/core/settings.py
 archivebox/core/tests.py
 archivebox/core/urls.py
+archivebox/core/utils.py
 archivebox/core/views.py
 archivebox/core/welcome_message.py
 archivebox/core/wsgi.py
@@ -60,7 +61,9 @@ archivebox/extractors/archive_org.py
 archivebox/extractors/dom.py
 archivebox/extractors/favicon.py
 archivebox/extractors/git.py
+archivebox/extractors/headers.py
 archivebox/extractors/media.py
+archivebox/extractors/mercury.py
 archivebox/extractors/pdf.py
 archivebox/extractors/readability.py
 archivebox/extractors/screenshot.py
@@ -88,7 +91,10 @@ archivebox/themes/admin/app_index.html
 archivebox/themes/admin/base.html
 archivebox/themes/admin/login.html
 archivebox/themes/default/add_links.html
+archivebox/themes/default/base.html
 archivebox/themes/default/main_index.html
+archivebox/themes/default/core/snapshot_list.html
+archivebox/themes/default/static/add.css
 archivebox/themes/default/static/admin.css
 archivebox/themes/default/static/archive.png
 archivebox/themes/default/static/bootstrap.min.css
@@ -103,6 +109,7 @@ archivebox/themes/default/static/spinner.gif
 archivebox/themes/legacy/favicon.ico
 archivebox/themes/legacy/link_details.html
 archivebox/themes/legacy/main_index.html
+archivebox/themes/legacy/main_index_minimal.html
 archivebox/themes/legacy/main_index_row.html
 archivebox/themes/legacy/robots.txt
 archivebox/themes/legacy/static/archive.png

archivebox/cli/__init__.py

@@ -6,12 +6,13 @@ import sys
 import argparse
 
 from typing import Optional, Dict, List, IO
+from pathlib import Path
 
 from ..config import OUTPUT_DIR
 
 from importlib import import_module
 
-CLI_DIR = os.path.dirname(os.path.abspath(__file__))
+CLI_DIR = Path(__file__).resolve().parent
 
 # these common commands will appear sorted before any others for ease-of-use
 meta_cmds = ('help', 'version')

archivebox/cli/tests.py

@@ -7,6 +7,7 @@ import os
 import sys
 import shutil
 import unittest
+from pathlib import Path
 
 from contextlib import contextmanager
 
@@ -109,13 +110,13 @@ class TestInit(unittest.TestCase):
         with output_hidden():
             archivebox_init.main([])
 
-        assert os.path.exists(os.path.join(OUTPUT_DIR, SQL_INDEX_FILENAME))
-        assert os.path.exists(os.path.join(OUTPUT_DIR, JSON_INDEX_FILENAME))
-        assert os.path.exists(os.path.join(OUTPUT_DIR, HTML_INDEX_FILENAME))
+        assert (Path(OUTPUT_DIR) / SQL_INDEX_FILENAME).exists()
+        assert (Path(OUTPUT_DIR) / JSON_INDEX_FILENAME).exists()
+        assert (Path(OUTPUT_DIR) / HTML_INDEX_FILENAME).exists()
         assert len(load_main_index(out_dir=OUTPUT_DIR)) == 0
 
     def test_conflicting_init(self):
-        with open(os.path.join(OUTPUT_DIR, 'test_conflict.txt'), 'w+') as f:
+        with open(Path(OUTPUT_DIR) / 'test_conflict.txt', 'w+') as f:
             f.write('test')
 
         try:
@@ -125,9 +126,9 @@ class TestInit(unittest.TestCase):
         except SystemExit:
             pass
 
-        assert not os.path.exists(os.path.join(OUTPUT_DIR, SQL_INDEX_FILENAME))
-        assert not os.path.exists(os.path.join(OUTPUT_DIR, JSON_INDEX_FILENAME))
-        assert not os.path.exists(os.path.join(OUTPUT_DIR, HTML_INDEX_FILENAME))
+        assert not (Path(OUTPUT_DIR) / SQL_INDEX_FILENAME).exists()
+        assert not (Path(OUTPUT_DIR) / JSON_INDEX_FILENAME).exists()
+        assert not (Path(OUTPUT_DIR) / HTML_INDEX_FILENAME).exists()
         try:
             load_main_index(out_dir=OUTPUT_DIR)
             assert False, 'load_main_index should raise an exception when no index is present'
@@ -159,7 +160,7 @@ class TestAdd(unittest.TestCase):
         assert len(all_links) == 30
 
     def test_add_arg_file(self):
-        test_file = os.path.join(OUTPUT_DIR, 'test.txt')
+        test_file = Path(OUTPUT_DIR) / 'test.txt'
         with open(test_file, 'w+') as f:
             f.write(test_urls)
 

archivebox/config/__init__.py

@@ -431,7 +431,7 @@ def write_config_file(config: Dict[str, str], out_dir: str=None) -> ConfigDict:
         with open(f'{config_path}.bak', 'r') as old:
             atomic_write(config_path, old.read())
 
-    if os.path.exists(f'{config_path}.bak'):
+    if Path(f'{config_path}.bak').exists():
         os.remove(f'{config_path}.bak')
 
     return {}
@@ -540,7 +540,7 @@ def bin_path(binary: Optional[str]) -> Optional[str]:
     if node_modules_bin.exists():
         return str(node_modules_bin.resolve())
 
-    return shutil.which(os.path.expanduser(binary)) or binary
+    return shutil.which(Path(binary).expanduser()) or binary
 
 def bin_hash(binary: Optional[str]) -> Optional[str]:
     if binary is None:
@@ -634,17 +634,17 @@ def get_code_locations(config: ConfigDict) -> SimpleConfigValueDict:
     }
 
 def get_external_locations(config: ConfigDict) -> ConfigValue:
-    abspath = lambda path: None if path is None else os.path.abspath(path)
+    abspath = lambda path: None if path is None else Path(path).resolve()
     return {
         'CHROME_USER_DATA_DIR': {
             'path': abspath(config['CHROME_USER_DATA_DIR']),
             'enabled': config['USE_CHROME'] and config['CHROME_USER_DATA_DIR'],
-            'is_valid': False if config['CHROME_USER_DATA_DIR'] is None else os.path.exists(os.path.join(config['CHROME_USER_DATA_DIR'], 'Default')),
+            'is_valid': False if config['CHROME_USER_DATA_DIR'] is None else (Path(config['CHROME_USER_DATA_DIR']) / 'Default').exists(),
         },
         'COOKIES_FILE': {
             'path': abspath(config['COOKIES_FILE']),
             'enabled': config['USE_WGET'] and config['COOKIES_FILE'],
-            'is_valid': False if config['COOKIES_FILE'] is None else os.path.exists(config['COOKIES_FILE']),
+            'is_valid': False if config['COOKIES_FILE'] is None else Path(config['COOKIES_FILE']).exists(),
         },
     }
 
@@ -828,7 +828,7 @@ def check_system_config(config: ConfigDict=CONFIG) -> None:
     # stderr('[i] Using Chrome binary: {}'.format(shutil.which(CHROME_BINARY) or CHROME_BINARY))
     # stderr('[i] Using Chrome data dir: {}'.format(os.path.abspath(CHROME_USER_DATA_DIR)))
     if config['CHROME_USER_DATA_DIR'] is not None:
-        if not os.path.exists(os.path.join(config['CHROME_USER_DATA_DIR'], 'Default')):
+        if not (Path(config['CHROME_USER_DATA_DIR']) / 'Default').exists():
             stderr('[X] Could not find profile "Default" in CHROME_USER_DATA_DIR.', color='red')
             stderr(f'    {config["CHROME_USER_DATA_DIR"]}')
             stderr('    Make sure you set it to a Chrome user data directory containing a Default profile folder.')

archivebox/core/settings.py

@@ -2,6 +2,7 @@ __package__ = 'archivebox.core'
 
 import os
 import sys
+from pathlib import Path
 from django.utils.crypto import get_random_string
 
 
@@ -49,9 +50,9 @@ TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
         'DIRS': [
-            os.path.join(PYTHON_DIR, 'themes', ACTIVE_THEME),
-            os.path.join(PYTHON_DIR, 'themes', 'default'),
-            os.path.join(PYTHON_DIR, 'themes'),
+            str(Path(PYTHON_DIR) / 'themes' / ACTIVE_THEME),
+            str(Path(PYTHON_DIR) / 'themes' / 'default'),
+            str(Path(PYTHON_DIR) / 'themes'),
         ],
         'APP_DIRS': True,
         'OPTIONS': {
@@ -70,7 +71,7 @@ WSGI_APPLICATION = 'core.wsgi.application'
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': os.path.join(OUTPUT_DIR, SQL_INDEX_FILENAME),
+        'NAME': str(Path(OUTPUT_DIR) / SQL_INDEX_FILENAME),
     }
 }
 
@@ -105,7 +106,7 @@ SHELL_PLUS_PRINT_SQL = False
 IPYTHON_ARGUMENTS = ['--no-confirm-exit', '--no-banner']
 IPYTHON_KERNEL_DISPLAY_NAME = 'ArchiveBox Django Shell'
 if IS_SHELL:
-    os.environ['PYTHONSTARTUP'] = os.path.join(PYTHON_DIR, 'core', 'welcome_message.py')
+    os.environ['PYTHONSTARTUP'] = str(Path(PYTHON_DIR) / 'core' / 'welcome_message.py')
 
 
 LANGUAGE_CODE = 'en-us'
@@ -122,6 +123,6 @@ EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
 
 STATIC_URL = '/static/'
 STATICFILES_DIRS = [
-    os.path.join(PYTHON_DIR, 'themes', ACTIVE_THEME, 'static'),
-    os.path.join(PYTHON_DIR, 'themes', 'default', 'static'),
+    str(Path(PYTHON_DIR) / 'themes' / ACTIVE_THEME / 'static'),
+    str(Path(PYTHON_DIR) / 'themes' / 'default' / 'static'),
 ]

archivebox/core/utils.py

@@ -14,11 +14,11 @@ def get_icons(snapshot: Snapshot) -> str:
 
     return format_html(
             '<span class="files-icons" style="font-size: 1.2em; opacity: 0.8">'
-                '<a href="/{}/{}/" class="exists-{}" title="Wget clone">🌐 </a> '
+                '<a href="/{}/{}" class="exists-{}" title="Wget clone">🌐 </a> '
                 '<a href="/{}/{}" class="exists-{}" title="PDF">📄</a> '
                 '<a href="/{}/{}" class="exists-{}" title="Screenshot">🖥 </a> '
                 '<a href="/{}/{}" class="exists-{}" title="HTML dump">🅷 </a> '
-                '<a href="/{}/{}/" class="exists-{}" title="WARC">🆆 </a> '
+                '<a href="/{}/{}" class="exists-{}" title="WARC">🆆 </a> '
                 '<a href="/{}/{}" class="exists-{}" title="SingleFile">&#128476; </a>'
                 '<a href="/{}/{}/" class="exists-{}" title="Media files">📼 </a> '
                 '<a href="/{}/{}/" class="exists-{}" title="Git repos">📦 </a> '

archivebox/core/views.py

@@ -114,12 +114,23 @@ class AddView(UserPassesTestMixin, FormView):
     template_name = "add_links.html"
     form_class = AddLinkForm
 
+    def get_initial(self):
+        """Prefill the AddLinkForm with the 'url' GET parameter"""
+        if self.request.method == 'GET':
+            url = self.request.GET.get('url', None)
+            if url:
+                return {'url': url}
+        else:
+            return super().get_initial()
+
     def test_func(self):
         return PUBLIC_ADD_VIEW or self.request.user.is_authenticated
 
     def get_context_data(self, *args, **kwargs):
         context = super().get_context_data(*args, **kwargs)
         context["title"] = "Add URLs"
+        # We can't just call request.build_absolute_uri in the template, because it would include query parameters
+        context["absolute_add_path"] = self.request.build_absolute_uri(self.request.path)
         return context
 
     def form_valid(self, form):

archivebox/extractors/__init__.py

@@ -75,7 +75,7 @@ def archive_link(link: Link, overwrite: bool=False, methods: Optional[Iterable[s
 
     out_dir = out_dir or Path(link.link_dir)
     try:
-        is_new = not os.path.exists(out_dir)
+        is_new = not Path(out_dir).exists()
         if is_new:
             os.makedirs(out_dir)
 

archivebox/extractors/favicon.py

@@ -1,6 +1,5 @@
 __package__ = 'archivebox.extractors'
 
-import os
 from pathlib import Path
 
 from typing import Optional
@@ -22,7 +21,7 @@ from ..logging_util import TimedProgress
 @enforce_types
 def should_save_favicon(link: Link, out_dir: Optional[str]=None) -> bool:
     out_dir = out_dir or link.link_dir
-    if os.path.exists(os.path.join(out_dir, 'favicon.ico')):
+    if (Path(out_dir) / 'favicon.ico').exists():
         return False
 
     return SAVE_FAVICON

archivebox/extractors/wget.py

@@ -179,7 +179,7 @@ def wget_output_path(link: Link) -> Optional[str]:
                     if re.search(".+\\.[Ss]?[Hh][Tt][Mm][Ll]?$", str(f), re.I | re.M)
                 ]
                 if html_files:
-                    return str(html_files[0])
+                    return str(html_files[0].relative_to(link.link_dir))
 
         # Move up one directory level
         search_dir = search_dir.parent

archivebox/index/__init__.py

@@ -575,7 +575,7 @@ def is_archived(link: Link) -> bool:
     return is_valid(link) and link.is_archived
     
 def is_unarchived(link: Link) -> bool:
-    if not os.path.exists(link.link_dir):
+    if not Path(link.link_dir).exists():
         return True
     return not link.is_archived
 

archivebox/index/html.py

@@ -1,7 +1,5 @@
 __package__ = 'archivebox.index'
 
-import os
-
 from string import Template
 from datetime import datetime
 from typing import List, Optional, Iterator, Mapping
@@ -30,11 +28,10 @@ from ..config import (
     FAVICON_FILENAME,
 )
 
-join = lambda *paths: os.path.join(*paths)
-MAIN_INDEX_TEMPLATE = join(TEMPLATES_DIR, 'main_index.html')
-MINIMAL_INDEX_TEMPLATE = join(TEMPLATES_DIR, 'main_index_minimal.html')
-MAIN_INDEX_ROW_TEMPLATE = join(TEMPLATES_DIR, 'main_index_row.html')
-LINK_DETAILS_TEMPLATE = join(TEMPLATES_DIR, 'link_details.html')
+MAIN_INDEX_TEMPLATE = str(Path(TEMPLATES_DIR) / 'main_index.html')
+MINIMAL_INDEX_TEMPLATE = str(Path(TEMPLATES_DIR) / 'main_index_minimal.html')
+MAIN_INDEX_ROW_TEMPLATE = str(Path(TEMPLATES_DIR) / 'main_index_row.html')
+LINK_DETAILS_TEMPLATE = str(Path(TEMPLATES_DIR) / 'link_details.html')
 TITLE_LOADING_MSG = 'Not yet archived...'
 
 
@@ -44,8 +41,8 @@ TITLE_LOADING_MSG = 'Not yet archived...'
 def parse_html_main_index(out_dir: Path=OUTPUT_DIR) -> Iterator[str]:
     """parse an archive index html file and return the list of urls"""
 
-    index_path = join(out_dir, HTML_INDEX_FILENAME)
-    if os.path.exists(index_path):
+    index_path = Path(out_dir) / HTML_INDEX_FILENAME
+    if index_path.exists():
         with open(index_path, 'r', encoding='utf-8') as f:
             for line in f:
                 if 'class="link-url"' in line:
@@ -56,12 +53,12 @@ def parse_html_main_index(out_dir: Path=OUTPUT_DIR) -> Iterator[str]:
 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(join(TEMPLATES_DIR, FAVICON_FILENAME), join(out_dir, FAVICON_FILENAME))
-    copy_and_overwrite(join(TEMPLATES_DIR, ROBOTS_TXT_FILENAME), join(out_dir, ROBOTS_TXT_FILENAME))
-    copy_and_overwrite(join(TEMPLATES_DIR, STATIC_DIR_NAME), join(out_dir, STATIC_DIR_NAME))
+    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(join(out_dir, HTML_INDEX_FILENAME), rendered_html)
+    atomic_write(str(out_dir / HTML_INDEX_FILENAME), rendered_html)
 
 
 @enforce_types
@@ -100,7 +97,7 @@ def main_index_row_template(link: Link) -> str:
 
         # before pages are finished archiving, show fallback loading favicon
         'favicon_url': (
-            join(ARCHIVE_DIR_NAME, link.timestamp, 'favicon.ico')
+            str(Path(ARCHIVE_DIR_NAME) / link.timestamp / 'favicon.ico')
             # if link['is_archived'] else 'data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs='
         ),
 
@@ -119,7 +116,7 @@ def write_html_link_details(link: Link, out_dir: Optional[str]=None) -> None:
     out_dir = out_dir or link.link_dir
 
     rendered_html = link_details_template(link)
-    atomic_write(join(out_dir, HTML_INDEX_FILENAME), rendered_html)
+    atomic_write(str(Path(out_dir) / HTML_INDEX_FILENAME), rendered_html)
 
 
 @enforce_types

archivebox/index/json.py

@@ -45,8 +45,8 @@ MAIN_INDEX_HEADER = {
 def parse_json_main_index(out_dir: Path=OUTPUT_DIR) -> Iterator[Link]:
     """parse an archive index json file and return the list of links"""
 
-    index_path = os.path.join(out_dir, JSON_INDEX_FILENAME)
-    if os.path.exists(index_path):
+    index_path = Path(out_dir) / JSON_INDEX_FILENAME
+    if index_path.exists():
         with open(index_path, 'r', encoding='utf-8') as f:
             links = pyjson.load(f)['links']
             for link_json in links:
@@ -86,7 +86,7 @@ def write_json_main_index(links: List[Link], out_dir: Path=OUTPUT_DIR) -> None:
         'last_run_cmd': sys.argv,
         'links': links,
     }
-    atomic_write(os.path.join(out_dir, JSON_INDEX_FILENAME), main_index_json)
+    atomic_write(str(Path(out_dir) / JSON_INDEX_FILENAME), main_index_json)
 
 
 ### Link Details Index
@@ -96,15 +96,15 @@ def write_json_link_details(link: Link, out_dir: Optional[str]=None) -> None:
     """write a json file with some info about the link"""
     
     out_dir = out_dir or link.link_dir
-    path = os.path.join(out_dir, JSON_INDEX_FILENAME)
-    atomic_write(path, link._asdict(extended=True))
+    path = Path(out_dir) / JSON_INDEX_FILENAME
+    atomic_write(str(path), link._asdict(extended=True))
 
 
 @enforce_types
 def parse_json_link_details(out_dir: Union[Path, str], guess: Optional[bool]=False) -> Optional[Link]:
     """load the json link index from a given directory"""
-    existing_index = os.path.join(out_dir, JSON_INDEX_FILENAME)
-    if os.path.exists(existing_index):
+    existing_index = Path(out_dir) / JSON_INDEX_FILENAME
+    if existing_index.exists():
         with open(existing_index, 'r', encoding='utf-8') as f:
             try:
                 link_json = pyjson.load(f)
@@ -118,9 +118,9 @@ def parse_json_link_details(out_dir: Union[Path, str], guess: Optional[bool]=Fal
 def parse_json_links_details(out_dir: Union[Path, str]) -> Iterator[Link]:
     """read through all the archive data folders and return the parsed links"""
 
-    for entry in os.scandir(os.path.join(out_dir, ARCHIVE_DIR_NAME)):
+    for entry in os.scandir(Path(out_dir) / ARCHIVE_DIR_NAME):
         if entry.is_dir(follow_symlinks=True):
-            if os.path.exists(os.path.join(entry.path, 'index.json')):
+            if (Path(entry.path) / 'index.json').exists():
                 try:
                     link = parse_json_link_details(entry.path)
                 except KeyError:

archivebox/index/schema.py

@@ -1,6 +1,5 @@
 __package__ = 'archivebox.index'
 
-import os
 from pathlib import Path
 
 from datetime import datetime, timedelta
@@ -250,7 +249,7 @@ class Link:
     @property
     def link_dir(self) -> str:
         from ..config import CONFIG
-        return os.path.join(CONFIG['ARCHIVE_DIR'], self.timestamp)
+        return str(Path(CONFIG['ARCHIVE_DIR']) / self.timestamp)
 
     @property
     def archive_path(self) -> str:
@@ -369,7 +368,7 @@ class Link:
         )
 
         return any(
-            os.path.exists(os.path.join(ARCHIVE_DIR, self.timestamp, path))
+            (Path(ARCHIVE_DIR) / self.timestamp / path).exists()
             for path in output_paths
         )
 

archivebox/logging_util.py

@@ -390,7 +390,7 @@ def log_list_finished(links):
 def log_removal_started(links: List["Link"], yes: bool, delete: bool):
     print('{lightyellow}[i] Found {} matching URLs to remove.{reset}'.format(len(links), **ANSI))
     if delete:
-        file_counts = [link.num_outputs for link in links if os.path.exists(link.link_dir)]
+        file_counts = [link.num_outputs for link in links if Path(link.link_dir).exists()]
         print(
             f'    {len(links)} Links will be de-listed from the main index, and their archived content folders will be deleted from disk.\n'
             f'    ({len(file_counts)} data folders with {sum(file_counts)} archived files will be deleted!)'
@@ -445,9 +445,9 @@ def log_shell_welcome_msg():
 @enforce_types
 def pretty_path(path: Union[Path, str]) -> str:
     """convert paths like .../ArchiveBox/archivebox/../output/abc into output/abc"""
-    pwd = os.path.abspath('.')
+    pwd = Path('.').resolve()
     # parent = os.path.abspath(os.path.join(pwd, os.path.pardir))
-    return str(path).replace(pwd + '/', './')
+    return str(path).replace(str(pwd) + '/', './')
 
 
 @enforce_types
@@ -518,11 +518,11 @@ def printable_folder_status(name: str, folder: Dict) -> str:
         color, symbol, note, num_files = 'lightyellow', '-', 'disabled', '-'
 
     if folder['path']:
-        if os.path.exists(folder['path']):
+        if Path(folder['path']).exists():
             num_files = (
                 f'{len(os.listdir(folder["path"]))} files'
-                if os.path.isdir(folder['path']) else
-                printable_filesize(os.path.getsize(folder['path']))
+                if Path(folder['path']).is_dir() else
+                printable_filesize(Path(folder['path']).stat().st_size)
             )
         else:
             num_files = 'missing'

archivebox/parsers/__init__.py

@@ -8,7 +8,6 @@ For examples of supported import formats see tests/.
 __package__ = 'archivebox.parsers'
 
 import re
-import os
 from io import StringIO
 
 from typing import IO, Tuple, List, Optional
@@ -128,7 +127,7 @@ def run_parser_functions(to_parse: IO[str], timer, root_url: Optional[str]=None)
 @enforce_types
 def save_text_as_source(raw_text: str, filename: str='{ts}-stdin.txt', out_dir: Path=OUTPUT_DIR) -> str:
     ts = str(datetime.now().timestamp()).split('.', 1)[0]
-    source_path = os.path.join(out_dir, SOURCES_DIR_NAME, filename.format(ts=ts))
+    source_path = str(out_dir / SOURCES_DIR_NAME / filename.format(ts=ts))
     atomic_write(source_path, raw_text)
     log_source_saved(source_file=source_path)
     return source_path
@@ -138,7 +137,7 @@ def save_text_as_source(raw_text: str, filename: str='{ts}-stdin.txt', out_dir:
 def save_file_as_source(path: str, timeout: int=TIMEOUT, filename: str='{ts}-{basename}.txt', out_dir: Path=OUTPUT_DIR) -> str:
     """download a given url's content into output/sources/domain-<timestamp>.txt"""
     ts = str(datetime.now().timestamp()).split('.', 1)[0]
-    source_path = os.path.join(OUTPUT_DIR, SOURCES_DIR_NAME, filename.format(basename=basename(path), ts=ts))
+    source_path = str(OUTPUT_DIR / SOURCES_DIR_NAME / filename.format(basename=basename(path), ts=ts))
 
     if any(path.startswith(s) for s in ('http://', 'https://', 'ftp://')):
         # Source is a URL that needs to be downloaded

archivebox/system.py

@@ -64,7 +64,7 @@ def chmod_file(path: str, cwd: str='.', permissions: str=OUTPUT_PERMISSIONS) ->
 @enforce_types
 def copy_and_overwrite(from_path: str, to_path: str):
     """copy a given file or directory to a given path, overwriting the destination"""
-    if os.path.isdir(from_path):
+    if Path(from_path).is_dir():
         shutil.rmtree(to_path, ignore_errors=True)
         shutil.copytree(from_path, to_path)
     else:

archivebox/themes/default/add_links.html

@@ -49,6 +49,12 @@
                     <small>(it's safe to leave this page, adding will continue in the background)</small>
                 </div>
             </center>
+            {% if absolute_add_path %}
+            <center id="bookmarklet">
+              <p>Bookmark this link to quickly add to your archive:
+                <a href="javascript:void(window.open('{{ absolute_add_path }}?url='+document.location.href));">Add to ArchiveBox</a></p>
+            </center>
+            {% endif %}
             <script>
                 document.getElementById('add-form').addEventListener('submit', function(event) {
                     setTimeout(function() {

archivebox/themes/legacy/main_index_row.html

@@ -2,7 +2,7 @@
     <td title="$timestamp">$bookmarked_date</td>
     <td class="title-col">
         <a href="$archive_path/index.html" class="link-url"><img src="$favicon_url" class="link-favicon" decoding="async"></a>
-        <a href="$wget_url" title="$title">
+        <a href="$archive_path/$wget_url" title="$title">
             <span data-title-for="$url" data-archived="$is_archived">$title</span>
             <small style="float:right">$tags</small>
         </a>

bin/build.sh

@@ -12,31 +12,11 @@ IFS=$'\n'
 
 REPO_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && cd .. && pwd )"
 
-source "$REPO_DIR/.venv/bin/activate"
 cd "$REPO_DIR"
 
-# echo "[*] Fetching latest docs version"
-# cd "$REPO_DIR/docs"
-# git pull
-# cd "$REPO_DIR"
-
-# echo "[+] Building docs"
-# sphinx-apidoc -o docs archivebox
-# cd "$REPO_DIR/docs"
-# make html
-# cd "$REPO_DIR"
-
-echo "[*] Cleaning up build dirs"
-cd "$REPO_DIR"
-rm -Rf build dist archivebox.egg-info
-
-echo "[+] Building sdist, bdist_egg, and bdist_wheel"
-python3 setup.py sdist bdist_egg bdist_wheel
-
-echo "[+] Building docker image in the background..."
-docker build . -t archivebox \
-               -t archivebox:latest > /tmp/archivebox_docker_build.log 2>&1 &
-ps "$!"
+./bin/build_docs.sh
+./bin/build_pip.sh
+./bin/build_docker.sh
 
 echo "[√] Done. Install the built package by running:"
 echo "    python3 setup.py install"

bin/build_docker.sh

@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+
+### Bash Environment Setup
+# http://redsymbol.net/articles/unofficial-bash-strict-mode/
+# https://www.gnu.org/software/bash/manual/html_node/The-Set-Builtin.html
+# set -o xtrace
+set -o errexit
+set -o errtrace
+set -o nounset
+set -o pipefail
+IFS=$'\n'
+
+REPO_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && cd .. && pwd )"
+VERSION="$(jq -r '.version' < "$REPO_DIR/package.json")"
+cd "$REPO_DIR"
+
+
+echo "[+] Building docker image in the background..."
+docker build . -t archivebox \
+               -t archivebox:latest \
+               -t archivebox:$VERSION \
+               -t docker.io/nikisweeting/archivebox:latest \
+               -t docker.io/nikisweeting/archivebox:$VERSION \
+               -t docker.pkg.github.com/pirate/archivebox/archivebox:latest \
+               -t docker.pkg.github.com/pirate/archivebox/archivebox:$VERSION

bin/build_docs.sh

@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+
+### Bash Environment Setup
+# http://redsymbol.net/articles/unofficial-bash-strict-mode/
+# https://www.gnu.org/software/bash/manual/html_node/The-Set-Builtin.html
+# set -o xtrace
+set -o errexit
+set -o errtrace
+set -o nounset
+set -o pipefail
+IFS=$'\n'
+
+REPO_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && cd .. && pwd )"
+
+source "$REPO_DIR/.venv/bin/activate"
+cd "$REPO_DIR"
+
+
+
+echo "[*] Fetching latest docs version"
+cd "$REPO_DIR/docs"
+git pull
+cd "$REPO_DIR"
+
+echo "[+] Building docs"
+sphinx-apidoc -o docs archivebox
+cd "$REPO_DIR/docs"
+make html
+# open docs/_build/html/index.html to see the output
+cd "$REPO_DIR"

bin/build_pip.sh

@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+
+### Bash Environment Setup
+# http://redsymbol.net/articles/unofficial-bash-strict-mode/
+# https://www.gnu.org/software/bash/manual/html_node/The-Set-Builtin.html
+# set -o xtrace
+set -o errexit
+set -o errtrace
+set -o nounset
+set -o pipefail
+IFS=$'\n'
+
+REPO_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && cd .. && pwd )"
+
+source "$REPO_DIR/.venv/bin/activate"
+cd "$REPO_DIR"
+
+
+echo "[*] Cleaning up build dirs"
+cd "$REPO_DIR"
+rm -Rf build dist archivebox.egg-info
+
+echo "[+] Building sdist, bdist_egg, and bdist_wheel"
+python3 setup.py sdist bdist_egg bdist_wheel

bin/release.sh

@@ -12,27 +12,12 @@ IFS=$'\n'
 
 REPO_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && cd .. && pwd )"
 
-function bump_semver {
-    echo "$1" | awk -F. '{$NF = $NF + 1;} 1' | sed 's/ /./g'
-}
-
 source "$REPO_DIR/.venv/bin/activate"
 cd "$REPO_DIR"
 
-OLD_VERSION="$(jq -r '.version' < "$REPO_DIR/package.json")"
-NEW_VERSION="$(bump_semver "$OLD_VERSION")"
 
-echo "[*] Fetching latest docs version"
-cd "$REPO_DIR/docs"
-git pull
-cd "$REPO_DIR"
-
-echo "[+] Building docs"
-sphinx-apidoc -o docs archivebox
-cd "$REPO_DIR/docs"
-make html
-cd "$REPO_DIR"
 
+# Make sure git is clean
 if [ -z "$(git status --porcelain)" ] && [[ "$(git branch --show-current)" == "master" ]]; then 
     git pull
 else
@@ -41,42 +26,44 @@ else
     sleep 10
 fi
 
+
+# Bump version number in source
+function bump_semver {
+    echo "$1" | awk -F. '{$NF = $NF + 1;} 1' | sed 's/ /./g'
+}
+
+OLD_VERSION="$(jq -r '.version' < "$REPO_DIR/package.json")"
+NEW_VERSION="$(bump_semver "$OLD_VERSION")"
 echo "[*] Bumping VERSION from $OLD_VERSION to $NEW_VERSION"
 contents="$(jq ".version = \"$NEW_VERSION\"" "$REPO_DIR/package.json")" && \
 echo "${contents}" > package.json
-git add "$REPO_DIR/docs"
-git add "$REPO_DIR/package.json"
-git add "$REPO_DIR/package-lock.json"
 
-echo "[*] Cleaning up build dirs"
-cd "$REPO_DIR"
-rm -Rf build dist archivebox.egg-info
 
-echo "[+] Building sdist and bdist_wheel"
-python3 setup.py sdist bdist_egg bdist_wheel
+# Build docs, python package, and docker image
+./bin/build_docs.sh
+./bin/build_pip.sh
+./bin/build_docker.sh
 
+
+# Push build to github
 echo "[^] Pushing source to github"
+git add "$REPO_DIR/docs"
+git add "$REPO_DIR/package.json"
+git add "$REPO_DIR/package-lock.json"
 git add "$REPO_DIR/archivebox.egg-info"
 git commit -m "$NEW_VERSION release"
 git tag -a "v$NEW_VERSION" -m "v$NEW_VERSION"
 git push origin master
 git push origin --tags
 
+
+# Push releases to github
 echo "[^] Uploading to test.pypi.org"
 python3 -m twine upload --repository testpypi dist/*
 
 echo "[^] Uploading to pypi.org"
 python3 -m twine upload --repository pypi dist/*
 
-echo "[+] Building docker image"
-docker build . -t archivebox \
-               -t archivebox:latest \
-               -t archivebox:$NEW_VERSION \
-               -t docker.io/nikisweeting/archivebox:latest \
-               -t docker.io/nikisweeting/archivebox:$NEW_VERSION \
-               -t docker.pkg.github.com/pirate/archivebox/archivebox:latest \
-               -t docker.pkg.github.com/pirate/archivebox/archivebox:$NEW_VERSION
-
 echo "[^] Uploading docker image"
 # docker login --username=nikisweeting
 # docker login docker.pkg.github.com --username=pirate

docs

@@ -1 +1 @@
-Subproject commit 96bab842f25e794190c7513a84ff542fe749d95e
+Subproject commit 604d30ec22e9182b5d41b982140b884c53883039

tests/mock_server/server.py

@@ -1,4 +1,3 @@
-from os.path import abspath
 from os import getcwd
 from pathlib import Path
 
@@ -10,20 +9,20 @@ def index():
 
 @route("/static/<filename>")
 def static_path(filename):
-    template_path = abspath(getcwd()) / Path("tests/mock_server/templates")
+    template_path = Path.cwd().resolve() / "tests/mock_server/templates"
     response = static_file(filename, root=template_path)
     return response
 
 @route("/static_no_content_type/<filename>")
 def static_no_content_type(filename):
-    template_path = abspath(getcwd()) / Path("tests/mock_server/templates")
+    template_path = Path.cwd().resolve() / "tests/mock_server/templates"
     response = static_file(filename, root=template_path)
     response.set_header("Content-Type", "")
     return response
 
 @route("/static/headers/<filename>")
 def static_path_with_headers(filename):
-    template_path = abspath(getcwd()) / Path("tests/mock_server/templates")
+    template_path = Path.cwd().resolve() / "tests/mock_server/templates"
     response = static_file(filename, root=template_path)
     response.add_header("Content-Language", "en")
     response.add_header("Content-Script-Type", "text/javascript")
@@ -32,7 +31,7 @@ def static_path_with_headers(filename):
 
 @route("/static/400/<filename>", method="HEAD")
 def static_400(filename):
-    template_path = abspath(getcwd()) / Path("tests/mock_server/templates")
+    template_path = Path.cwd().resolve() / "tests/mock_server/templates"
     response = static_file(filename, root=template_path)
     response.status = 400
     response.add_header("Status-Code", "400")
@@ -40,7 +39,7 @@ def static_400(filename):
 
 @route("/static/400/<filename>", method="GET")
 def static_200(filename):
-    template_path = abspath(getcwd()) / Path("tests/mock_server/templates")
+    template_path = Path.cwd().resolve() / "tests/mock_server/templates"
     response = static_file(filename, root=template_path)
     response.add_header("Status-Code", "200")
     return response