Skip to content

Commit d43e63c

Browse files
Merge branch 'main' into fk-delete-cascade
2 parents 39183b0 + 5abaa24 commit d43e63c

104 files changed

Lines changed: 19373 additions & 1678 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

CONTRIBUTORS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,6 @@ Copyright (C) 2024-2026 Calibre-Web Automated contributors
314314
- zelazna (1 commits)
315315
- zhiyue (1 commits)
316316
# Fork Contributors (crocodilestick/calibre-web-automated)
317-
318317
- crocodilestick (962 commits)
319318
- jmarmstrong1207 (73 commits)
320319
- demitrix (30 commits)

Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,8 @@ RUN \
209209
nano \
210210
sqlite3 \
211211
zip \
212+
gettext \
213+
libasound2t64 \
212214
libxtst6 \
213215
libxrandr2 \
214216
libxkbfile1 \
@@ -282,8 +284,9 @@ RUN \
282284
# Add unrar from unrar stage
283285
COPY --from=unrar /usr/bin/unrar-ubuntu /usr/bin/unrar
284286

285-
# Set calibre environment variable
287+
# Set calibre environment variables
286288
ENV CALIBRE_CONFIG_DIR=/config/.config/calibre
289+
ENV LD_LIBRARY_PATH=/app/calibre/lib
287290

288291
# Ports and volumes
289292
WORKDIR /config

README.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,14 @@ Calibre-Web Automated aims to be an all-in-one solution, combining the modern li
4646

4747
## _Affiliated Projects_ 👬
4848

49-
### Calibre-Web Automated Book Downloader
49+
### Shelfmark: Book Downloader
5050

5151
- An intuitive web interface for searching and requesting book downloads, designed to work seamlessly with Calibre-Web-Automated. This project streamlines the process of downloading books and preparing them for integration into your Calibre library
5252

53-
[<img src="https://raw.githubusercontent.com/vadret/android/master/assets/get-github.png" alt="Get it on GitHub" height="80">](https://github.com/calibrain/calibre-web-automated-book-downloader)
53+
> [!IMPORTANT]
54+
> CWA does not approve of or support piracy of copyrighted materials and is not responsible for user behaviour
55+
56+
[<img src="https://raw.githubusercontent.com/vadret/android/master/assets/get-github.png" alt="Get it on GitHub" height="80">](https://github.com/calibrain/shelfmark)
5457

5558
___
5659

@@ -142,7 +145,7 @@ This tells CWA to avoid enabling WAL on the Calibre `metadata.db` and the `app.d
142145
- Using the information provided in the Calibre eBook-converter documentation on which formats convert best into epubs, CWA is able to determine from downloads containing multiple eBook formats, which format will convert most optimally, ignoring the other formats to ensure the **best possible quality** and no **duplicate imports** -->
143146

144147
#### **Automatic Conversion Service** 🔃
145-
- On by default though can be toggled of in the CWA Settings page, with EPUB as the default target format
148+
- On by default though can be toggled off in the CWA Settings page, with EPUB as the default target format
146149
- _Available target formats include:_ **EPUB**, **MOBI**, **AZW3**, **KEPUB** & **PDF**
147150
- Upon detecting new files in the Ingest Directory, if any of the files are in formats the user has configured CWA to auto-convert to the current target format,
148151
- The following **28 file types are currently supported:**
Lines changed: 23 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)