From 708ba51ea481d328ae6e3f839af933a9dc2b31d4 Mon Sep 17 00:00:00 2001
From: Colin Hebert <hebert.colin@gmail.com>
Date: Wed, 16 Oct 2024 17:42:13 +1100
Subject: [PATCH] Fix up audiobook download

---
 book-collector/compose.yaml  | 36 +++++++++++++++---------------------
 comic-collector/compose.yaml |  2 ++
 ebook-reader/compose.yaml    |  2 +-
 media-player/compose.yaml    |  3 +--
 4 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/book-collector/compose.yaml b/book-collector/compose.yaml
index 70fea8f..354ce3f 100644
--- a/book-collector/compose.yaml
+++ b/book-collector/compose.yaml
@@ -1,41 +1,35 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/compose-spec/compose-spec/master/schema/compose-spec.json
 
-name: book-collector
+x-readarr: &a1
+  extends:
+    file: ../compose.base.yaml
+    service: exposed-service
+  image: lscr.io/linuxserver/readarr:develop # TODO: Move to a stable version
+  environment:
+    PUID: ${NASCOMPOSE_UID?}
+    PGID: ${NASCOMPOSE_GID?}
+  networks:
+    - torrents
+    - usenet
+
 services:
   readarr-audiobook:
-    extends:
-      file: ../compose.base.yaml
-      service: exposed-service
+    <<: *a1
     container_name: readarr-audiobook
-    image: lscr.io/linuxserver/readarr:develop # TODO: Move to a stable version
-    environment:
-      PUID: ${NASCOMPOSE_UID?}
-      PGID: ${NASCOMPOSE_GID?}
-    networks:
-      - torrents
-      - usenet
     volumes:
       - ./volumes/readarr-audiobook_config/:/config/
       - ${NASCOMPOSE_DATA?}/:/data/
     labels:
       traefik.http.routers.readarr-audiobook.middlewares: authelia@file
   readarr-ebook:
-    extends:
-      file: ../compose.base.yaml
-      service: exposed-service
+    <<: *a1
     container_name: readarr-ebook
-    image: lscr.io/linuxserver/readarr:develop # TODO: Move to a stable version
-    environment:
-      PUID: ${NASCOMPOSE_UID?}
-      PGID: ${NASCOMPOSE_GID?}
-    networks:
-      - torrents
-      - usenet
     volumes:
       - ./volumes/readarr-ebook_config/:/config/
       - ${NASCOMPOSE_DATA?}/:/data/
     labels:
       traefik.http.routers.readarr-ebook.middlewares: authelia@file
+
 networks:
   reverse-proxy:
     external: true
diff --git a/comic-collector/compose.yaml b/comic-collector/compose.yaml
index 1089d7a..55abfc0 100644
--- a/comic-collector/compose.yaml
+++ b/comic-collector/compose.yaml
@@ -23,3 +23,5 @@ networks:
     external: true
   usenet:
     external: true
+  reverse-proxy:
+    external: true
diff --git a/ebook-reader/compose.yaml b/ebook-reader/compose.yaml
index 242fd67..f4e6099 100644
--- a/ebook-reader/compose.yaml
+++ b/ebook-reader/compose.yaml
@@ -14,8 +14,8 @@ services:
       - calibre
     volumes:
       - ./volumes/calibre_config/:/config/
-      - ${NASCOMPOSE_DATA?}/media/ebooks/:/data/media/ebooks/
       - ./volumes/calibre_database/metadata.db:/data/media/ebooks/metadata.db
+      - ${NASCOMPOSE_DATA?}/media/ebooks/:/data/media/ebooks/
     labels:
       traefik.http.services.calibre.loadbalancer.server.port: 8080
       traefik.http.routers.calibre.middlewares: authelia@file
diff --git a/media-player/compose.yaml b/media-player/compose.yaml
index a3ebea0..c9ef7d7 100644
--- a/media-player/compose.yaml
+++ b/media-player/compose.yaml
@@ -65,9 +65,8 @@ services:
     volumes:
       - ./volumes/audiobookshelf_config/:/config/
       - ./volumes/audiobookshelf_metadata/:/metadata/
-      - ${NASCOMPOSE_DATA?}/media/audiobooks/:/audiobooks/
+      - ${NASCOMPOSE_DATA?}/media/audiobooks/:/data/audiobooks/:ro
     labels:
-      traefik.http.routers.audiobookshelf.middlewares: authelia@file
       traefik.http.services.audiobookshelf.loadbalancer.server.port: 13378
 networks:
   media-player: