Commit Graph

1605 Commits

Author SHA1 Message Date
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
JoeLametta
76b8004b8f Introduce %T (medium title) template variable
Signed-off-by: JoeLametta <JoeLametta@users.noreply.github.com>
2021-05-16 10:32:02 +00:00
JoeLametta
e6ad23f119 Introduce %c (release disambiguation comment) template variable
Signed-off-by: JoeLametta <JoeLametta@users.noreply.github.com>
2021-05-16 10:32:02 +00:00
JoeLametta
bff5c91fa3 Introduce %I (MusicBrainz Disc ID) template variable
Signed-off-by: JoeLametta <JoeLametta@users.noreply.github.com>
2021-05-16 10:32:02 +00:00
JoeLametta
a97820b578 Add %D (disc title without disambiguation) to allowed template variables
Signed-off-by: JoeLametta <JoeLametta@users.noreply.github.com>
2021-05-16 10:32:02 +00:00
JoeLametta
e4645dfdd3 Swap 'title' and 'releaseTitle' meaning
- Trasparent change: now it makes more sense.
- Updated tests to reflect 'title', 'releaseTitle' meaning swap.
- Improved documentation.

Signed-off-by: JoeLametta <JoeLametta@users.noreply.github.com>
2021-05-16 10:32:02 +00:00
JoeLametta
e6d9838148 Enable %B (barcode) and %C (catalog number) template variables
Already included but were not allowed.
Improved documentation.

Signed-off-by: JoeLametta <JoeLametta@users.noreply.github.com>
2021-05-16 10:32:02 +00:00
JoeLametta
0eaf80c4bb Template: replace None values with empty string
Signed-off-by: JoeLametta <JoeLametta@users.noreply.github.com>
2021-05-16 10:28:54 +00:00
JoeLametta
824ab995ab Add logger statement about output directory in cdrdao
Fixes #393.

Signed-off-by: JoeLametta <JoeLametta@users.noreply.github.com>
2021-05-14 18:01:33 +00:00
JoeLametta
dedd38f029 Ignore leading / trailing slashes in template
Fixes #530.

Signed-off-by: JoeLametta <JoeLametta@users.noreply.github.com>
2021-05-14 16:08:58 +00:00
JoeLametta
5040bc9094 Fix stupid syntax error in previous commit
Signed-off-by: JoeLametta <JoeLametta@users.noreply.github.com>
2021-05-14 11:34:29 +00:00
JoeLametta
c8dcea5a0d Travis CI: Add Python 3.10-dev (allow_failures mode)
Signed-off-by: JoeLametta <JoeLametta@users.noreply.github.com>
2021-05-14 11:28:43 +00:00
JoeLametta
6577b7f262 Hopefully fix test failures introduced with previous commit
Signed-off-by: JoeLametta <JoeLametta@users.noreply.github.com>
2021-05-14 11:25:41 +00:00
JoeLametta
7e30e7c952 Apply PathFilter's filters to all the template's components
Fixes #513.

Signed-off-by: JoeLametta <JoeLametta@users.noreply.github.com>
2021-05-14 10:33:38 +00:00
JoeLametta
1e33bc62ed Make PathFilter's filter tolerant to empty strings
Signed-off-by: JoeLametta <JoeLametta@users.noreply.github.com>
2021-05-14 10:31:53 +00:00
JoeLametta
84e4ef6ab8 offset find: fail early and inform the user with CDs having less than 3 tracks
Fixes #532

Signed-off-by: JoeLametta <JoeLametta@users.noreply.github.com>
2021-03-31 10:07:39 +00:00
JoeLametta
7691a51550 Merge pull request #524 from blueblots/skip-error-tracks
Implemented the option (`-k`, `--keep-going`) to continue ripping the CD even if one track fails to rip

Resolves #128
2021-03-28 18:26:19 +02:00
JoeLametta
2c8acd61a2 Add 'keep-going' option to whipper-cd-rip's manpage
Signed-off-by: JoeLametta <JoeLametta@users.noreply.github.com>
2021-03-28 16:13:46 +00:00
JoeLametta
c97f2ce547 Add warning about missing files referenced in the cue sheet
This happens when a track fails to be ripped and gets skipped.

Signed-off-by: JoeLametta <JoeLametta@users.noreply.github.com>
2021-03-28 16:13:39 +00:00
blueblots
6505591462 Fixed m3u and cue sheet generation
Added conditional to `program.write_m3u()` to
ignore skipped tracks.

Added skipped_tracks support to the `Program` and
`image.ImageVerifyTask` classes to avoid crashing
when a file for a skipped track doesn't exist.

Added conditional to `accurip.calculate_checksums`
to check if a path exists before trying to calculate
checksums, this prevents `accuraterip-checksum.c` from
emitting an error message (`sf_open failed!`) when a
path doesn't exist (as when a track is skipped).

Signed-off-by: blueblots <63152708+blueblots@users.noreply.github.com>
2021-03-28 16:10:37 +00:00
blueblots
13e1ab6c14 Changed logging strings, removed unnecessary return
Removed `return None` from the `Rip.doCommand` method
as suggested in review comments.

Changed logging strings to use logger arguments rather
than printf-string, as suggested in review comments.

Signed-off-by: blueblots <63152708+blueblots@users.noreply.github.com>
2021-03-28 16:10:37 +00:00
blueblots
9f36d323bb Added non-zero exit, altered logger format strings
Added an exit status of 5 when tracks are skipped
during a rip attempt.

Fixed a TypeError caused by a syntax error in the
format string on line 537 in `whipper/command/cd.py`.

Changed f-string to printf-style format string
on line 493 in `whipper/command/cd.py`.

Signed-off-by: blueblots <63152708+blueblots@users.noreply.github.com>
2021-03-28 16:10:37 +00:00
blueblots
ae596df834 Fixed error and added log output
Made changes to fix `KeyError` and implemented logging
of skipped tracks. For instance:

if any tracks are skipped, the log will show:
`Health status: Some tracks were not ripped (skipped)`.

the tracks that are skipped will show:
`Status: Track not ripped (skipped)`.

Signed-off-by: blueblots <63152708+blueblots@users.noreply.github.com>
2021-03-28 16:10:37 +00:00
blueblots
311cc557ff Added --keep-going option to cd rip command
Implemented the option (`-k`, `--keep-going`) to continue ripping
the CD even if one track fails to rip (as @xmixahlx suggested in #128).

Requested in #128
Signed-off-by: blueblots <63152708+blueblots@users.noreply.github.com>

Changed line-lengths/indentation of some code

Travis-CI was failing on account of lines being
under-indented or too long, this should correct it.

Signed-off-by: blueblots <63152708+blueblots@users.noreply.github.com>
2021-03-28 16:10:26 +00:00
JoeLametta
87f3d00ee3 Add missing information to manpages
Also:
- Updated description of command 'mblookup'
- Misc text changes

Signed-off-by: JoeLametta <JoeLametta@users.noreply.github.com>
2021-02-14 21:56:54 +00:00
JoeLametta
914257837d Update Copyright year in README
Signed-off-by: JoeLametta <JoeLametta@users.noreply.github.com>
2021-01-31 17:25:06 +00:00
Age Bosma
1cc5ba73ee Fix typo info > rip
Closes #523

Signed-off-by: JoeLametta <JoeLametta@users.noreply.github.com>
2021-01-31 16:40:09 +00:00
Peter Taylor
4fb9d99ddd Add missing 'Album Artist' tag when its value is 'Various Artists'
Fixes #518.

Signed-off-by: JoeLametta <JoeLametta@users.noreply.github.com>
2020-12-25 14:30:00 +00:00
Alex Jones
e59872716e Parameterise the UID of the worker user in the docker build file. (#517)
* Parameterise the UID of the worker user in the docker build file.

Signed-off-by: Alex Jones <alex.jones@unclealex.co.uk>

* Remove spurious use of ARG uid so that it only appears after the FROM statement.

Signed-off-by: Alex Jones <alex.jones@unclealex.co.uk>
2020-11-28 21:07:43 +01:00
JoeLametta
c229c01a58 Replace 'freedb.dbpoweramp.com' CDDB server with gnudb.org
It seems gnudb.org allows submissions too while 'freedb.dbpoweramp.com' is read only.

Signed-off-by: JoeLametta <JoeLametta@users.noreply.github.com>
2020-11-28 17:44:21 +00:00
JoeLametta
4181c455ca Remove mention about Exherbo from README
Now the package is included in the badge (Repology).

Signed-off-by: JoeLametta <JoeLametta@users.noreply.github.com>
2020-11-28 17:18:37 +00:00