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

Refactor container.open() so that the file paths can be used directly as well

Browse Source
This commit is contained in:
Kovid Goyal 2015-11-27 14:55:57 +05:30
parent dc1bf3a36d
commit 3f8fcefd77
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/calibre/ebooks/oeb/polish/container.py
View File

@ -864,11 +864,8 @@ class Container(object): # {{{
path = self.name_to_abspath(name) path = self.name_to_abspath(name)
return os.path.getsize(path) return os.path.getsize(path)
def open(self, name, mode='rb'): def get_file_path_for_processing(self, name, allow_modification=True):
''' Open the file pointed to by name for direct read/write. Note that ''' Similar to open() except that it returns a file path, instead of an open file object. '''
this will commit the file if it is dirtied and remove it from the parse
cache. You must finish with this file before accessing the parsed
version of it again, or bad things will happen. '''
if name in self.dirtied: if name in self.dirtied:
self.commit_item(name) self.commit_item(name)
self.parsed_cache.pop(name, False) self.parsed_cache.pop(name, False)
@ -877,13 +874,20 @@ class Container(object): # {{{
if not os.path.exists(base): if not os.path.exists(base):
os.makedirs(base) os.makedirs(base)
else: else:
if self.cloned and mode not in {'r', 'rb'} and os.path.exists(path) and nlinks_file(path) > 1: if self.cloned and allow_modification and os.path.exists(path) and nlinks_file(path) > 1:
# Decouple this file from its links # Decouple this file from its links
temp = path + 'xxx' temp = path + 'xxx'
shutil.copyfile(path, temp) shutil.copyfile(path, temp)
os.unlink(path) os.unlink(path)
os.rename(temp, path) os.rename(temp, path)
return open(path, mode) return path
def open(self, name, mode='rb'):
''' Open the file pointed to by name for direct read/write. Note that
this will commit the file if it is dirtied and remove it from the parse
cache. You must finish with this file before accessing the parsed
version of it again, or bad things will happen. '''
return open(self.get_file_path_for_processing(name, mode not in {'r', 'rb'}), mode)
def commit(self, outpath=None, keep_parsed=False): def commit(self, outpath=None, keep_parsed=False):
''' '''