From 8ce836d707d91a8731672c54d5085459450aa552 Mon Sep 17 00:00:00 2001
From: Vincent Riquer <vincent+gitorious@riquer.fr>
Date: Wed, 27 Mar 2013 13:30:26 +0100
Subject: [PATCH] store old filename add %{disc} to "rename"

---
 atom             | 8 ++++++++
 doc/config       | 1 +
 share/schema.sql | 1 +
 3 files changed, 10 insertions(+)

diff --git a/atom b/atom
index 20a83ad..42a6b4e 100755
--- a/atom
+++ b/atom
@@ -1107,6 +1107,8 @@ getDestDir() {
 		destdir="${destdir//%\{track\}/$replace}"
 		replace=$(sanitizeFile "$year")
 		destdir="${destdir//%\{year\}/$replace}"
+		replace=$(sanitizeFile "$disc")
+		destdir="${destdir//%\{disc\}/$replace}"
 	else
 		destdir+="${filename%/*}"
 	fi
@@ -1127,6 +1129,7 @@ getDestFile() {
 		tracknumber="${track%/*}"
 		destfile="${destfile//%\{track\}/$tracknumber}"
 		destfile="${destfile//%\{year\}/$year}"
+		destfile="${destfile//%\{disc\}/$disc}"
 	else
 		destfile="${filename##*/}"
 		destfile="${destfile%.*}"
@@ -1494,6 +1497,11 @@ master() {
 					"		SELECT last_change"	 	\
 					"		FROM source_files" 		\
 					"		WHERE id=$sourcefileid"		\
+					"	),"					\
+					"	old_filename=("				\
+					"		SELECT filename"		\
+					"		FROM destination_files"		\
+					"		WHERE id=$destfileid"		\
 					"	)"					\
 					"WHERE  id=$destfileid;"			\
 					>&3
diff --git a/doc/config b/doc/config
index cb8d839..9b905df 100644
--- a/doc/config
+++ b/doc/config
@@ -60,6 +60,7 @@ Sections:
         %{album},
         %{albumartist},
         %{artist},
+        %{disc},
         %{genre},
         %{title},
         %{track},
diff --git a/share/schema.sql b/share/schema.sql
index f04bc97..330934d 100644
--- a/share/schema.sql
+++ b/share/schema.sql
@@ -17,6 +17,7 @@ CREATE TABLE destinations (
 CREATE TABLE destination_files (
 	id		INTEGER PRIMARY KEY,
 	filename	TEXT,
+	old_filename	TEXT,
 	last_change	FLOAT	NOT NULL DEFAULT 0,
 	source_file_id	INTEGER,
 	destination_id	INTEGER,