From eebd632eeff20e57970a52d3039618430dd358c2 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Thu, 8 Jul 2010 21:37:49 +0000 Subject: [PATCH] * morituri/common/program.py: Comment where we got the template variables from. * morituri/rip/cd.py: Document the template variables. --- ChangeLog | 7 +++++++ morituri/common/program.py | 2 ++ morituri/rip/cd.py | 15 +++++++++++++++ 3 files changed, 24 insertions(+) diff --git a/ChangeLog b/ChangeLog index fa6c1e9..169e32f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2010-07-08 Thomas Vander Stichele + + * morituri/common/program.py: + Comment where we got the template variables from. + * morituri/rip/cd.py: + Document the template variables. + 2010-06-19 Thomas Vander Stichele * morituri/program/cdparanoia.py: diff --git a/morituri/common/program.py b/morituri/common/program.py index 6d60b28..abaf213 100644 --- a/morituri/common/program.py +++ b/morituri/common/program.py @@ -249,6 +249,8 @@ class Program(log.Loggable): assert type(outdir) is unicode, "%r is not unicode" % outdir assert type(template) is unicode, "%r is not unicode" % template + # the template is similar to grip, except for %s/%S + # returns without extension v = {} diff --git a/morituri/rip/cd.py b/morituri/rip/cd.py index a80849e..7e50e75 100644 --- a/morituri/rip/cd.py +++ b/morituri/rip/cd.py @@ -36,6 +36,21 @@ from morituri.program import cdrdao, cdparanoia class Rip(logcommand.LogCommand): summary = "rip CD" + description = """ +Rips a CD. + +Tracks are named according to the track template: + - %t: track number + - %a: track artist + - %n: track title + - %s: track sort name + +Discs are named according to the disc template: + - %A: album artist + - %S: album sort name + - %d: disc title +""" + def addOptions(self): # FIXME: get from config default = 0