Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

replace cdrdao.py with much simpler version #52

Merged
merged 3 commits into from
Oct 22, 2016

Conversation

RecursiveForest
Copy link
Contributor

Completely replace program/cdrdao.py with a much simpler implementation that does not parse the stdout & stderr output of cdrdao, but merely reads the resultant toc/cue file. As far as I could tell, the existant output-parsing code was only used for error checking, and as we saw was incomplete and incorrect.

I have wrapped the simpler version with functions of the same name as the previous version's classes to minimise the amount of main-program style changes before a general cleanup/refactor. However, the previous classes needed to be 'run' by the task scheduler and my version simply returns the needed image.toc.TocFile, so I removed the relevant task running code as well.

This should fix #49 by way of not failing out unless cdrdao returns non-zero or creates an invalid toc/cue.

The current test infrastructure is non-conducive to actually running a command (nor did it actually test this before), and short of major test restructuring there are no substantial tests written for this patch.

@RecursiveForest
Copy link
Contributor Author

It would not be particularly difficult to update my ...Task() wrappings to use the task.Task interface akin to the SoxPeakTask() wrapper I made earlier. However, I don't really see the upside of the rather complicated task system, so I didn't bother to integrate it into this branch until we reach a decision on where we're going with this.

@JoeLametta
Copy link
Collaborator

LGTM.
There's only a minor spelling mistake: compatability (at first I thought it was a joke).

@RecursiveForest
Copy link
Contributor Author

Nope, despite English being my second language after Perl, I can't really spell that well if it would be phonetically the same.

@JoeLametta JoeLametta merged commit d7f8557 into whipper-team:master Oct 22, 2016
@JoeLametta
Copy link
Collaborator

despite English being my second language after Perl

:)

Merged, thanks.

@RecursiveForest RecursiveForest deleted the cdrdao branch October 22, 2016 14:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

CD-TEXT issue
2 participants