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.

Sign up for GitHub

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

Jump to bottom

Misc fixes #188

Merged
merged 3 commits into from
Sep 9, 2017
Merged

Misc fixes #188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a7d70c6
cd: remove weird redundant "default default" help string
ubitux Mar 5, 2017
6938c50
basecommand: use logger.critical() instead of sys.stderr.write()
ubitux Sep 8, 2017
984dd52
README: document developer installation as user
ubitux Sep 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ To make it easier for developers, you can run whipper straight from the
source checkout:

```bash
python2 setup.py develop
python2 setup.py develop --user
whipper -h
```

Expand Down
4 changes: 2 additions & 2 deletions whipper/command/basecommand.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ def __init__(self, argv, prog_name, opts):
self.parser.print_help()
sys.exit(0)
if not self.options.remainder[0] in self.subcommands:
sys.stderr.write("incorrect subcommand: %s" %
self.options.remainder[0])
logger.critical("incorrect subcommand: %s",
self.options.remainder[0])
sys.exit(1)
self.cmd = self.subcommands[self.options.remainder[0]](
self.options.remainder[1:],
Expand Down
6 changes: 2 additions & 4 deletions whipper/command/cd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,13 +296,11 @@ def add_arguments(self):
self.parser.add_argument('--track-template',
action="store", dest="track_template",
default=DEFAULT_TRACK_TEMPLATE,
help="template for track file naming "
"(default default)")
help="template for track file naming")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe the default value should be kept but in a correct way (not default default).

Copy link
Contributor Author

@ubitux ubitux Sep 9, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's already displayed.

  --track-template TRACK_TEMPLATE
                        template for track file naming (default default)
                        (default: %r/%A - %d/%t. %a - %n)
  --disc-template DISC_TEMPLATE
                        template for disc file naming (default default)
                        (default: %r/%A - %d/%A - %d)

(This is before the patch)

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great, I suspected I was missing something obvious. Sorry for the useless remark!

self.parser.add_argument('--disc-template',
action="store", dest="disc_template",
default=DEFAULT_DISC_TEMPLATE,
help="template for disc file naming "
"(default default)")
help="template for disc file naming")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as above.

self.parser.add_argument('-U', '--unknown',
action="store_true", dest="unknown",
help="whether to continue ripping if "
Expand Down