Skip to content

Commit b7dd70d

Browse files
Fix: Pass subject to converter and fix input type
1 parent f5085a8 commit b7dd70d

3 files changed

Lines changed: 17 additions & 7 deletions

File tree

CONTRIBUTORS

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
CONTRIBUTORS
22

33
This file is automatically generated. DO NOT EDIT MANUALLY.
4-
Generated on: 2025-10-29T11:15:51.677020Z
4+
Generated on: 2025-11-26T16:02:57.818004Z
55

66
Upstream project: https://github.com/janeczku/calibre-web
77
Fork project (Calibre-Web Automated, since 2024): https://github.com/crocodilestick/calibre-web-automated
@@ -12,7 +12,7 @@ Copyright (C) 2018-2025 Calibre-Web contributors
1212
Copyright (C) 2024-2025 Calibre-Web Automated contributors
1313
# Upstream Contributors (janeczku/calibre-web)
1414

15-
- OzzieIsaacs (anon) (2750 commits)
15+
- OzzieIsaacs (anon) (2758 commits)
1616
- Ozzie Isaacs (anon) (263 commits)
1717
- cbartondock (96 commits)
1818
- idalin (69 commits)
@@ -123,6 +123,7 @@ Copyright (C) 2024-2025 Calibre-Web Automated contributors
123123
- h1f0x (2 commits)
124124
- halkeye (2 commits)
125125
- hitsounds (2 commits)
126+
- holzerseb (2 commits)
126127
- issmirnov (2 commits)
127128
- jef (2 commits)
128129
- jfenske89 (2 commits)
@@ -133,6 +134,7 @@ Copyright (C) 2024-2025 Calibre-Web Automated contributors
133134
- nanu-c (2 commits)
134135
- norangebit (2 commits)
135136
- Northguy (2 commits)
137+
- o-F3L1X-o (2 commits)
136138
- peperunas (2 commits)
137139
- petersonev (2 commits)
138140
- rafarq (2 commits)
@@ -154,6 +156,7 @@ Copyright (C) 2024-2025 Calibre-Web Automated contributors
154156
- adocampo (1 commits)
155157
- aexvir (1 commits)
156158
- akushsky (1 commits)
159+
- alasano (1 commits)
157160
- Allram (1 commits)
158161
- altair (1 commits)
159162
- anatoliifetisov (1 commits)
@@ -254,6 +257,7 @@ Copyright (C) 2024-2025 Calibre-Web Automated contributors
254257
- nelsg2 (1 commits)
255258
- nferrari (1 commits)
256259
- NickWick13 (1 commits)
260+
- Nico31240 (1 commits)
257261
- oguzkilcan (1 commits)
258262
- overhacked (1 commits)
259263
- petervirtech (1 commits)
@@ -272,6 +276,8 @@ Copyright (C) 2024-2025 Calibre-Web Automated contributors
272276
- ruben-herold (1 commits)
273277
- ryanlong1004 (1 commits)
274278
- sartoshi-foot-dao (1 commits)
279+
- schnabelewobski (1 commits)
280+
- shsm0520 (1 commits)
275281
- skiman6010 (1 commits)
276282
- SpaceWhite (1 commits)
277283
- theopsall (1 commits)
@@ -298,15 +304,16 @@ Copyright (C) 2024-2025 Calibre-Web Automated contributors
298304
- zhiyue (1 commits)
299305
# Fork Contributors (crocodilestick/calibre-web-automated)
300306

301-
- crocodilestick (745 commits)
307+
- crocodilestick (772 commits)
302308
- jmarmstrong1207 (73 commits)
303309
- demitrix (30 commits)
304310
- sirwolfgang (22 commits)
305311
- Domoel (21 commits)
312+
- wolffshots (14 commits)
306313
- angelicadvocate (9 commits)
314+
- jgoguen (9 commits)
307315
- natabat (8 commits)
308316
- nstwfdev (8 commits)
309-
- jgoguen (7 commits)
310317
- alva-seal (6 commits)
311318
- smevawala (5 commits)
312319
- Aymendje (4 commits)
@@ -322,9 +329,11 @@ Copyright (C) 2024-2025 Calibre-Web Automated contributors
322329
- sethvoltz (2 commits)
323330
- Strubbl (2 commits)
324331
- tecosaur (2 commits)
332+
- TexGG (2 commits)
325333
- tseho (2 commits)
326334
- Valenth (2 commits)
327335
- a-eukarya (1 commits)
336+
- AlexSat (1 commits)
328337
- Andrej Kralj (anon) (1 commits)
329338
- bcrdncola (1 commits)
330339
- brunofin (1 commits)
@@ -348,6 +357,7 @@ Copyright (C) 2024-2025 Calibre-Web Automated contributors
348357
- jack1lee1995 (anon) (1 commits)
349358
- jspiers (1 commits)
350359
- kevpam (1 commits)
360+
- lazyusername (1 commits)
351361
- Marodeur80 (anon) (1 commits)
352362
- Matteo Benaroyo (anon) (1 commits)
353363
- morpheus65535 (1 commits)

cps/helper.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,10 +208,10 @@ def send_mail(book_id, book_format, convert, ereader_mail, calibrepath, user_id,
208208

209209
if convert == 1:
210210
# returns None if success, otherwise errormessage
211-
return convert_book_format(book_id, calibrepath, 'mobi', book_format.lower(), user_id, ereader_mail)
211+
return convert_book_format(book_id, calibrepath, 'mobi', book_format.lower(), user_id, ereader_mail, subject)
212212
if convert == 2:
213213
# returns None if success, otherwise errormessage
214-
return convert_book_format(book_id, calibrepath, 'azw3', book_format.lower(), user_id, ereader_mail)
214+
return convert_book_format(book_id, calibrepath, 'azw3', book_format.lower(), user_id, ereader_mail, subject)
215215

216216
if not subject or not subject.strip():
217217
subject = _("Send to eReader")

cps/templates/user_edit.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ <h1>{{title}}</h1>
3030
</div>
3131
<div class="form-group">
3232
<label for="kindle_mail_subject">{{_('Send to eReader Subject')}}</label>
33-
<input type="email" class="form-control" name="kindle_mail_subject" id="kindle_mail_subject" value="{{ content.kindle_mail_subject if content.kindle_mail_subject != None }}">
33+
<input type="text" class="form-control" name="kindle_mail_subject" id="kindle_mail_subject" value="{{ content.kindle_mail_subject if content.kindle_mail_subject != None }}">
3434
</div>
3535
{% if not content.role_anonymous() %}
3636
<div class="form-group">

0 commit comments

Comments
 (0)