Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-06-23 15:30:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

newdb: Fix deleting empty records leaving behind a temp dir

Browse Source
This commit is contained in:
Kovid Goyal 2013-08-18 16:16:27 +05:30
parent 986f8b467e
commit c2a572faa7
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/calibre/db/delete_service.py
View File

@ -49,6 +49,7 @@ class DeleteService(Thread):
self.queue_paths(tdir, paths, delete_empty_parent=True) self.queue_paths(tdir, paths, delete_empty_parent=True)
def queue_paths(self, tdir, paths, delete_empty_parent=True): def queue_paths(self, tdir, paths, delete_empty_parent=True):
queued = False
for path in paths: for path in paths:
if os.path.exists(path): if os.path.exists(path):
try: try:
@ -65,6 +66,13 @@ class DeleteService(Thread):
if e.errno != errno.ENOTEMPTY: if e.errno != errno.ENOTEMPTY:
raise raise
self.requests.put(os.path.join(tdir, os.path.basename(path))) self.requests.put(os.path.join(tdir, os.path.basename(path)))
queued = True
if not queued:
try:
os.rmdir(tdir)
except OSError as e:
if e.errno != errno.ENOTEMPTY:
raise
def delete_files(self, paths, library_path): def delete_files(self, paths, library_path):
tdir = self.create_staging(library_path) tdir = self.create_staging(library_path)