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

Make calibre less likely to loose track of e-book files if the user renames them outside of calibre

Browse Source
This commit is contained in:
Kovid Goyal 2009-08-18 16:39:34 -06:00
parent 181802da53
commit 059ad61377
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -850,20 +850,14 @@ class LibraryDatabase2(LibraryDatabase):
return None return None
ans = [] ans = []
for format in formats: for format in formats:
_format = ('.' + format.lower()) if format else '' if self.format_abspath(id, format, index_is_id=True) is not None:
if os.access(os.path.join(path, name+_format), os.R_OK|os.W_OK):
ans.append(format) ans.append(format)
if not ans:
return None
return ','.join(ans) return ','.join(ans)
def has_format(self, index, format, index_is_id=False): def has_format(self, index, format, index_is_id=False):
id = index if index_is_id else self.id(index) return self.format_abspath(index, format, index_is_id) is not None
name = self.conn.get('SELECT name FROM data WHERE book=? AND format=?', (id, format), all=False)
if name:
path = os.path.join(self.library_path, self.path(id, index_is_id=True))
format = ('.' + format.lower()) if format else ''
path = os.path.join(path, name+format)
return os.access(path, os.R_OK|os.W_OK)
return False
def format_abspath(self, index, format, index_is_id=False): def format_abspath(self, index, format, index_is_id=False):
'Return absolute path to the ebook file of format `format`' 'Return absolute path to the ebook file of format `format`'
@ -872,9 +866,13 @@ class LibraryDatabase2(LibraryDatabase):
if name: if name:
path = os.path.join(self.library_path, self.path(id, index_is_id=True)) path = os.path.join(self.library_path, self.path(id, index_is_id=True))
format = ('.' + format.lower()) if format else '' format = ('.' + format.lower()) if format else ''
path = os.path.join(path, name+format) fmt_path = os.path.join(path, name+format)
if os.access(path, os.R_OK|os.W_OK): if os.path.exists(fmt_path):
return path return fmt_path
candidates = glob.glob(os.path.join(path, '*'+format))
if format and candidates and os.path.exists(candidates[0]):
shutil.copyfile(candidates[0], fmt_path)
return fmt_path
def format(self, index, format, index_is_id=False, as_file=False, mode='r+b'): def format(self, index, format, index_is_id=False, as_file=False, mode='r+b'):
''' '''
@ -886,9 +884,10 @@ class LibraryDatabase2(LibraryDatabase):
path = self.format_abspath(index, format, index_is_id=index_is_id) path = self.format_abspath(index, format, index_is_id=index_is_id)
if path is not None: if path is not None:
f = open(path, mode) f = open(path, mode)
return f if as_file else f.read() ret = f if as_file else f.read()
if self.has_format(index, format, index_is_id): if not as_file:
self.remove_format(id, format, index_is_id=True) f.close()
return ret
def add_format_with_hooks(self, index, format, fpath, index_is_id=False, def add_format_with_hooks(self, index, format, fpath, index_is_id=False,
path=None, notify=True): path=None, notify=True):
@ -944,11 +943,9 @@ class LibraryDatabase2(LibraryDatabase):
def remove_format(self, index, format, index_is_id=False, notify=True): def remove_format(self, index, format, index_is_id=False, notify=True):
id = index if index_is_id else self.id(index) id = index if index_is_id else self.id(index)
path = os.path.join(self.library_path, *self.path(id, index_is_id=True).split(os.sep))
name = self.conn.get('SELECT name FROM data WHERE book=? AND format=?', (id, format), all=False) name = self.conn.get('SELECT name FROM data WHERE book=? AND format=?', (id, format), all=False)
if name: if name:
ext = ('.' + format.lower()) if format else '' path = self.format_abspath(id, format, index_is_id=True)
path = os.path.join(path, name+ext)
try: try:
delete_file(path) delete_file(path)
except: except: