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

Workaround for windows' crazy file locking model

Browse Source
This commit is contained in:
Kovid Goyal 2015-12-13 16:30:31 +05:30
parent b32d5750d9
commit 0789d62ec7
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,7 +7,7 @@ __license__ = 'GPL v3'
__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>' __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
__docformat__ = 'restructuredtext en' __docformat__ = 'restructuredtext en'
import os, logging, sys, hashlib, uuid, re, shutil, unicodedata, errno import os, logging, sys, hashlib, uuid, re, shutil, unicodedata, errno, time
from collections import defaultdict from collections import defaultdict
from io import BytesIO from io import BytesIO
from urlparse import urlparse from urlparse import urlparse
@ -17,6 +17,7 @@ from lxml import etree
from cssutils import replaceUrls, getUrls from cssutils import replaceUrls, getUrls
from calibre import CurrentDir from calibre import CurrentDir
from calibre.constants import iswindows
from calibre.customize.ui import (plugin_for_input_format, plugin_for_output_format) from calibre.customize.ui import (plugin_for_input_format, plugin_for_output_format)
from calibre.ebooks.chardet import xml_to_unicode from calibre.ebooks.chardet import xml_to_unicode
from calibre.ebooks.conversion.plugins.epub_input import ( from calibre.ebooks.conversion.plugins.epub_input import (
@ -878,7 +879,13 @@ class Container(object): # {{{
# 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) try:
os.unlink(path)
except EnvironmentError:
if not iswindows:
raise
time.sleep(1) # Wait for whatever has locked the file to release it
os.unlink(path)
os.rename(temp, path) os.rename(temp, path)
return path return path