Commit Graph

1635 Commits

Author SHA1 Message Date
Merlijn Wajer
e1069c084e Merge pull request #658 from CommandMC/fix/tests
Make tests more robust by mocking AccurateRip responses
2026-02-07 11:00:31 +01:00
Merlijn Wajer
4bf9d8cf8b Merge pull request #662 from CommandMC/fix/releaseid-complete
Make sure to always print out the full release id
2026-02-07 10:59:26 +01:00
Merlijn Wajer
9b2c636fa4 Merge pull request #659 from CommandMC/ref/remove-pkgresources
No longer rely on `pkg_resources`
2026-02-07 10:58:28 +01:00
Katharina Dröge
d2f1ea9d9e Make sure to always print out the full release id
Signed-off-by: Katharina Dröge <kate@commandmc.de>
2025-09-25 23:45:55 +02:00
Katharina Dröge
adab25986f No longer rely on pkg_resources
Signed-off-by: Katharina Dröge <kate@commandmc.de>
2025-09-24 21:52:02 +02:00
Katharina Dröge
036fd82096 Make tests more robust by mocking AccurateRip responses
Signed-off-by: Katharina Dröge <kate@commandmc.de>
2025-09-24 17:52:47 +02:00
Merlijn Wajer
bc8b96d956 Merge pull request #549 from BioBox/prompt
Better --prompt Handling
2025-04-03 23:20:52 +02:00
Merlijn Wajer
26a176897d Merge pull request #588 from boustrophedon/config_example
Update README.md config file example
2025-04-01 10:07:32 +02:00
Merlijn Wajer
799fd92763 Merge pull request #633 from ntrrgc/toc-string-parsing
New TOC CD-TEXT string decoding
2024-11-25 16:51:36 +01:00
Merlijn Wajer
fb1440b69f Merge pull request #636 from mdosch/patch-1
s/leenode/libera
2024-09-23 10:52:05 +02:00
Martin
df0cc8aedc s/leenode/libera 2024-09-21 21:31:30 +02:00
Alicia Boya García
4719c74f65 New TOC CD-TEXT string decoding
This patch replaces the previous broken approach to TOC string decoding
that used `.encode().decode('unicode_escape')` with proper parsing of
the escape sequences cdrdao is known to generate.

The new parser is also lenient with invalid escape sequences, that can
occur due to improper escaping in cdrdao. See:
https://github.com/cdrdao/cdrdao/issues/32

Latin-1:

This new parsing method should work for Latin-1 strings for both old and
new versions of cdrdao, as long as those strings don't trigger the
improper escaping issues in upstream cdrdao.

This has been verified with the album Diorama from the Danish black
metal band MØL.

MS-JIS:

This new parsing method should also work for MS-JIS strings as long as
the .toc file was generated by cdrdao 1.2.5+ and the strings don't
trigger improper escaping issues in upstream cdrdao.

Unfortunately, I don't have any CD with CD-Text in MS-JIS, so I could
not verify this.

cdrdao versions before 1.2.5 will still cause whipper to produce
mojibake (garbled characters) when reading MS-JIS CD-Text, as those
versions do not encode strings in UTF-8.

Other encodings:

As far as I know, CD-Text only supports officially ASCII, Latin-1 and
MS-JIS, but I wouldn't be surprised if there are unofficial encodings
out there, given the strange strings I've seen in some bug reports.

If you have a CD with garbled CD-Text, please submit a bug report
indicating the performer, album name, language and attach the .toc file
so that the produced strings can be compared to the expected text.

Fixes https://github.com/whipper-team/whipper/issues/169

Signed-off-by: Alicia Boya García <ntrrgc@gmail.com>
2024-08-27 12:19:29 +02:00
Merlijn Wajer
a4b97422ea Merge pull request #600 from AndrewKvalheim/string-format
Correct string formatting
2024-04-01 21:05:44 +02:00
Merlijn Wajer
5325328717 Merge pull request #610 from JoshWVS/save-flac-after-embedding-image
Save FLAC file after embedding cover art
2024-04-01 21:01:45 +02:00
Joshua Simpson
098af47231 Save FLAC file after embedding cover art
Signed-off-by: Josh Simpson <107582704+JoshWVS@users.noreply.github.com>
2024-03-25 18:09:44 -04:00
Andrew Kvalheim
2ebe7033e0 Correct string formatting
The input to the RuntimeError constructor is not a format string.
2023-09-26 05:46:33 -07:00
Harry Stern
3d40e40c95 Update README.md config file example
Show how to set top-level whipper arguments

Signed-off-by: Harry Stern <harry@harrystern.net>
2023-03-03 20:56:32 -05:00
JoeLametta
6ad681aff5 Update libcdio-utils bug warning in README
Resolves #558

Signed-off-by: JoeLametta <JoeLametta@users.noreply.github.com>
2022-07-16 16:21:26 +00:00
JoeLametta
e0ad242795 Fix flake8 warning
Signed-off-by: JoeLametta <JoeLametta@users.noreply.github.com>
2022-07-16 16:01:35 +00:00
JoeLametta
1ab1ec982d Merge pull request #562 from arcctgx/accurip-url-strip
Fix stripping AccurateRip URL in accurip command
2022-07-16 17:54:16 +02:00
JoeLametta
df48f1c71c Merge pull request #561 from bmwalters/event-loop
extern.task: replace GLib event loop with asyncio event loop
2022-07-16 17:47:39 +02:00
arcctgx
c47abef5a1 Fix stripping AccurateRip URL in accurip command
Using lstrip() to remove initial part of the URL results in removing too
many characters when AccurateRip identifier has hex digits a, c or e in
the beginning (e.g. e/e/d/dBAR-006-000aadee-003920f8-4d0a3d06.bin
becomes d/dBAR-006-000aadee-003920f8-4d0a3d06.bin).

Signed-off-by: arcctgx <arcctgx@o2.pl>
2022-07-09 21:13:53 +02:00
Bradley Walters
3c9fa49f30 requirements: remove no longer used PyGObject
Signed-off-by: Bradley Walters <oss@walters.app>
2022-05-27 19:24:29 -06:00
Bradley Walters
1b13013782 extern.task: replace GLib event loop with asyncio event loop
Signed-off-by: Bradley Walters <oss@walters.app>
2022-05-23 17:59:07 -06:00
JoeLametta
8445e28f55 Merge pull request #557 from baldurmen/accuraterip-checksum-manpage
Add man page for accuraterip-checksum
2022-05-12 21:56:42 +02:00
Louis-Philippe Véronneau
9f7edca6b0 Add man page for accuraterip-checksum
Signed-off-by: Louis-Philippe Véronneau <pollo@debian.org>
2022-04-15 00:28:42 -04:00
Daniel J. Perry
3395c1d753 Make --prompt input case in-sensitive
Signed-off-by: Daniel J. Perry <dperry45@gatech.edu>
2021-08-01 14:29:14 -04:00
Daniel J. Perry
ebdbde4ce9 Less ambiguous prompt selection message
Signed-off-by: Daniel J. Perry <dperry45@gatech.edu>
2021-08-01 14:29:14 -04:00
JoeLametta
18a41b6c28 Merge pull request #548 from BioBox/makepkg
Fix bug caused by unescaped globbing
2021-07-26 14:40:11 +02:00
Daniel J. Perry
31073c67cb Fix bug caused by unescaped globbing
Signed-off-by: Daniel J. Perry <dperry45@gatech.edu>
2021-07-26 01:45:00 -04:00
JoeLametta
3c17c08604 Merge pull request #543 from mweinelt/common-yaml-formatter
Use custom YAML subclass to be compatible with ruamel_yaml>=0.17
2021-07-04 17:43:02 +02:00
JoeLametta
c216430ace README: added reference to cd-paranoia's bug (with bounty)
Signed-off-by: JoeLametta <JoeLametta@users.noreply.github.com>
2021-07-04 15:09:41 +00:00
Martin Weinelt
e0942417a1 Use custom YAML subclass to be compatible with ruamel_yaml>=0.17
Signed-off-by: Martin Weinelt <hexa@darmstadt.ccc.de>
2021-07-04 16:53:09 +02:00
JoeLametta
0a4042d8f0 README: restore Matrix contact information
Signed-off-by: JoeLametta <JoeLametta@users.noreply.github.com>
2021-07-04 14:17:46 +00:00
JoeLametta
09f6bf1b46 Add usage information to offsets.py script
Signed-off-by: JoeLametta <JoeLametta@users.noreply.github.com>
2021-05-26 10:35:58 +00:00
JoeLametta
90d6600c9c Travis CI: test generation of man pages
Signed-off-by: JoeLametta <JoeLametta@users.noreply.github.com>
2021-05-26 10:35:58 +00:00
JoeLametta
042bf8f926 Mark suitable methods as static
Signed-off-by: JoeLametta <JoeLametta@users.noreply.github.com>
2021-05-26 10:35:58 +00:00
JoeLametta
8d6e64f58d Replace mutable default argument with None
Signed-off-by: JoeLametta <JoeLametta@users.noreply.github.com>
2021-05-26 10:35:58 +00:00
JoeLametta
06356fc40f README update, code linting changes
- PEP8 fix
- Remove useless parens
- Docstring fixes
- RegEX: remove unneeded escape character
- accuraterip-checksum: output usage to stderr in case of wrong invocation

Signed-off-by: JoeLametta <JoeLametta@users.noreply.github.com>
2021-05-26 10:35:58 +00:00
Frederik “Freso” S. Olesen
2d34d53539 Merge pull request #541 from whipper-team/issue-540-move-official-channel-off-freenode
Change IRC pointers to point to Libera.Chat
2021-05-21 20:32:12 +02:00
Frederik “Freso” S. Olesen
3a2ff47d17 Change IRC pointers to point to Libera.Chat
freenode experienced a hostile takeover:
https://gist.github.com/joepie91/df80d8d36cd9d1bde46ba018af497409/
https://gist.github.com/aaronmdjones/1a9a93ded5b7d162c3f58bdd66b8f491
etc.

Essentially all of freenode staff founded/moved over to Libera.Chat:
https://libera.chat/news/welcome-to-libera-chat

whipper’s official IRC presence will also be on Libera.Chat going
forward. freenode channel will exist for a bit longer, but will
eventually get locked.

AFAIK, there is no Matrix bridge yet(?), so removing the Matrix bit for
now. Will be added back in later when a bridge is established.

Resolves https://github.com/whipper-team/whipper/issues/540

Signed-off-by: Frederik “Freso” S. Olesen <freso.dk@gmail.com>
2021-05-21 13:26:57 +02:00
JoeLametta
9833a99d77 Remove PKG-INFO to avoid keeping fixed version number in develop
Signed-off-by: JoeLametta <JoeLametta@users.noreply.github.com>
2021-05-17 15:53:39 +00:00
JoeLametta
be1db82270 Merge branch 'develop' 2021-05-17 15:46:08 +00:00
JoeLametta
236544dce9 Push whipper release v0.10.0
Fixes #428.

Signed-off-by: JoeLametta <JoeLametta@users.noreply.github.com>
2021-05-17 15:40:43 +00:00
JoeLametta
731453ea8d Avoid useless './' in file paths
Replaced useless 'os.path.relpath(os.getcwd())' statement with 'os.curdir' (which is equal to '.').

Signed-off-by: JoeLametta <JoeLametta@users.noreply.github.com>
2021-05-16 17:19:14 +00:00
JoeLametta
078d3515ab Merge pull request #537 from blueblots/keep-going-err
Fixed error when ripping using `--keep-going` without specifying `--o…
2021-05-16 19:07:24 +02:00
blueblots
4d997bc65b Fixed error when ripping using --keep-going without specifying --output-directory
Added `os.path.basename()` to `skipped_tracks` comparison in
`ImageVerifyTask`. When `OUTPUT_DIRECTORY` is at its default '.'
`./` is prepended to the file path of `index.path`, causing the error.

Signed-off-by: blueblots <63152708+blueblots@users.noreply.github.com>
2021-05-16 16:45:35 +01:00
JoeLametta
b6338b2ec7 Merge pull request #536 from whipper-team/misc-changes-template
This pull request extends the supported template variables. Additions:

- `%B`: release barcode (already included but is now allowed)
- `%C`: release catalog number (already included but is now allowed)
- `%c`: release disambiguation comment
- `%D`: disc title without disambiguation
- `%I`: MusicBrainz Disc ID
- `%M`: total number of discs in the chosen release
- `%N`: number of current disc
- `%T`: medium title

When the relative metadata is available, whipper now adds the `TRACKTOTAL`, `DISCTOTAL` and `DISCNUMBER` metadata tags to the audio tracks.

I've also taken the inspiration from pull request #476.

Resolves #401, resolves #440, resolves #448.
2021-05-16 12:48:05 +02:00
JoeLametta
9d67144087 Add 'TRACKTOTAL', 'DISCTOTAL', 'DISCNUMBER' metatada to audio tracks
Co-authored-by: Máximo Castañeda <antiswen@yahoo.es>
Signed-off-by: JoeLametta <JoeLametta@users.noreply.github.com>
2021-05-16 10:32:02 +00:00
JoeLametta
1edd3657ba Introduce %M, %N template variables
- %M: total number of discs in the chosen release
- %N: number of current disc

Signed-off-by: JoeLametta <JoeLametta@users.noreply.github.com>
2021-05-16 10:32:02 +00:00