Commit Graph

183 Commits

Author SHA1 Message Date
Andreas Oberritter
342bce9be2 Make getFastToc() fast again.
Broken since #345 was merged.

Signed-off-by: Andreas Oberritter <obi@saftware.de>
2019-10-20 15:25:17 +02:00
Andreas Oberritter
252a2e8141 Use ittoc only for CDDB and MusicBrainz lookups
The data from itable may be more accurate, because ittoc comes from
getFastToc().

Signed-off-by: Andreas Oberritter <obi@saftware.de>
2019-10-20 15:25:17 +02:00
JoeLametta
635113be9a Fix incorrect frames to MSF conversion
Signed-off-by: JoeLametta <JoeLametta@users.noreply.github.com>
2019-08-19 12:00:00 +00:00
JoeLametta
57d386e82f Remove too verbose logger statements
Related to #278.

Signed-off-by: JoeLametta <JoeLametta@users.noreply.github.com>
2019-07-07 10:00:00 +00:00
it is madness
0d69258654 Use YAML 1.2 boolean values for booleans
Signed-off-by: JoeLametta <JoeLametta@users.noreply.github.com>
2019-07-06 16:00:00 +00:00
JoeLametta
b5f0af21be Merge pull request #406 from vmx/fix-offset-find
Fix offset find command
2019-07-05 11:18:49 +02:00
JoeLametta
4eeb0cddc7 Update failing AccurateRipResponse tests 2019-07-05 08:00:00 +00:00
Volker Mische
9cf890a6e2 Fix offset find command
The refactoring of `ReadTOCTask` in commit 3e79032b63
broke the `offset find` command. This commit fixes it again.

Signed-off-by: Volker Mische <volker.mische@gmail.com>
2019-07-05 00:06:02 +02:00
Thomas Vander Stichele
7a4680f285 Add testcase for Gentlemen: same CDDB ID as Interpol
Signed-off-by: JoeLametta <JoeLametta@users.noreply.github.com>
2019-05-09 09:46:28 +02:00
JoeLametta
bb78dc109d Merge pull request #387 from whipper-team/feature/issue-383-restructuredtext
Convert documentation from epydoc to reStructuredText
2019-05-03 20:11:09 +02:00
JoeLametta
69f8f39c49 Change documentation from epydoc to reStructuredText
Thanks to Freso for all the useful comments!

Signed-off-by: JoeLametta <JoeLametta@users.noreply.github.com>
2019-05-03 20:06:13 +02:00
JoeLametta
ccfe724e2e Merge pull request #392 from gorgobacka/default_success
Set default for eject to: success
2019-05-03 12:28:28 +02:00
JoeLametta
78b3c0d56a Merge pull request #391 from gorgobacka/perform_eject
Use eject value of the class again
2019-05-03 12:28:00 +02:00
gorgobacka
eff5fee3f4 use self.eject
Signed-off-by: gorgobacka <tho.b.j@gmx.de>
2019-05-03 12:25:48 +02:00
Frederik “Freso” S. Olesen
bf8daf186d mbngs: Let releaseType be None if no type is set
Signed-off-by: Frederik “Freso” S. Olesen <freso.dk@gmail.com>
2019-05-03 02:49:42 +02:00
Frederik “Freso” S. Olesen
f74455c9f0 mblookup: Cast None to unicode before encoding
Signed-off-by: Frederik “Freso” S. Olesen <freso.dk@gmail.com>
2019-05-03 02:43:31 +02:00
Frederik “Freso” S. Olesen
c2459067ce Test mblookup output when release type is missing
Signed-off-by: Frederik “Freso” S. Olesen <freso.dk@gmail.com>
2019-05-03 02:38:38 +02:00
Frederik “Freso” S. Olesen
885ad172a8 Set release type to empty string if none is given
Fixes https://github.com/whipper-team/whipper/issues/396

Signed-off-by: Frederik “Freso” S. Olesen <freso.dk@gmail.com>
2019-05-02 18:37:51 +02:00
Frederik “Freso” S. Olesen
8209927a79 Add testcase for failure when missing release type
See https://github.com/whipper-team/whipper/issues/396

Signed-off-by: Frederik “Freso” S. Olesen <freso.dk@gmail.com>
2019-05-02 18:35:42 +02:00
JoeLametta
1ae6240e63 Remove useless "stopgap morituri-insanity compatibility layer"
Signed-off-by: JoeLametta <JoeLametta@users.noreply.github.com>
2019-03-29 13:34:39 +01:00
gorgobacka
a977f9b7f6 set success as default
Signed-off-by: gorgobacka <tho.b.j@gmx.de>
2019-03-27 23:16:21 +01:00
Frederik “Freso” S. Olesen
135cc9ce05 Include MusicBrainz Release URL in log output (#382)
* Include MusicBrainz Release URL in log output

This also passes *all* metadata to the `result` object, giving loggers a
lot more (release) metadata to work with, in case custom, “3rd party”
loggers (or even ourselves in the future!) want to do something more
fancy or expansive with the metadata in the log file.

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

Signed-off-by: Frederik “Freso” S. Olesen <freso.dk@gmail.com>

* Uppercase "url" in output: "URL"

Signed-off-by: Frederik “Freso” S. Olesen <freso.dk@gmail.com>
2019-03-18 11:15:27 +00:00
JoeLametta
8d4f818754 Fix critical regressions introduced in 3e79032 and 16b0d8d
Fixes #369.

Signed-off-by: JoeLametta <JoeLametta@users.noreply.github.com>
2019-02-19 15:42:32 +01:00
JoeLametta
79cb5ef68f Merge pull request #367 from whipper-team/feature/use-multivalue-artistid-tags
Handle artist MBIDs as multivalue tags
2019-02-15 18:44:12 +01:00
Frederik “Freso” S. Olesen
af748c55b7 Use git to get whipper's version
This essentially a copy of code from spotify2musicbrainz:
59157165c4

Given that that code is in GPLv3 (and I'm its author :)), it should be
fine to use. It is mostly boilerplate from upstream documentation
anyway: https://pypi.org/project/setuptools-scm/

Should fix https://github.com/whipper-team/whipper/issues/337

Signed-off-by: Frederik “Freso” S. Olesen <freso.dk@gmail.com>
2019-02-14 11:55:21 +01:00
Frederik “Freso” S. Olesen
6abd120e4a Fix calls to cdrdao.ReadTOCTask()
Signed-off-by: Frederik “Freso” S. Olesen <freso.dk@gmail.com>
2019-02-14 00:49:02 +01:00
Frederik “Freso” S. Olesen
239fc3e6ae Lowercase description of "%R" template variable
All other descriptions are lowercased, except for this one.

Signed-off-by: Frederik “Freso” S. Olesen <freso.dk@gmail.com>
2019-02-13 23:13:45 +01:00
Frederik “Freso” S. Olesen
14aa8b7f7c Handle artist MBIDs as multivalue tags
Instead of joining artist MBIDs with a ';' save them as multiple values
to the tag. (This is how Picard saves that tag.)

Signed-off-by: Frederik “Freso” S. Olesen <freso.dk@gmail.com>
2019-02-13 22:59:58 +01:00
Frederik “Freso” S. Olesen
42e7a77645 Remove unused argument for ….mbngs._getMetadata()
Signed-off-by: Frederik “Freso” S. Olesen <freso.dk@gmail.com>
2019-02-13 22:07:59 +01:00
JoeLametta
94b7001fad Merge pull request #366 from whipper-team/feature/issue-200-add-more-musicbrainz-identifiers
Add Track, Release Group, and Work MBIDs to ripped files
2019-02-13 21:35:02 +01:00
Frederik “Freso” S. Olesen
364f024c08 Add Work MBIDs to ripped files
See https://musicbrainz.org/doc/Work

Third and final and thus closes https://github.com/whipper-team/whipper/issues/200

Signed-off-by: Frederik “Freso” S. Olesen <freso.dk@gmail.com>
2019-02-13 21:01:57 +01:00
JoeLametta
87b9460639 Change musicbrainzngs logging level to WARNING
The default log level is INFO.
Needed to silence harmless messages like: '<ws2:release-group>, uncaught attribute type-id'.

Signed-off-by: JoeLametta <JoeLametta@users.noreply.github.com>
2019-02-13 20:13:09 +01:00
Frederik “Freso” S. Olesen
266a272e3c Add testcase to check all release and track metadata
Before this bits and pieces of release and track metadata would be
tested in the other test cases, but no test cases included all of them.

Signed-off-by: Frederik “Freso” S. Olesen <freso.dk@gmail.com>
2019-02-13 19:55:37 +01:00
Frederik “Freso” S. Olesen
fa5add0309 Simplify setting release type
We pull in the Release Group information now directly in the original
MusicBrainz web service request, so no need to do further processing
to get it.

Signed-off-by: Frederik “Freso” S. Olesen <freso.dk@gmail.com>
2019-02-13 19:51:30 +01:00
Frederik “Freso” S. Olesen
c963b0173b Add Release Group MBIDs to ripped files
See https://musicbrainz.org/doc/Release_Group

Second part of https://github.com/whipper-team/whipper/issues/200

(MusicBrainz JSON test data dumps needed to be refreshed due to the
new `includes` in the MusicBrainz web service call.)

Signed-off-by: Frederik “Freso” S. Olesen <freso.dk@gmail.com>
2019-02-13 19:03:15 +01:00
Frederik “Freso” S. Olesen
41b1b1feff Add Track MBIDs to ripped files
See https://musicbrainz.org/doc/Track

First part of https://github.com/whipper-team/whipper/issues/200

Signed-off-by: Frederik “Freso” S. Olesen <freso.dk@gmail.com>
2019-02-13 18:59:11 +01:00
Frederik “Freso” S. Olesen
fce00f492e Change release used for testing [unknown] artist credits
The previously used release has since had its [unknown] artist credit
resolved since the data was originally taken from MusicBrainz.

Using data from this release now:
https://musicbrainz.org/release/8478d4da-0cda-4e46-ae8c-1eeacfa5cf37
Specifically:
https://musicbrainz.org/track/a04ee451-46c3-3ad6-a815-d7bb8449d605

Signed-off-by: Frederik “Freso” S. Olesen <freso.dk@gmail.com>
2019-02-13 18:35:48 +01:00
Frederik “Freso” S. Olesen
6d3f44ba96 Change release used for testing missing release date
The previous release has gotten a release date added since it was
originally dumped from MusicBrainz.

Signed-off-by: Frederik “Freso” S. Olesen <freso.dk@gmail.com>
2019-02-13 18:35:28 +01:00
Frederik “Freso” S. Olesen
a08bbeea6a Refresh MusicBrainz JSON dumps used for testing
Some of these dumps predate when MusicBrainz had (re)introduced track
MBIDs, so some tests for the code for issue #200 would fail since the
JSON dumps didn't contain those IDs.

Signed-off-by: Frederik “Freso” S. Olesen <freso.dk@gmail.com>
2019-02-13 16:47:01 +01:00
JoeLametta
8266368c7d Merge pull request #364 from whipper-team/task/cleanup-musicbrainz-nomenclature
Clean up MusicBrainz nomenclature
2019-02-13 15:29:33 +01:00
Frederik “Freso” S. Olesen
2c464bc732 Fix MusicBrainz nomenclature: track vs. recording
For historical reasons there is some confusion between Tracks[1] and
Recordings[2] in MusicBrainz. Essentially what should be saved to
`MUSICBRAINZ_TRACKID` is the Recording MBID—which is what whipper is
correctly doing, but the value storing this value was called `mbidTrack`
rather than `mbidRecording`, which could potentially cause confusion.

[1] https://musicbrainz.org/doc/Track
[2] https://musicbrainz.org/doc/Recording

Signed-off-by: Frederik “Freso” S. Olesen <freso.dk@gmail.com>
2019-02-13 15:03:31 +01:00
Frederik “Freso” S. Olesen
75c5646d1e Fix MusicBrainz nomenclature: album → release
In general, "albums" in everyday usage is what on MusicBrainz would be
considered a release group[1] while as far as I can tell, every single
instance of it being used in whipper is referring to a single "edition"
of an album, which is what would be called a "release" in
MusicBrainz terminology[2].

[1] https://musicbrainz.org/doc/Release_Group
[2] https://musicbrainz.org/doc/Release

Signed-off-by: Frederik “Freso” S. Olesen <freso.dk@gmail.com>
2019-02-13 14:55:45 +01:00
Frederik “Freso” S. Olesen
e91fe2720b command.mblookup: Fix misaligned output.
Only three spaces before "Barcode" instead of four.

Signed-off-by: Frederik “Freso” S. Olesen <freso.dk@gmail.com>
2019-02-13 14:35:34 +01:00
JoeLametta
9dc5702e19 Fix string concatenation bug 2019-02-02 19:19:50 +01:00
JoeLametta
f79fb32340 Remove broken assertion 2019-02-02 19:19:50 +01:00
JoeLametta
cf923cc9cc Review existing comments and add new ones
Also clarified a statement
2019-02-02 19:19:50 +01:00
JoeLametta
fe36241730 Don't assign the result of a function that returns no value 2019-02-02 19:19:49 +01:00
JoeLametta
ad66af900f Remove erroneous extra format argument 2019-02-02 19:19:49 +01:00
JoeLametta
6bb585e1a5 Replace if ... else ... with simpler statement 2019-02-02 19:19:49 +01:00
JoeLametta
e7bfc34c0e Rename 'throwaway' variables to single underscore
Also removed unused ones
2019-02-02 19:19:49 +01:00