[SCM] morituri/master: * morituri/common/program.py: Add %y to template for year. Fixes #98.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 26827195c0857ec60ab170363da4dd5a4a8e24be
Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date:   Thu Nov 22 23:22:26 2012 +0000

    	* morituri/common/program.py:
    	  Add %y to template for year.  Fixes #98.

diff --git a/ChangeLog b/ChangeLog
index 6d5dba5..1fdc5a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2012-11-23  Thomas Vander Stichele  <thomas at apestaart dot org>
 
+	* morituri/common/program.py:
+	  Add %y to template for year.  Fixes #98.
+
+2012-11-23  Thomas Vander Stichele  <thomas at apestaart dot org>
+
 	* morituri/common/common.py:
 	* morituri/common/program.py:
 	* morituri/image/table.py:
diff --git a/morituri/common/program.py b/morituri/common/program.py
index b5bf8b3..eb9c0a1 100644
--- a/morituri/common/program.py
+++ b/morituri/common/program.py
@@ -170,6 +170,7 @@ class Program(log.Loggable):
         assert type(template) is unicode, "%r is not unicode" % template
 
         # the template is similar to grip, except for %s/%S
+        # see #gripswitches
 
         # returns without extension
 
@@ -189,6 +190,8 @@ class Program(log.Loggable):
 
 
         if self.metadata:
+            release = self.metadata.release or '0000'
+            v['y'] = release[:4]
             v['A'] = filterForPath(self.metadata.artist)
             v['S'] = filterForPath(self.metadata.sortName)
             v['d'] = filterForPath(self.metadata.title)

-- 
morituri packaging