Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-07 10:14:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix #338

Browse Source
This commit is contained in:
Kovid Goyal 2007-11-27 17:42:03 +00:00
parent 1fcdada213
commit fea6571d32
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/libprs500/__init__.py
View File

@ -18,7 +18,7 @@ __docformat__ = "epytext"
__author__ = "Kovid Goyal <kovid@kovidgoyal.net>"
__appname__ = 'libprs500'
import sys, os, logging, mechanize, locale, cStringIO
import sys, os, logging, mechanize, locale, cStringIO, re
from gettext import GNUTranslations
from math import floor
@ -152,4 +152,12 @@ def get_font_families():
if wt == 400 and italic == 0:
family = describe.shortName(font)[1].strip()
zlist.append((family, ff))
return dict(zlist)
return dict(zlist)
def sanitize_file_name(name):
'''
Remove characters that are illegal in filenames from name.
Also remove path separators. ALl illegal characters are replaced by
underscores.
'''
return re.sub(r'[:\?\\\/]|^-', '_', name.strip())

7
src/libprs500/library/database.py
View File

@ -19,6 +19,7 @@ import sqlite3 as sqlite
import datetime, re, os, cPickle, traceback
from zlib import compress, decompress
from libprs500 import sanitize_file_name
from libprs500.ebooks.metadata.meta import set_metadata
from libprs500.ebooks.metadata import MetaInformation
@ -1103,12 +1104,12 @@ ALTER TABLE books ADD COLUMN isbn TEXT DEFAULT "" COLLATE NOCASE;
by_author[au] = []
by_author[au].append(index)
for au in by_author.keys():
apath = os.path.join(dir, au.replace(os.sep, '_').strip())
apath = os.path.join(dir, sanitize_file_name(au))
if not os.path.exists(apath):
os.mkdir(apath)
for idx in by_author[au]:
title = re.sub(r'\s', ' ', self.title(idx))
tpath = os.path.join(apath, title.replace(os.sep, '_').strip())
tpath = os.path.join(apath, sanitize_file_name(title))
id = str(self.id(idx))
if not os.path.exists(tpath):
os.mkdir(tpath)
@ -1116,7 +1117,7 @@ ALTER TABLE books ADD COLUMN isbn TEXT DEFAULT "" COLLATE NOCASE;
data = self.format(idx, fmt)
name = au + ' - ' + title if byauthor else title + ' - ' + au
fname = name +'_'+id+'.'+fmt.lower()
f = open(os.path.join(tpath, fname.replace(os.sep, '_').strip()), 'w+b')
f = open(os.path.join(tpath, sanitize_file_name(fname)), 'w+b')
f.write(data)
f.flush()
aum = self.authors(idx)