From 9ccc9283511db7af58dc179f1d01db86cc8edf14 Mon Sep 17 00:00:00 2001
From: yomguy <>
Date: Mon, 23 Apr 2007 15:24:47 +0000
Subject: [PATCH] No metadata in caching path (just ext/item_id.ext). No
 verbose by default

---
 telemeta/export/core.py | 16 +++++++++-------
 telemeta/export/flac.py |  4 +++-
 telemeta/export/ogg.py  |  4 +++-
 telemeta/export/wav.py  |  5 ++++-
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/telemeta/export/core.py b/telemeta/export/core.py
index 06db1d1b..b8b64f3c 100644
--- a/telemeta/export/core.py
+++ b/telemeta/export/core.py
@@ -95,11 +95,10 @@ class ExporterCore(Component):
 		xml.dom.ext.PrettyPrint(doc, xml_file)
 		xml_file.close()
 
-
 	def pre_process(self, item_id, source, metadata, ext, cache_dir, options):
 		""" Pre processing of the core. Prepare the export path and
 		return it"""
-		self.item_id = item_id
+		self.item_id = str(item_id)
 		self.source = source
 		file_name = get_file_name(self.source)
 		file_name_wo_ext, file_ext = split_file_name(file_name)
@@ -107,9 +106,9 @@ class ExporterCore(Component):
 		self.options = options
 
 		self.metadata = metadata
-		self.collection = self.metadata['Collection']
-		self.artist = self.metadata['Artist']
-		self.title = self.metadata['Title']
+		#self.collection = self.metadata['Collection']
+		#self.artist = self.metadata['Artist']
+		#self.title = self.metadata['Title']
 
 		# Decode the source if needed
 		if os.path.exists(self.source) and not iswav16(self.source):
@@ -127,8 +126,9 @@ class ExporterCore(Component):
 		# At the moment, the target directory is built with this scheme in
 		# the cache directory : ./%Format/%Collection/%Artist/
 		self.dest = self.cache_dir
-		export_dir = os.path.join(self.ext,self.collection,self.artist)
 
+		#export_dir = os.path.join(self.ext,self.collection,self.artist)
+		export_dir = self.ext
 		if not os.path.exists(os.path.join(self.dest,export_dir)):
 			for _dir in export_dir.split(os.sep):
 				self.dest = os.path.join(self.dest,_dir)
@@ -138,7 +138,8 @@ class ExporterCore(Component):
 			self.dest = os.path.join(self.dest,export_dir)
 
 		# Set the target file
-		target_file = file_name_wo_ext+'.'+self.ext
+		#target_file = file_name_wo_ext+'.'+self.ext
+		target_file = self.item_id+'.'+self.ext
 		self.dest = os.path.join(self.dest,target_file)
 		return self.dest
 
@@ -245,3 +246,4 @@ def get_consts_value(self, data):
 	value = self.collection.__dict__[data]
 	value_type = getType(value)
 	return value, value_type
+
diff --git a/telemeta/export/flac.py b/telemeta/export/flac.py
index c7cae565..68a31f4f 100644
--- a/telemeta/export/flac.py
+++ b/telemeta/export/flac.py
@@ -95,7 +95,9 @@ class FlacExporter(ExporterCore):
 		else:
 			args = '-f -V -'+self.quality_default
 
-		if 'verbose' in self.options and self.options['verbose'] == '0':
+		if 'verbose' in self.options and self.options['verbose'] != '0':
+			args = args
+		else:
 			args = args+' -s'
 	
 		try:
diff --git a/telemeta/export/ogg.py b/telemeta/export/ogg.py
index a1ec2133..f81ba08e 100644
--- a/telemeta/export/ogg.py
+++ b/telemeta/export/ogg.py
@@ -85,7 +85,9 @@ class OggExporter(ExporterCore):
 		else:
 			args = '-b '+self.bitrate_default
 
-		if 'verbose' in self.options and self.options['verbose'] == '0':
+		if 'verbose' in self.options and self.options['verbose'] != '0':
+			args = args
+		else:
 			args = args + ' -Q'
 		
 		if os.path.exists(self.source) and not iswav16(self.source):
diff --git a/telemeta/export/wav.py b/telemeta/export/wav.py
index 9cf679fc..52b32b14 100644
--- a/telemeta/export/wav.py
+++ b/telemeta/export/wav.py
@@ -87,8 +87,11 @@ class WavExporter(ExporterCore):
 	def create_par_key(self):
 		""" Create the par2 keys of the dest """
 		args = 'c -n1 '
-		if 'verbose' in self.options and self.options['verbose'] == '0':
+		if 'verbose' in self.options and self.options['verbose'] != '0':
+			args = args
+		else:
 			args = args + '-q -q '
+
 		try:
 			os.system('par2 '+args+' "'+self.dest+'"')
 		except IOError:
-- 
2.39.5