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

Open With: Fix unhandled exception when choosing a non-executable file as an open with program

Browse Source
This commit is contained in:
Kovid Goyal 2015-05-14 08:41:18 +05:30
parent fb2e3fd38d
commit 55311e41a3
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/calibre/gui2/open_with.py
View File

@ -104,8 +104,9 @@ if iswindows:
if ans:
ans = os.path.abspath(ans[0])
if not os.access(ans, os.X_OK):
return error_dialog(parent, _('Cannot execute'), _(
error_dialog(parent, _('Cannot execute'), _(
'The program %s is not an executable file') % ans, show=True)
return
qans = ans.replace('"', r'\"')
name = friendly_app_name(exe=ans) or os.path.splitext(os.path.basename(ans))[0]
return {'cmdline':'"%s" "%%1"' % qans, 'name':name, 'icon_resource':ans + ',0'}
@ -168,8 +169,9 @@ elif isosx:
'%s is not a valid OS X application bundle.') % ans, show=True)
return app
if not os.access(ans, os.X_OK):
return error_dialog(parent, _('Cannot execute'), _(
error_dialog(parent, _('Cannot execute'), _(
'The program %s is not an executable file') % ans, show=True)
return
return {'path':ans, 'name': os.path.basename(ans)}
@ -194,8 +196,9 @@ else:
if ans:
ans = ans[0]
if not os.access(ans, os.X_OK):
return error_dialog(parent, _('Cannot execute'), _(
error_dialog(parent, _('Cannot execute'), _(
'The program %s is not an executable file') % ans, show=True)
return
return {'Exec':[ans, '%f'], 'Name':os.path.basename(ans)}
def finalize_entry(entry):