From f7a13e87a0c24e8f4460c2e01a607d3eeccec5cb Mon Sep 17 00:00:00 2001
From: rembo10 <remyvarma@gmail.com>
Date: Sat, 14 Apr 2012 13:11:21 +0530
Subject: [PATCH] Fix for variable renaming in post processor

---
 headphones/__init__.py      | 30 ++++++++++++++++++++++++++++
 headphones/postprocessor.py | 40 ++++++++++++++++++-------------------
 2 files changed, 50 insertions(+), 20 deletions(-)

diff --git a/headphones/__init__.py b/headphones/__init__.py
index 6985d996..8291bbdc 100644
--- a/headphones/__init__.py
+++ b/headphones/__init__.py
@@ -361,6 +361,36 @@ def initialize():
             FOLDER_FORMAT = replace_all(FOLDER_FORMAT, folder_values)
             
             CONFIG_VERSION = '1'
+            
+        if CONFIG_VERSION == '1':
+        	from headphones.helpers import replace_all
+        	file_values = {	'Track':		'%Track%',
+							'Title':		'%Title%',
+							'Artist':		'%Artist%',
+							'Album':		'%Album%',
+							'Year':			'%Year%',
+							'track':		'%track%',
+							'title':		'%title%',
+							'artist':		'%artist%',
+							'album':		'%album%',
+							'year':			'%year%'
+							}
+			folder_values = { 	'Artist':	'%Artist%',
+								'Album':	'%Album%',
+								'Year':		'%Year%',
+								'Type':  	'%Type%',
+								'First':	'%First%',
+								'artist':	'%artist%',
+								'album':	'%album%',
+								'year':		'%year%',
+								'type':  	'%type%',
+								'first':	'%first%'
+			}
+			
+            FILE_FORMAT = replace_all(FILE_FORMAT, file_values)
+            FOLDER_FORMAT = replace_all(FOLDER_FORMAT, folder_values)
+            
+            CONFIG_VERSION = '2'
         
         if not LOG_DIR:
             LOG_DIR = os.path.join(DATA_DIR, 'logs')
diff --git a/headphones/postprocessor.py b/headphones/postprocessor.py
index 9d6f8e60..af5b9a61 100644
--- a/headphones/postprocessor.py
+++ b/headphones/postprocessor.py
@@ -329,16 +329,16 @@ def moveFiles(albumpath, release, tracks):
 		firstchar = sortname[0]
 	
 
-	values = {	'Artist':	artist,
-				'Album':	album,
-				'Year':		year,
-				'Type':  releasetype,
-				'First':	firstchar,
-				'artist':	artist.lower(),
-				'album':	album.lower(),
-				'year':		year,
-				'type':  releasetype.lower(),
-				'first':	firstchar.lower()
+	values = {	'%Artist%':	artist,
+				'%Album%':	album,
+				'%Year%':		year,
+				'%Type%':  releasetype,
+				'%First%':	firstchar,
+				'%artist%':	artist.lower(),
+				'%album%':	album.lower(),
+				'%year%':		year,
+				'%type%':  releasetype.lower(),
+				'%first%':	firstchar.lower()
 			}
 			
 	
@@ -504,16 +504,16 @@ def renameFiles(albumpath, downloaded_track_list, release):
 		else:
 			title = f.title
 			
-			values = {	'Track':		tracknumber,
-						'Title':		title,
-						'Artist':		release['ArtistName'],
-						'Album':		release['AlbumTitle'],
-						'Year':			year,
-						'track':		tracknumber,
-						'title':		title.lower(),
-						'artist':		release['ArtistName'].lower(),
-						'album':		release['AlbumTitle'].lower(),
-						'year':			year
+			values = {	'%Track%':		tracknumber,
+						'%Title%':		title,
+						'%Artist%':		release['ArtistName'],
+						'%Album%':		release['AlbumTitle'],
+						'%Year%':			year,
+						'%track%':		tracknumber,
+						'%title%':		title.lower(),
+						'%artist%':		release['ArtistName'].lower(),
+						'%album%':		release['AlbumTitle'].lower(),
+						'%year%':			year
 						}
 						
 			ext = os.path.splitext(downloaded_track)[1]