[SCM] morituri/master: move common template options and description

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 46feb71205ef95ef32f767ee8f8d125c4d8e9501
Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date:   Tue Jan 15 09:25:43 2013 +0100

    move common template options and description

diff --git a/morituri/rip/Makefile.am b/morituri/rip/Makefile.am
index 4beacde..f7d32f6 100644
--- a/morituri/rip/Makefile.am
+++ b/morituri/rip/Makefile.am
@@ -6,6 +6,7 @@ morituri_PYTHON = \
 	__init__.py \
 	accurip.py \
 	cd.py \
+	common.py \
 	debug.py \
 	drive.py \
 	image.py \
diff --git a/morituri/rip/cd.py b/morituri/rip/cd.py
index 4fa63c1..3edd585 100644
--- a/morituri/rip/cd.py
+++ b/morituri/rip/cd.py
@@ -30,11 +30,10 @@ from morituri.common import logcommand, common, accurip, gstreamer
 from morituri.common import drive, program, cache
 from morituri.result import result
 from morituri.program import cdrdao, cdparanoia
+from morituri.rip import common as rcommon
 
 from morituri.extern.task import task
 
-DEFAULT_TRACK_TEMPLATE = u'%r/%A - %d/%t. %a - %n'
-DEFAULT_DISC_TEMPLATE = u'%r/%A - %d/%A - %d'
 
 MAX_TRIES = 5
 
@@ -46,30 +45,14 @@ class Rip(logcommand.LogCommand):
     description = """
 Rips a CD.
 
-Tracks are named according to the track template, filling in the variables
-and adding the file extension.  Variables exclusive to the track template are:
- - %t: track number
- - %a: track artist
- - %n: track title
- - %s: track sort name
-
-Disc files (.cue, .log, .m3u) are named according to the disc template,
-filling in the variables and adding the file extension. Variables for both
-disc and track template are:
- - %A: album artist
- - %S: album sort name
- - %d: disc title
- - %y: release year
- - %r: release type, lowercase
- - %R: Release type, normal case
- - %x: audio extension
+%s
 
 Paths to track files referenced in .cue and .m3u files will be made
 relative to the directory of the disc files.
 
 All files will be created relative to the given output directory.
 Log files will log the path to tracks relative to this directory.
-"""
+""" % rcommon.TEMPLATE_DESCRIPTION
 
     def addOptions(self):
         loggers = result.getLoggers().keys()
@@ -98,15 +81,9 @@ Log files will log the path to tracks relative to this directory.
         self.parser.add_option('-T', '--toc-pickle',
             action="store", dest="toc_pickle",
             help="pickle to use for reading and writing the TOC")
-        # FIXME: get from config
-        self.parser.add_option('', '--track-template',
-            action="store", dest="track_template",
-            help="template for track file naming (default %default)",
-            default=DEFAULT_TRACK_TEMPLATE)
-        self.parser.add_option('', '--disc-template',
-            action="store", dest="disc_template",
-            help="template for disc file naming (default %default)",
-            default=DEFAULT_DISC_TEMPLATE)
+
+        rcommon.addTemplate(self)
+
         self.parser.add_option('-R', '--release-id',
             action="store", dest="release_id",
             help="MusicBrainz release id to match to (if there are multiple)")
diff --git a/morituri/rip/common.py b/morituri/rip/common.py
new file mode 100644
index 0000000..5b59e19
--- /dev/null
+++ b/morituri/rip/common.py
@@ -0,0 +1,41 @@
+# -*- Mode: Python -*-
+# vi:si:et:sw=4:sts=4:ts=4
+
+# options and arguments shared between commands
+
+DEFAULT_TRACK_TEMPLATE = u'%r/%A - %d/%t. %a - %n'
+DEFAULT_DISC_TEMPLATE = u'%r/%A - %d/%A - %d'
+
+TEMPLATE_DESCRIPTION = '''
+Tracks are named according to the track template, filling in the variables
+and adding the file extension.  Variables exclusive to the track template are:
+ - %t: track number
+ - %a: track artist
+ - %n: track title
+ - %s: track sort name
+
+Disc files (.cue, .log, .m3u) are named according to the disc template,
+filling in the variables and adding the file extension. Variables for both
+disc and track template are:
+ - %A: album artist
+ - %S: album sort name
+ - %d: disc title
+ - %y: release year
+ - %r: release type, lowercase
+ - %R: Release type, normal case
+ - %x: audio extension
+
+'''
+
+def addTemplate(self):
+    # FIXME: get from config
+    self.parser.add_option('', '--track-template',
+        action="store", dest="track_template",
+        help="template for track file naming (default %default)",
+        default=DEFAULT_TRACK_TEMPLATE)
+    self.parser.add_option('', '--disc-template',
+        action="store", dest="disc_template",
+        help="template for disc file naming (default %default)",
+        default=DEFAULT_DISC_TEMPLATE)
+
+

-- 
morituri packaging