Compare commits

..

6 Commits

Author SHA1 Message Date
msramalho
eec138b7ce updates wrong yarn references and replaces with npm 2026-07-01 14:04:21 +01:00
msramalho
575ce6dcf6 version bump to 1.2.8 2026-07-01 14:03:55 +01:00
msramalho
486238c019 browsertrix bump 2026-07-01 14:03:48 +01:00
msramalho
8e4bca50b2 dependencies update 2026-06-30 18:20:49 +01:00
Miguel Sozinho Ramalho
9e651bb849 Merge pull request #434 from PeterUpfold/video-unavailable-fix
Removes 'video unavailable' from YouTube deletion indicators
2026-05-01 10:21:30 +01:00
Peter Upfold
6581bbe139 Remove 'video unavailable' from YouTube deletion indicators 2026-04-28 21:02:38 +01:00
11 changed files with 552 additions and 555 deletions

View File

@@ -22,30 +22,30 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Check out the repo - name: Check out the repo
uses: actions/checkout@v7 uses: actions/checkout@v6
- name: Set up QEMU - name: Set up QEMU
uses: docker/setup-qemu-action@v4 uses: docker/setup-qemu-action@v3
# https://github.com/docker/setup-buildx-action # https://github.com/docker/setup-buildx-action
- name: Set up Docker Buildx - name: Set up Docker Buildx
id: buildx id: buildx
uses: docker/setup-buildx-action@v4 uses: docker/setup-buildx-action@v3
- name: Log in to Docker Hub - name: Log in to Docker Hub
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9
with: with:
username: ${{ secrets.DOCKER_USERNAME }} username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }} password: ${{ secrets.DOCKER_PASSWORD }}
- name: Extract metadata (tags, labels) for Docker - name: Extract metadata (tags, labels) for Docker
id: meta id: meta
uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051
with: with:
images: bellingcat/auto-archiver images: bellingcat/auto-archiver
- name: Build and push Docker image - name: Build and push Docker image
uses: docker/build-push-action@v7 uses: docker/build-push-action@v6
with: with:
context: . context: .
platforms: linux/amd64,linux/arm64 platforms: linux/amd64,linux/arm64

View File

@@ -22,7 +22,7 @@ jobs:
steps: steps:
- name: Checkout Repository - name: Checkout Repository
uses: actions/checkout@v7 uses: actions/checkout@v6
- name: Set up Python - name: Set up Python
uses: actions/setup-python@v6 uses: actions/setup-python@v6

View File

@@ -20,7 +20,7 @@ jobs:
build: build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v7 - uses: actions/checkout@v6
- name: Install Python - name: Install Python
uses: actions/setup-python@v6 uses: actions/setup-python@v6
with: with:

View File

@@ -26,7 +26,7 @@ jobs:
working-directory: ./ working-directory: ./
steps: steps:
- uses: actions/checkout@v7 - uses: actions/checkout@v6
- name: Install ffmpeg - name: Install ffmpeg
run: sudo apt-get update && sudo apt-get install -y ffmpeg run: sudo apt-get update && sudo apt-get install -y ffmpeg
@@ -40,7 +40,7 @@ jobs:
run: pipx install poetry run: pipx install poetry
- name: Cache Poetry and pip artifacts - name: Cache Poetry and pip artifacts
uses: actions/cache@v6 uses: actions/cache@v5
with: with:
path: | path: |
~/.cache/pypoetry ~/.cache/pypoetry

View File

@@ -20,7 +20,7 @@ jobs:
working-directory: ./ working-directory: ./
steps: steps:
- uses: actions/checkout@v7 - uses: actions/checkout@v6
- name: Install ffmpeg - name: Install ffmpeg
run: sudo apt-get update && sudo apt-get install -y ffmpeg run: sudo apt-get update && sudo apt-get install -y ffmpeg
@@ -34,7 +34,7 @@ jobs:
run: pipx install poetry run: pipx install poetry
- name: Cache Poetry and pip artifacts - name: Cache Poetry and pip artifacts
uses: actions/cache@v6 uses: actions/cache@v5
with: with:
path: | path: |
~/.cache/pypoetry ~/.cache/pypoetry

View File

@@ -1,4 +1,4 @@
FROM webrecorder/browsertrix-crawler:1.12.4 AS base FROM webrecorder/browsertrix-crawler:1.13.2 AS base
ENV RUNNING_IN_DOCKER=1 \ ENV RUNNING_IN_DOCKER=1 \
LANG=C.UTF-8 \ LANG=C.UTF-8 \

View File

@@ -143,7 +143,7 @@ generic_extractor:
**PyPi/ Local**: **PyPi/ Local**:
When using the Auto Archiver PyPI package, or running locally, you will need additional system requirements to run the token generation script, namely either Docker, or Node.js and Yarn. When using the Auto Archiver PyPI package, or running locally, you will need additional system requirements to run the token generation script, namely either Docker, or Node.js and npm (>=9).
See the [bgutil-ytdlp-pot-provider](https://github.com/Brainicism/bgutil-ytdlp-pot-provider?tab=readme-ov-file#a-http-server-option) documentation for more details. See the [bgutil-ytdlp-pot-provider](https://github.com/Brainicism/bgutil-ytdlp-pot-provider?tab=readme-ov-file#a-http-server-option) documentation for more details.

1072
poetry.lock generated

File diff suppressed because it is too large Load Diff

View File

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
[project] [project]
name = "auto-archiver" name = "auto-archiver"
version = "1.2.7" version = "1.2.8"
description = "Automatically archive links to videos, images, and social media content from Google Sheets (and more)." description = "Automatically archive links to videos, images, and social media content from Google Sheets (and more)."
requires-python = ">=3.10,<3.13" requires-python = ">=3.10,<3.13"

View File

@@ -109,7 +109,7 @@ class GenericExtractor(Extractor):
def setup_token_generation_script(self) -> None: def setup_token_generation_script(self) -> None:
"""This function sets up the Proof of Origin Token generation script method for """This function sets up the Proof of Origin Token generation script method for
bgutil-ytdlp-pot-provider if enabled or in Docker.""" bgutil-ytdlp-pot-provider if enabled or in Docker."""
missing_tools = [tool for tool in ("node", "yarn", "npx") if shutil.which(tool) is None] missing_tools = [tool for tool in ("node", "npm", "npx") if shutil.which(tool) is None]
if missing_tools: if missing_tools:
logger.error( logger.error(
f"Cannot set up PO Token script; missing required tools: {', '.join(missing_tools)}. " f"Cannot set up PO Token script; missing required tools: {', '.join(missing_tools)}. "
@@ -151,7 +151,7 @@ class GenericExtractor(Extractor):
shutil.move(os.path.join(extracted_root, "server"), server_dir) shutil.move(os.path.join(extracted_root, "server"), server_dir)
shutil.rmtree(extracted_root) shutil.rmtree(extracted_root)
logger.info("Installing dependencies and transpiling PoT Generator script...") logger.info("Installing dependencies and transpiling PoT Generator script...")
subprocess.run(["yarn", "install", "--frozen-lockfile"], cwd=server_dir, check=True) subprocess.run(["npm", "ci"], cwd=server_dir, check=True)
subprocess.run(["npx", "tsc"], cwd=server_dir, check=True) subprocess.run(["npx", "tsc"], cwd=server_dir, check=True)
with open(version_file, "w") as vf: with open(version_file, "w") as vf:

View File

@@ -64,7 +64,6 @@ class DeletionIndicators:
# YouTube deletion indicators # YouTube deletion indicators
YOUTUBE = [ YOUTUBE = [
"This video isn't available anymore", "This video isn't available anymore",
"Video unavailable",
"This video has been removed", "This video has been removed",
"This video is no longer available", "This video is no longer available",
"This video is private", "This video is private",