Make template processing more robust (I hope)

src/calibre/ebooks/metadata/book/base.py

@@ -8,6 +8,7 @@ __docformat__ = 'restructuredtext en'
 import copy, traceback
 
 from calibre import prints
+from calibre.constants import DEBUG
 from calibre.ebooks.metadata.book import SC_COPYABLE_FIELDS
 from calibre.ebooks.metadata.book import SC_FIELDS_COPY_NOT_NULL
 from calibre.ebooks.metadata.book import STANDARD_METADATA_FIELDS
@@ -50,6 +51,8 @@ class SafeFormat(TemplateFormatter):
                 return ''
             return v
         except:
+            if DEBUG:
+                traceback.print_exc()
             return key
 
 composite_formatter = SafeFormat()
@@ -320,8 +323,8 @@ class Metadata(object):
                 else:
                     self.set(dest, val)
             except:
-                traceback.print_exc()
+                if DEBUG:
-                pass
+                    traceback.print_exc()
 
     # Old Metadata API {{{
     def print_all_attributes(self):

src/calibre/gui2/device.py

@@ -340,7 +340,7 @@ class DeviceManager(Thread): # {{{
                             cpb = None
 
                     if DEBUG:
-                        prints('Using plugboard', ext, dev_name, cpb)
+                        prints('Device using plugboard', ext, dev_name, cpb)
                     if ext:
                         try:
                             if DEBUG:

src/calibre/library/save_to_disk.py

@@ -8,6 +8,8 @@ __docformat__ = 'restructuredtext en'
 
 import os, traceback, cStringIO, re
 
+from calibre import prints
+from calibre.constants import DEBUG
 from calibre.utils.config import Config, StringConfig, tweaks
 from calibre.utils.formatter import TemplateFormatter
 from calibre.utils.filenames import shorten_components_to, supports_long_names, \
@@ -118,8 +120,8 @@ class SafeFormat(TemplateFormatter):
             try:
                 b = self.book.get_user_metadata(key, False)
             except:
-                print 'save_to_disk get value exception'
+                if DEBUG:
-                traceback.print_exc()
+                    traceback.print_exc()
                 b = None
 
             if b is not None and b['datatype'] == 'composite':
@@ -129,13 +131,13 @@ class SafeFormat(TemplateFormatter):
                 self.composite_values[key] = \
                     self.vformat(b['display']['composite_template'], [], kwargs)
                 return self.composite_values[key]
-            if kwargs[key]:
+            if key in kwargs:
-                return self.sanitize(kwargs[key])
+                return kwargs[key].replace('/', '_').replace('\\', '_')
             return ''
         except:
-            print 'save_to_disk general exception'
+            if DEBUG:
-            traceback.print_exc()
+                traceback.print_exc()
-            return ''
+            return key
 
 safe_formatter = SafeFormat()
 
@@ -182,8 +184,8 @@ def get_components(template, mi, id, timefmt='%b %Y', length=250,
             elif custom_metadata[key]['datatype'] == 'bool':
                 format_args[key] = _('yes') if format_args[key] else _('no')
 
-    components = safe_formatter.safe_format(template, format_args, '', mi,
+    components = safe_formatter.safe_format(template, format_args,
-                                            sanitize=sanitize_func)
+                                            'G_C-EXCEPTION!', mi)
     components = [x.strip() for x in components.split('/') if x.strip()]
     components = [sanitize_func(x) for x in components if x]
     if not components:
@@ -267,7 +269,8 @@ def save_book_to_disk(id, db, root, opts, length):
                 cpb = cpb[dev_name]
             else:
                 cpb = None
-        #prints('Using plugboard:', fmt, cpb)
+        if DEBUG:
+            prints('Save-to-disk using plugboard:', fmt, cpb)
         data = db.format(id, fmt, index_is_id=True)
         if data is None:
             continue
@@ -285,7 +288,8 @@ def save_book_to_disk(id, db, root, opts, length):
                     newmi = mi
                 set_metadata(stream, newmi, fmt)
             except:
-                traceback.print_exc()
+                if DEBUG:
+                    traceback.print_exc()
             stream.seek(0)
             data = stream.read()
         fmt_path = base_path+'.'+str(fmt)

src/calibre/utils/formatter.py

@@ -4,7 +4,9 @@ Created on 23 Sep 2010
 @author: charles
 '''
 
-import re, string
+import re, string, traceback
+
+from calibre.constants import DEBUG
 
 class TemplateFormatter(string.Formatter):
     '''
@@ -19,7 +21,6 @@ class TemplateFormatter(string.Formatter):
         string.Formatter.__init__(self)
         self.book = None
         self.kwargs = None
-        self.sanitize = None
 
     def _lookup(self, val, field_if_set, field_not_set):
         if val:
@@ -99,8 +100,8 @@ class TemplateFormatter(string.Formatter):
                 return fmt, '', ''
             return matches.groups()
         except:
-            import traceback
+            if DEBUG:
-            traceback.print_exc()
+                traceback.print_exc()
             return fmt, '', ''
 
     def format_field(self, val, fmt):
@@ -139,14 +140,15 @@ class TemplateFormatter(string.Formatter):
         ans = string.Formatter.vformat(self, fmt, args, kwargs)
         return self.compress_spaces.sub(' ', ans).strip()
 
-    def safe_format(self, fmt, kwargs, error_value, book, sanitize=None):
+    def safe_format(self, fmt, kwargs, error_value, book):
         self.kwargs = kwargs
         self.book = book
-        self.sanitize = sanitize
         self.composite_values = {}
         try:
             ans = self.vformat(fmt, [], kwargs).strip()
         except:
+            if DEBUG:
+                traceback.print_exc()
             ans = error_value
         return ans