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

Possible workaround for Qt open file dialog in 4.8.2 failling on some linux distros. Fixes #1022019 (Cannot add any book)

Browse Source
This commit is contained in:
Kovid Goyal 2012-07-09 11:10:48 +05:30
parent f8ea2ce8f0
commit f7974adef5
1 changed files with 42 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
src/calibre/gui2/__init__.py
View File

@ -581,30 +581,31 @@ class FileDialog(QObject):
if not isinstance(initial_dir, basestring): if not isinstance(initial_dir, basestring):
initial_dir = os.path.expanduser(default_dir) initial_dir = os.path.expanduser(default_dir)
self.selected_files = [] self.selected_files = []
if mode == QFileDialog.AnyFile: with SanitizeLibraryPath():
f = unicode(QFileDialog.getSaveFileName(parent, title, initial_dir, ftext, "")) if mode == QFileDialog.AnyFile:
if f: f = unicode(QFileDialog.getSaveFileName(parent, title, initial_dir, ftext, ""))
self.selected_files.append(f) if f:
elif mode == QFileDialog.ExistingFile: self.selected_files.append(f)
f = unicode(QFileDialog.getOpenFileName(parent, title, initial_dir, ftext, "")) elif mode == QFileDialog.ExistingFile:
if f and os.path.exists(f): f = unicode(QFileDialog.getOpenFileName(parent, title, initial_dir, ftext, ""))
self.selected_files.append(f)
elif mode == QFileDialog.ExistingFiles:
fs = QFileDialog.getOpenFileNames(parent, title, initial_dir, ftext, "")
for f in fs:
f = unicode(f)
if not f: continue
if not os.path.exists(f):
# QFileDialog for some reason quotes spaces
# on linux if there is more than one space in a row
f = unquote(f)
if f and os.path.exists(f): if f and os.path.exists(f):
self.selected_files.append(f) self.selected_files.append(f)
else: elif mode == QFileDialog.ExistingFiles:
opts = QFileDialog.ShowDirsOnly if mode == QFileDialog.Directory else QFileDialog.Option() fs = QFileDialog.getOpenFileNames(parent, title, initial_dir, ftext, "")
f = unicode(QFileDialog.getExistingDirectory(parent, title, initial_dir, opts)) for f in fs:
if os.path.exists(f): f = unicode(f)
self.selected_files.append(f) if not f: continue
if not os.path.exists(f):
# QFileDialog for some reason quotes spaces
# on linux if there is more than one space in a row
f = unquote(f)
if f and os.path.exists(f):
self.selected_files.append(f)
else:
opts = QFileDialog.ShowDirsOnly if mode == QFileDialog.Directory else QFileDialog.Option()
f = unicode(QFileDialog.getExistingDirectory(parent, title, initial_dir, opts))
if os.path.exists(f):
self.selected_files.append(f)
if self.selected_files: if self.selected_files:
self.selected_files = [unicode(q) for q in self.selected_files] self.selected_files = [unicode(q) for q in self.selected_files]
saved_loc = self.selected_files[0] saved_loc = self.selected_files[0]
@ -857,16 +858,26 @@ class Application(QApplication):
_store_app = None _store_app = None
class SanitizeLibraryPath(object):
'''Remove the bundled calibre libraries from LD_LIBRARY_PATH on linux. This
is needed to prevent library conflicts when launching external utilities.'''
def __enter__(self):
self.orig = os.environ.get('LD_LIBRARY_PATH', '')
self.changed = False
paths = [x for x in self.orig.split(os.pathsep) if x]
if isfrozen and islinux and paths:
npaths = [x for x in paths if x != sys.frozen_path+'/lib']
os.environ['LD_LIBRARY_PATH'] = os.pathsep.join(npaths)
self.changed = True
def __exit__(self, *args):
if self.changed:
os.environ['LD_LIBRARY_PATH'] = self.orig
def open_url(qurl): def open_url(qurl):
paths = os.environ.get('LD_LIBRARY_PATH', with SanitizeLibraryPath():
'').split(os.pathsep) QDesktopServices.openUrl(qurl)
paths = [x for x in paths if x]
if isfrozen and islinux and paths:
npaths = [x for x in paths if x != sys.frozen_path+'/lib']
os.environ['LD_LIBRARY_PATH'] = os.pathsep.join(npaths)
QDesktopServices.openUrl(qurl)
if isfrozen and islinux and paths:
os.environ['LD_LIBRARY_PATH'] = os.pathsep.join(paths)
def get_current_db(): def get_current_db():
''' '''