49045 Commits

Author SHA1 Message Date
413Michele
3fc57d78db
String update for consistency 2024-03-26 15:21:46 +01:00
Kovid Goyal
41758b707d
Merge branch 'master' of https://github.com/unkn0w7n/calibre 2024-03-26 13:05:53 +05:30
unkn0w7n
15c1e62154 ... 2024-03-26 13:02:26 +05:30
unkn0w7n
0bd99e0635 Update himal_southasian.recipe 2024-03-26 12:57:33 +05:30
Kovid Goyal
66689df291
Merge branch 'fix-re-sub' of https://github.com/nikital/calibre 2024-03-25 08:04:52 +05:30
Nikita Leshenko
3458394a6c Use bytes replacement pattern for bytes-based re.sub
In this case data and regex are bytes, so repl argument should be bytes as
well. Before this fix, we would sometimes get this error:

```
calibre, version 7.3.0 (linux, embedded-python: False)
Conversion error: Failed: Convert book 1 of 1 (xxxxxxxxxx)
--- snip ---
2024-03-24 23:43:49 [INFO] Upgrading to EPUB 3...
Traceback (most recent call last):
  File "/usr/bin/calibre-parallel", line 21, in <module>
    sys.exit(main())
             ^^^^^^
  File "/usr/lib64/calibre/calibre/utils/ipc/worker.py", line 214, in main
    result = func(*args, **kwargs)
             ^^^^^^^^^^^^^^^^^^^^^
  File "/usr/lib64/calibre/calibre/gui2/convert/gui_conversion.py", line 38, in gui_convert_override
    gui_convert(input, output, recommendations, notification=notification,
  File "/usr/lib64/calibre/calibre/gui2/convert/gui_conversion.py", line 25, in gui_convert
    plumber.run()
  File "/usr/lib64/calibre/calibre/ebooks/conversion/plumber.py", line 1281, in run
    self.output_plugin.convert(self.oeb, self.output, self.input_plugin,
  File "calibre_plugins.kepubout.conversion.kepub_output", line 146, in convert
  File "/usr/lib64/calibre/calibre/ebooks/conversion/plugins/epub_output.py", line 275, in convert
    encryption = self.upgrade_to_epub3(tdir, opf, encryption)
                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/usr/lib64/calibre/calibre/ebooks/conversion/plugins/epub_output.py", line 319, in upgrade_to_epub3
    container.commit()
  File "/usr/lib64/calibre/calibre/ebooks/oeb/polish/container.py", line 1360, in commit
    super().commit(keep_parsed=keep_parsed)
  File "/usr/lib64/calibre/calibre/ebooks/oeb/polish/container.py", line 1073, in commit
    self.commit_item(name, keep_parsed=keep_parsed)
  File "/usr/lib64/calibre/calibre/ebooks/oeb/polish/container.py", line 1017, in commit_item
    data = self.serialize_item(name)
           ^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/usr/lib64/calibre/calibre/ebooks/oeb/polish/container.py", line 1008, in serialize_item
    data = re.sub(br'(<[/]{0,1})opf:', r'\1', data)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/usr/lib64/python3.12/re/__init__.py", line 186, in sub
    return _compile(pattern, flags).sub(repl, string, count)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
TypeError: sequence item 1: expected str instance, bytes found
```

In my case, the error would show up when converting EPUBs to KEBPUBs.
2024-03-24 23:56:00 +02:00
Kovid Goyal
df6b0bf2f8
pep8 2024-03-24 17:09:58 +05:30
Kovid Goyal
61dc642c42
... 2024-03-24 17:08:58 +05:30
Kovid Goyal
7654f34b69
Merge branch 'patch-2' of https://github.com/claudehenchoz/calibre 2024-03-24 17:08:00 +05:30
claudehenchoz
3ff582c625
Update nzz_ger.recipe to add cover retrieval 2024-03-24 11:25:07 +01:00
Kovid Goyal
2ccacce456
Merge branch 'master' of https://github.com/unkn0w7n/calibre 2024-03-24 10:54:48 +05:30
unkn0w7n
3cafbb9c0c the week 2024-03-24 10:50:47 +05:30
Kovid Goyal
a9d42f8183
Yet another Supernote USB product ID 2024-03-24 08:51:08 +05:30
Kovid Goyal
7b16d17808
Merge branch 'patch-1' of https://github.com/claudehenchoz/calibre 2024-03-23 08:05:42 +05:30
claudehenchoz
346cdca47a
Update nzz_ger.recipe 2024-03-23 02:55:56 +01:00
Kovid Goyal
96291b841b
Preview release 2024-03-22 07:55:09 +05:30
Kovid Goyal
fc47eb7c68
Merge branch 'master' of https://github.com/unkn0w7n/calibre 2024-03-21 10:30:53 +05:30
unkn0w7n
3eed5e26be ... 2024-03-21 10:25:18 +05:30
Kovid Goyal
2e4453f5d4
Merge branch 'master' of https://github.com/unkn0w7n/calibre 2024-03-21 10:06:11 +05:30
unkn0w7n
bcbeabaf06 live_law.recipe update 2024-03-21 10:02:20 +05:30
Kovid Goyal
f0d4ceeed4
Merge branch 'master' of https://github.com/cbhaley/calibre
Fixes #2058472 [[Enhancement] Sort by tool](https://bugs.launchpad.net/calibre/+bug/2058472)
2024-03-21 08:02:55 +05:30
Charles Haley
988f4dff47 Enhancement #2058472: Sort by tool. Change to menu to add "reapply current sort".
Also changed it to show the shortcuts for reapply and reverse sort.
2024-03-20 21:04:04 +00:00
Kovid Goyal
b79f7f2f37
Translate text for a couple more guide entries 2024-03-20 16:25:32 +05:30
Kovid Goyal
13c6a4c018
EPUB Input: Use a translated name for the cover page 2024-03-20 12:33:49 +05:30
Kovid Goyal
a3904830a8
Merge branch 'master' of https://github.com/goodmost/calibre 2024-03-19 18:16:48 +05:30
goodmost
77c1844256 chore: remove repetitive words
Signed-off-by: goodmost <zhaohaiyang@outlook.com>
2024-03-19 20:28:18 +08:00
Kovid Goyal
52a8da38ac
Merge branch 'master' of https://github.com/cbhaley/calibre 2024-03-17 17:00:10 +05:30
Charles Haley
d674a8e456 Don't display an empty custom column group box when all custom columns are deselected in Look & feel / Edit metadata 2024-03-17 11:10:08 +00:00
Charles Haley
cfc14e774f Small change to commit d84b1e2 to be a little safer. 2024-03-17 10:20:19 +00:00
Kovid Goyal
d84b1e2009
Grid view cover cache: Fix covers not loading when cache entries are stale 2024-03-17 10:05:54 +05:30
Kovid Goyal
f95d35c68d
pep8 2024-03-17 09:35:49 +05:30
Kovid Goyal
781bb771f4
Merge branch 'master' of https://github.com/unkn0w7n/calibre 2024-03-17 09:30:43 +05:30
Kovid Goyal
ff687b3d34
Merge branch 'master' of https://github.com/cbhaley/calibre 2024-03-17 09:14:25 +05:30
unkn0w7n
911e15e63b ... 2024-03-16 20:24:18 +05:30
unkn0w7n
2f962ad21c POLITICO.EU recipe 2024-03-16 20:17:57 +05:30
Charles Haley
bfe4131bba Template searches should never be cached. Each call can produce a different answer without any underlying data changes. 2024-03-16 12:40:05 +00:00
Kovid Goyal
4c8fdce8c1
Merge branch 'pr/1804' of https://github.com/bartix3/calibre 2024-03-16 09:26:58 +05:30
unIQue
5ad89470b4 Merge remote-tracking branch 'upstream/master' into pr/1804 2024-03-16 04:52:06 +01:00
Kovid Goyal
7f7af8f98f
Fix #2058036 [v7.7 whats-new error: "Natural Geographic"](https://bugs.launchpad.net/calibre/+bug/2058036) 2024-03-15 20:00:34 +05:30
Kovid Goyal
6725d5f443
Update CBC Canada
Fixes #2057992 [CBC News Correct RSS Recipe](https://bugs.launchpad.net/calibre/+bug/2057992)
2024-03-15 10:50:23 +05:30
Kovid Goyal
80cf6f447a
Add a title bar to the profiles page 2024-03-15 10:46:02 +05:30
Kovid Goyal
9a38ad9121
DRYer 2024-03-15 05:33:03 +05:30
Kovid Goyal
9330217e9b
Fix trim button not being activated by initial region specification 2024-03-15 05:31:21 +05:30
Kovid Goyal
976f881eec
string changes 2024-03-15 05:19:05 +05:30
Kovid Goyal
8072ea11a3
version 7.7.0 v7.7.0 2024-03-14 08:49:04 +05:30
Kovid Goyal
a185e4b400
... 2024-03-14 08:24:20 +05:30
Kovid Goyal
c8b2cb4c90
Merge branch 'fix_desc' of https://github.com/IceflowRE/calibre 2024-03-14 08:23:19 +05:30
Iceflower
563c6f7763
Fix comic description 2024-03-13 19:21:02 +01:00
Kovid Goyal
3ad4759cbf
pep8 2024-03-13 21:53:25 +05:30
Kovid Goyal
4bd400c7d6
... 2024-03-13 21:37:17 +05:30