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

Fix #1190 (Problems adding meta information fetched from web.)

Browse Source
This commit is contained in:
Kovid Goyal 2008-10-21 11:02:28 -07:00
parent e3288677e7
commit 0c538a70eb
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/calibre/library/database2.py
View File

@ -17,11 +17,19 @@ __app = None
from calibre.library.database import LibraryDatabase from calibre.library.database import LibraryDatabase
from calibre.ebooks.metadata import string_to_authors from calibre.ebooks.metadata import string_to_authors
from calibre.constants import preferred_encoding from calibre.constants import preferred_encoding, iswindows, isosx
copyfile = os.link if hasattr(os, 'link') else shutil.copyfile copyfile = os.link if hasattr(os, 'link') else shutil.copyfile
filesystem_encoding = sys.getfilesystemencoding() filesystem_encoding = sys.getfilesystemencoding()
if filesystem_encoding is None: filesystem_encoding = 'utf-8' if filesystem_encoding is None: filesystem_encoding = 'utf-8'
iscaseinsensitive = iswindows or isosx
def normpath(x):
# The builtin os.path.normcase doesn't work on OS X
x = os.path.abspath(x)
if iscaseinsensitive:
x = x.lower()
return x
_filename_sanitize = re.compile(r'[\0\\|\?\*<":>\+\[\]/]') _filename_sanitize = re.compile(r'[\0\\|\?\*<":>\+\[\]/]')
def sanitize_file_name(name, substitute='_'): def sanitize_file_name(name, substitute='_'):
@ -521,9 +529,8 @@ class LibraryDatabase2(LibraryDatabase):
self.conn.execute('UPDATE books SET path=? WHERE id=?', (path, id)) self.conn.execute('UPDATE books SET path=? WHERE id=?', (path, id))
self.conn.commit() self.conn.commit()
# Delete not needed directories # Delete not needed directories
norm = lambda x : os.path.abspath(os.path.normcase(x))
if current_path and os.path.exists(spath): if current_path and os.path.exists(spath):
if norm(spath) != norm(tpath): if normpath(spath) != normpath(tpath):
shutil.rmtree(spath) shutil.rmtree(spath)
parent = os.path.dirname(spath) parent = os.path.dirname(spath)
if len(os.listdir(parent)) == 0: if len(os.listdir(parent)) == 0: