diff --git a/bookscraper/db/db.py b/bookscraper/db/db.py index c944e3a..5c989d9 100644 --- a/bookscraper/db/db.py +++ b/bookscraper/db/db.py @@ -42,7 +42,7 @@ def get_db(): def enable_wal_mode(conn): - conn.execute("PRAGMA journal_mode=WAL;") + conn.execute("PRAGMA journal_mode=DELETE;") conn.execute("PRAGMA synchronous=NORMAL;") conn.commit() diff --git a/bookscraper/docker-compose.yml b/bookscraper/docker-compose.yml index b2b7feb..5c6b8c8 100644 --- a/bookscraper/docker-compose.yml +++ b/bookscraper/docker-compose.yml @@ -5,14 +5,15 @@ services: redis: image: redis:7 container_name: bookscraper_redis - command: [ + command: + [ "redis-server", "--save", - "", # Disable RDB snapshots + "", "--appendonly", - "no", # Disable AOF + "no", "--stop-writes-on-bgsave-error", - "no", # Never block writes + "no", ] ports: - "6379:6379" @@ -41,7 +42,8 @@ services: - PYTHONUNBUFFERED=1 volumes: - .:/app - - /Users/peter/Desktop/books:/app/output + - /Users/peter/mnt/asustor/Sync/bookscraper/books:/Users/peter/mnt/asustor/Sync/bookscraper/books + - /Users/peter/mnt/asustor/Sync/bookscraper/db:/Users/peter/mnt/asustor/Sync/bookscraper/db restart: "no" # ---------------------------------------------------------- @@ -54,7 +56,8 @@ services: container_name: bookscraper_web volumes: - .:/app - - /Users/peter/Desktop/books:/app/output + - /Users/peter/mnt/asustor/Sync/bookscraper/books:/Users/peter/mnt/asustor/Sync/bookscraper/books + - /Users/peter/mnt/asustor/Sync/bookscraper/db:/Users/peter/mnt/asustor/Sync/bookscraper/db depends_on: redis: condition: service_healthy @@ -77,7 +80,8 @@ services: container_name: worker_download volumes: - .:/app - - /Users/peter/Desktop/books:/app/output + - /Users/peter/mnt/asustor/Sync/bookscraper/books:/Users/peter/mnt/asustor/Sync/bookscraper/books + - /Users/peter/mnt/asustor/Sync/bookscraper/db:/Users/peter/mnt/asustor/Sync/bookscraper/db depends_on: redis: condition: service_healthy @@ -96,7 +100,8 @@ services: container_name: worker_parse volumes: - .:/app - - /Users/peter/Desktop/books:/app/output + - /Users/peter/mnt/asustor/Sync/bookscraper/books:/Users/peter/mnt/asustor/Sync/bookscraper/books + - /Users/peter/mnt/asustor/Sync/bookscraper/db:/Users/peter/mnt/asustor/Sync/bookscraper/db depends_on: redis: condition: service_healthy @@ -115,7 +120,8 @@ services: container_name: worker_save volumes: - .:/app - - /Users/peter/Desktop/books:/app/output + - /Users/peter/mnt/asustor/Sync/bookscraper/books:/Users/peter/mnt/asustor/Sync/bookscraper/books + - /Users/peter/mnt/asustor/Sync/bookscraper/db:/Users/peter/mnt/asustor/Sync/bookscraper/db depends_on: redis: condition: service_healthy @@ -134,7 +140,8 @@ services: container_name: worker_scraping volumes: - .:/app - - /Users/peter/Desktop/books:/app/output + - /Users/peter/mnt/asustor/Sync/bookscraper/books:/Users/peter/mnt/asustor/Sync/bookscraper/books + - /Users/peter/mnt/asustor/Sync/bookscraper/db:/Users/peter/mnt/asustor/Sync/bookscraper/db depends_on: redis: condition: service_healthy diff --git a/bookscraper/scraper/tasks/audio_tasks.py b/bookscraper/scraper/tasks/audio_tasks.py index 4e23ce2..d80d2f1 100644 --- a/bookscraper/scraper/tasks/audio_tasks.py +++ b/bookscraper/scraper/tasks/audio_tasks.py @@ -7,8 +7,10 @@ from logbus.publisher import log import os import subprocess import time + from scraper.progress import inc_audio_done, inc_audio_skipped -from db.repository import inc_audio_done + +# from db.repository import inc_audio_done from scraper.abort import abort_requested from redis import Redis from urllib.parse import urlparse diff --git a/bookscraper/static/covers/一剑朝天.jpg b/bookscraper/static/covers/一剑朝天.jpg new file mode 100644 index 0000000..8b1256e Binary files /dev/null and b/bookscraper/static/covers/一剑朝天.jpg differ diff --git a/bookscraper/static/covers/从吞噬开始.jpg b/bookscraper/static/covers/从吞噬开始.jpg new file mode 100644 index 0000000..fb7cd72 Binary files /dev/null and b/bookscraper/static/covers/从吞噬开始.jpg differ diff --git a/bookscraper/static/covers/流氓高手.jpg b/bookscraper/static/covers/流氓高手.jpg new file mode 100644 index 0000000..d269316 Binary files /dev/null and b/bookscraper/static/covers/流氓高手.jpg differ diff --git a/bookscraper/static/covers/流氓高手II.jpg b/bookscraper/static/covers/流氓高手II.jpg new file mode 100644 index 0000000..4d96826 Binary files /dev/null and b/bookscraper/static/covers/流氓高手II.jpg differ