From 08da7ad9abfa9f0b5b30034dbacf7c76990f1a3f Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 22 Mar 2012 15:06:26 +0530 Subject: [PATCH] Catalog generation: Do not error out when generating csv/xml catalogs if the catalog title contains filename invalid characters. Fixes #960154 (Error on Generate Catalog) --- src/calibre/gui2/actions/catalog.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/calibre/gui2/actions/catalog.py b/src/calibre/gui2/actions/catalog.py index 5287d0d9b3..c424e2b38a 100644 --- a/src/calibre/gui2/actions/catalog.py +++ b/src/calibre/gui2/actions/catalog.py @@ -13,6 +13,7 @@ from calibre.gui2 import choose_dir, error_dialog, warning_dialog from calibre.gui2.tools import generate_catalog from calibre.utils.config import dynamic from calibre.gui2.actions import InterfaceAction +from calibre import sanitize_file_name_unicode class GenerateCatalogAction(InterfaceAction): @@ -89,7 +90,8 @@ class GenerateCatalogAction(InterfaceAction): _('Select destination for %(title)s.%(fmt)s') % dict( title=job.catalog_title, fmt=job.fmt.lower())) if export_dir: - destination = os.path.join(export_dir, '%s.%s' % (job.catalog_title, job.fmt.lower())) + destination = os.path.join(export_dir, '%s.%s' % ( + sanitize_file_name_unicode(job.catalog_title), job.fmt.lower())) shutil.copyfile(job.catalog_file_path, destination)